Merge pull request #1163 from learningequality/release-v0.3.x

Release v0.3.1
learningequality · Mar 31, 2017 · 8e84588 · 8e84588
2 parents 940672b + a3513f8
commit 8e84588
Show file tree

Hide file tree

Showing 59 changed files with 772 additions and 1,852 deletions.
diff --git a/kolibri/core/assets/src/core-actions.js b/kolibri/core/assets/src/core-actions.js
@@ -25,7 +25,7 @@ function _contentSummaryLoggingState(data) {
     start_timestamp: data.start_timestamp,
     completion_timestamp: data.completion_timestamp,
     end_timestamp: data.end_timestamp,
-    progress: data.progress,
+    progress: data.progress || 0,
     time_spent: data.time_spent,
     extra_fields: data.extra_fields,
     time_spent_before_current_session: data.time_spent,
@@ -43,7 +43,7 @@ function _contentSessionLoggingState(data) {
     time_spent: data.time_spent,
     extra_fields: data.extra_fields,
     total_time_at_last_save: data.time_spent,
-    progress: data.progress,
+    progress: data.progress || 0,
     progress_at_last_save: data.progress,
   };
   return state;
@@ -57,7 +57,7 @@ function _contentSummaryModel(store) {
     start_timestamp: summaryLog.start_timestamp,
     end_timestamp: summaryLog.end_timestamp,
     completion_timestamp: summaryLog.completion_timestamp,
-    progress: summaryLog.progress,
+    progress: summaryLog.progress || 0,
     time_spent: summaryLog.time_spent,
     extra_fields: summaryLog.extra_fields,
   };
@@ -71,7 +71,7 @@ function _contentSessionModel(store) {
     start_timestamp: sessionLog.start_timestamp,
     end_timestamp: sessionLog.end_timestamp,
     time_spent: sessionLog.time_spent,
-    progress: sessionLog.progress,
+    progress: sessionLog.progress || 0,
     extra_fields: sessionLog.extra_fields,
   };
   if (store.state.core.session.kind[0] !== UserKinds.SUPERUSER) {

diff --git a/kolibri/deployment/default/settings/base.py b/kolibri/deployment/default/settings/base.py
@@ -17,8 +17,9 @@
 
 # import kolibri, so we can get the path to the module.
 import kolibri
+# we load other utilities related to i18n
 # This is essential! We load the kolibri conf INSIDE the Django conf
-from kolibri.utils import conf
+from kolibri.utils import conf, i18n
 
 KOLIBRI_MODULE_PATH = os.path.dirname(kolibri.__file__)
 
@@ -64,6 +65,13 @@
     'django_js_reverse',
 ] + conf.config['INSTALLED_APPS']
 
+# Add in the external plugins' locale paths. Our frontend messages depends
+# specifically on the value of LOCALE_PATHS to find its catalog files.
+LOCALE_PATHS += [
+    i18n.get_installed_app_locale_path(app) for app in INSTALLED_APPS
+    if i18n.is_external_plugin(app)
+]
+
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',

diff --git a/kolibri/locale/docs/es_ES/LC_MESSAGES/authors.po b/kolibri/locale/docs/es_ES/LC_MESSAGES/authors.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: kolibri\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-02-02 00:07+0000\n"
-"PO-Revision-Date: 2017-03-16 17:16-0400\n"
+"PO-Revision-Date: 2017-03-31 03:03-0400\n"
 "Last-Translator: learningequality <[email protected]>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"