Merge branch 'release-v0.5.x' into develop

# Conflicts:
#	kolibri/plugins/document_pdf_render/assets/src/views/index.vue
#	kolibri/plugins/learn/assets/src/views/content-page/index.vue
#	kolibri/plugins/learn/assets/src/views/learn-page/index.vue
#	kolibri/plugins/learn/assets/src/views/points-popup/index.vue
#	yarn.lock

Author: rtibbles

frontend_build/src/parse_bundle_plugin.js

@@ -92,6 +92,22 @@ var parseBundlePlugin = function(data, base_dir) {
     ],
   };
 
+  // Calculate these paths here, so that we can export __publicPath as a variable in the webpack define plugin
+  var publicPath, outputPath;
+
+  if (process.env.DEV_SERVER) {
+    var devServerConfig = require('./webpackdevserverconfig');
+    // If running webpack dev server point to that endpoint.
+    publicPath = devServerConfig.publicPath;
+    // Set output path to base dir, as no files will be written - all built files are cached in memory.
+    outputPath = devServerConfig.basePath
+      ? path.resolve(path.join(base_dir, devServerConfig.basePath))
+      : path.resolve(base_dir);
+  } else {
+    publicPath = path.join('/', data.static_url_root, data.name, '/');
+    outputPath = path.join(data.static_dir, data.name);
+  }
+
   bundle.plugins = bundle.plugins.concat([
     new ExtractTextPlugin('[name]' + data.version + '.css'),
     new WebpackRTLPlugin(),
@@ -110,27 +126,14 @@ var parseBundlePlugin = function(data, base_dir) {
       __events: JSON.stringify(data.events || {}),
       __once: JSON.stringify(data.once || {}),
       __version: JSON.stringify(data.version),
+      // This is necessary to allow modules that use service workers to fetch their service worker code
+      __publicPath: JSON.stringify(publicPath),
     }),
     new extract$trs(data.locale_data_folder, data.name),
   ]);
 
   bundle = merge.smart(bundle, local_config);
 
-  var publicPath, outputPath;
-
-  if (process.env.DEV_SERVER) {
-    var devServerConfig = require('./webpackdevserverconfig');
-    // If running webpack dev server point to that endpoint.
-    publicPath = devServerConfig.publicPath;
-    // Set output path to base dir, as no files will be written - all built files are cached in memory.
-    outputPath = devServerConfig.basePath
-      ? path.resolve(path.join(base_dir, devServerConfig.basePath))
-      : path.resolve(base_dir);
-  } else {
-    publicPath = path.join('/', data.static_url_root, data.name, '/');
-    outputPath = path.join(data.static_dir, data.name);
-  }
-
   bundle.core_name = data.core_name;
   bundle.name = data.name;
   bundle.context = base_dir;

kolibri/content/api.py

@@ -7,7 +7,7 @@
 from django.db.models import Q, Sum
 from django.db.models.aggregates import Count
 from kolibri.content import models, serializers
-from kolibri.content.content_db_router import get_active_content_database
+from kolibri.content.content_db_router import get_active_content_database, using_content_database
 from kolibri.logger.models import ContentSessionLog, ContentSummaryLog
 from le_utils.constants import content_kinds
 from rest_framework import filters, pagination, viewsets
@@ -359,10 +359,11 @@ def get_queryset(self):
 
 class ChannelFileSummaryViewSet(viewsets.ViewSet):
     def list(self, request, **kwargs):
-        file_summary = models.File.objects.aggregate(
-            total_files=Count('pk'),
-            total_file_size=Sum('file_size')
-        )
-        file_summary['channel_id'] = get_active_content_database()
-        # Need to wrap in an array to be fetchable as a Collection on client
-        return Response([file_summary])
+        with using_content_database(kwargs['channel_id']):
+            file_summary = models.File.objects.aggregate(
+                total_files=Count('pk'),
+                total_file_size=Sum('file_size')
+            )
+            file_summary['channel_id'] = get_active_content_database()
+            # Need to wrap in an array to be fetchable as a Collection on client
+            return Response([file_summary])

kolibri/content/middleware.py

@@ -9,9 +9,12 @@ class ContentDBRoutingMiddleware(object):
     """
 
     def process_view(self, request, view_func, view_args, view_kwargs):
-        request.PREVIOUSLY_ACTIVE_CONTENT_DATABASE = get_active_content_database(return_none_if_not_set=True)
-        if "channel_id" in view_kwargs:
-            set_active_content_database(view_kwargs["channel_id"])
+        if view_func.__name__ == 'TasksViewSet':
+            pass  # Fix #1818.1: skip get_active_content_database for Task workers to avoid locking DB
+        else:
+            request.PREVIOUSLY_ACTIVE_CONTENT_DATABASE = get_active_content_database(return_none_if_not_set=True)
+            if "channel_id" in view_kwargs:
+                set_active_content_database(view_kwargs["channel_id"])
 
     def process_response(self, request, response):
         set_active_content_database(getattr(request, "PREVIOUSLY_ACTIVE_CONTENT_DATABASE", None))

kolibri/content/utils/annotation.py

@@ -32,3 +32,7 @@ def update_channel_metadata_cache():
         if ch_metadata_obj.last_updated is None:
             ch_metadata_obj.last_updated = local_now()
             ch_metadata_obj.save()
+
+    # Fix #1818.1 content database files get locked (this is called on startup)
+    from django.db import connections
+    connections.close_all()

kolibri/content/utils/channels.py

@@ -53,9 +53,15 @@ def enumerate_content_database_file_paths(content_database_dir):
 def read_channel_metadata_from_db_file(channeldbpath):
     # import here to avoid circular imports whenever kolibri.content.models imports utils too
     from kolibri.content.models import ChannelMetadata
-
     with using_content_database(channeldbpath):
-        return ChannelMetadata.objects.first()
+        channel_metadata = ChannelMetadata.objects.first()
+
+    # FIX for #1818.2: DB file on removable media remains locked after import
+    from django.db import connections
+    connections.close_all()
+
+    return channel_metadata
+
 
 def get_channels_for_data_folder(datafolder):
     channels = []

kolibri/core/assets/src/mixins/responsive-window.js

@@ -160,7 +160,7 @@ function addWindowListener(cb) {
 }
 
 function removeWindowListener(cb) {
-  windowListeners.pop(cb);
+  windowListeners.splice(windowListeners.indexOf(cb), 1);
 }
 
 /* setup */

kolibri/core/assets/src/state/getters.js

@@ -73,6 +73,10 @@ function contentPoints(state) {
   return Math.floor(state.core.logging.summary.progress) * MaxPointsPerContent;
 }
 
+function sessionTimeSpent(state) {
+  return state.core.logging.session.time_spent;
+}
+
 export {
   isUserLoggedIn,
   isSuperuser,
@@ -88,4 +92,5 @@ export {
   contentPoints,
   currentUserId,
   facilityConfig,
+  sessionTimeSpent,
 };

kolibri/core/assets/src/views/k-breadcrumbs/index.vue

@@ -1,6 +1,6 @@
 <template>
 
-  <div>
+  <div v-show="crumbs.length > 1">
     <nav class="breadcrumbs">
       <div v-show="collapsedCrumbs.length" class="breadcrumbs-dropdown-wrapper">
         <ui-icon-button :has-dropdown="true" icon="expand_more" size="small">

kolibri/core/templates/kolibri/base.html

@@ -9,6 +9,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="{% static 'images/logo.ico' %}">
   <title>{% trans "Kolibri" %}</title>
+  {% if LANGUAGE_CODE == "ach-ug" %}
+    <script type="text/javascript">
+      var _jipt = [];
+      _jipt.push(['project', 'kolibri']);
+    </script>
+    <script type="text/javascript" src="//cdn.crowdin.com/jipt/jipt.js"></script>
+  {% endif %}
 </head>
 <body>
 <rootvue>

kolibri/deployment/default/settings/translation.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
+
+import django.conf.locale
+
+from .base import *  # noqa isort:skip @UnusedWildImport
+
+LANGUAGES = [  # noqa
+    ('ach-ug', 'In context translation'),
+]
+
+EXTRA_LANG_INFO = {
+    'ach-ug': {
+        'bidi': False,
+        'code': 'ach-ug',
+        'name': 'In context translation',
+        'name_local': 'Language Name',
+    },
+}
+
+LANGUAGE_CODE = "ach-ug"
+
+django.conf.locale.LANG_INFO.update(EXTRA_LANG_INFO)