Merge pull request #39

* kluo/update-translation-config:
  Update JS translation strings for Ginkgo
  Update translation config for consolidated tos and honor

.tx/config

@@ -97,9 +97,9 @@ source_file = conf/locale/en/LC_MESSAGES/theme.po
 source_lang = en
 type = PO
 
-[stanford-openedx.tos]
-file_filter = conf/locale/<lang>/LC_MESSAGES/tos.po
-source_file = conf/locale/en/LC_MESSAGES/tos.po
+[stanford-openedx.tos_and_honor]
+file_filter = conf/locale/<lang>/LC_MESSAGES/tos_and_honor.po
+source_file = conf/locale/en/LC_MESSAGES/tos_and_honor.po
 source_lang = en
 type = PO
 
@@ -109,12 +109,6 @@ source_file = conf/locale/en/LC_MESSAGES/privacy.po
 source_lang = en
 type = PO
 
-[stanford-openedx.honor]
-file_filter = conf/locale/<lang>/LC_MESSAGES/honor.po
-source_file = conf/locale/en/LC_MESSAGES/honor.po
-source_lang = en
-type = PO
-
 [stanford-openedx.copyright]
 file_filter = conf/locale/<lang>/LC_MESSAGES/copyright.po
 source_file = conf/locale/en/LC_MESSAGES/copyright.po

conf/locale/stanford_config.yaml

@@ -103,21 +103,10 @@ ignore_dirs:
     - '*/terrain'
     - '*/spec'
     - '*/tests'
-    - '*/features'
+    - '*/djangoapps/*/features'
     # Directories full of auto-generated JS
     - lms/static/js/i18n
     - cms/static/js/i18n
-    # Features not used by Stanford
-    - 'cms'
-    - 'common/djangoapps/course_mode'
-    - '*/management/commands'
-    - 'common/djangoapps/xblock_django'
-    - 'lms/djangoapps/dashboard'
-    - 'lms/djangoapps/instructor*'
-    - 'lms/djangoapps/teams'
-    - 'lms/templates/wiki'
-    - '*/word_cloud'
-    - 'openedx/stanford/lms/djangoapps/instructor'
 
 # Third-party installed apps that we also extract strings from.  When adding a
 # file here, also add it to the django.po merge files below, and to the
@@ -129,21 +118,18 @@ ignore_dirs:
 # See pavelib/utils/stanford_i18n_helpers.py for details.
 segment:
     theme.po:
-        - tos.po:
-            - lagunita/lms/templates/static_templates/tos.html
+        - tos_and_honor.po:
+            - lagunita/lms/templates/static_templates/tos_and_honor.html
         - privacy.po:
             - lagunita/lms/templates/static_templates/privacy.html
-        - honor.po:
-            - lagunita/lms/templates/static_templates/honor.html
         - copyright.po:
             - lagunita/lms/templates/static_templates/copyright.html
 
 # How should the generate step merge files?
 generate_merge:
     theme.po:
-        - tos.po
+        - tos_and_honor.po
         - privacy.po
-        - honor.po
         - copyright.po
         - theme.po
         - stanford_django.po

openedx/stanford/pavelib/utils/i18n_helpers.py

@@ -61,7 +61,7 @@ def extract_platform_mako():
 
 
 def extract_platform_underscore():
-    underscore_config = CONFIG.locale_dir / 'stanford_underscore.cfg'
+    underscore_config = CONFIG.locale_dir / 'babel_underscore.cfg'
     underscore_file = CONFIG.source_messages_dir / 'stanford_underscore.po'
     output = _extract_babel(underscore_config, underscore_file)
     return output