Merge pull request #2388 from cpennington/initial-languages

Add initial languages, ready for dark-launch

.gitignore

@@ -30,14 +30,14 @@ codekit-config.json
 
 ### Internationalization artifacts
 *.mo
+*.po
+!django.po
+!django.mo
+!djangojs.po
+!djangojs.mo
 conf/locale/en/LC_MESSAGES/*.po
-!messages.po
-### Remove when we have real Esperanto translations. For now, ignore
-### dummy Esperanto files.
-conf/locale/eo/*
-## Remove when we officially support these languages.
-conf/locale/fr
-conf/locale/ko_KR
+conf/locale/en/LC_MESSAGES/*.mo
+conf/locale/messages.mo
 
 ### Testing artifacts
 .testids/

.tx/config

@@ -13,9 +13,9 @@ source_file = conf/locale/en/LC_MESSAGES/django-studio.po
 source_lang = en
 type = PO
 
-[edx-platform.djangojs]
-file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
-source_file = conf/locale/en/LC_MESSAGES/djangojs.po
+[edx-platform.djangojs-partial]
+file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs-partial.po
+source_file = conf/locale/en/LC_MESSAGES/djangojs-partial.po
 source_lang = en
 type = PO
 

cms/envs/common.py

+# -*- coding: utf-8 -*-
 """
 This is the common settings file, intended to set sane defaults. If you have a
 piece of configuration that's dependent on a set of feature flags being set,
@@ -254,10 +255,7 @@ STATICFILES_DIRS = [
 TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
 
-LANGUAGES = (
-    ('eo', 'Esperanto'),
-)
-
+LANGUAGES = lms.envs.common.LANGUAGES
 USE_I18N = True
 USE_L10N = True
 

common/djangoapps/dark_lang/middleware.py

@@ -45,7 +45,7 @@ class DarkLangMiddleware(object):
         """
         ``True`` iff one of the values in ``self.released_langs`` is a prefix of ``lang_code``.
         """
-        return any(lang_code.startswith(released_lang) for released_lang in self.released_langs)
+        return any(lang_code.lower().startswith(released_lang.lower()) for released_lang in self.released_langs)
 
     def _format_accept_value(self, lang, priority=1.0):
         """

common/djangoapps/dark_lang/tests.py

 """
 Tests of DarkLangMiddleware
 """
-
 from django.contrib.auth.models import User
 from django.http import HttpRequest
 
@@ -122,6 +121,24 @@ class DarkLangMiddlewareTests(TestCase):
             self.process_request(accept='rel-ter;q=1.0, rel;q=0.5')
         )
 
+    def test_accept_mixed_case(self):
+        self.assertAcceptEquals(
+            'rel-TER;q=1.0, REL;q=0.5',
+            self.process_request(accept='rel-TER;q=1.0, REL;q=0.5')
+        )
+
+        DarkLangConfig(
+            released_languages=('REL-TER'),
+            changed_by=self.user,
+            enabled=True
+        ).save()
+
+        self.assertAcceptEquals(
+            'rel-ter;q=1.0',
+            self.process_request(accept='rel-ter;q=1.0, rel;q=0.5')
+        )
+
+
     def assertSessionLangEquals(self, value, request):
         """
         Assert that the 'django_language' set in request.session is equal to value

conf/locale/config.yaml

 # Configuration for i18n workflow.
 
 locales:
-    - en
+    - en  # English - Source Language
+    - ach  # Acoli
+    - ar  # Arabic
+    - bg_BG  # Bulgarian (Bulgaria)
+    - bn  # Bengali
+    - bn_BD  # Bengali (Bangladesh)
+    - cs  # Czech
+    - cy  # Welsh
+    - de_DE  # German (Germany)
+    - en@lolcat  # LOLCAT English
+    - en@pirate  # Pirate English
+    - es_419  # Spanish (Latin America)
+    - es_EC  # Spanish (Ecuador)
+    - es_ES  # Spanish (Spain)
+    - es_MX  # Spanish (Mexico)
+    - es_US  # Spanish (United States)
+    - et_EE  # Estonian (Estonia)
+    - fa  # Persian
+    - fa_IR  # Persian (Iran)
+    - fi_FI  # Finnish (Finland)
+    - fr  # French
+    - gl  # Galician
+    - he  # Hebrew
+    - hi  # Hindi
+    - hy_AM  # Armenian (Armenia)
+    - id  # Indonesian
+    - it_IT  # Italian (Italy)
+    - ja_JP  # Japanese (Japan)
+    - km_KH  # Khmer (Cambodia)
+    - ko_KR  # Korean (Korea)
+    - lt_LT  # Lithuanian (Lithuania)
+    - ml  # Malayalam
+    - nb  # Norwegian Bokmål
+    - nl_NL  # Dutch (Netherlands)
+    - pl  # Polish
+    - pt_BR  # Portuguese (Brazil)
+    - pt_PT  # Portuguese (Portugal)
+    - ru  # Russian
+    - si  # Sinhala
+    - sk  # Slovak
+    - sl  # Slovenian
+    - th  # Thai
+    - tr_TR  # Turkish (Turkey)
+    - uk  # Ukranian
+    - vi  # Vietnamese
+    - zh_CN  # Chinese (China)
+    - zh_CN.GB2312  # Chinese (China) (GB2312)
+    - zh_TW  # Chinese (Taiwan)
 
-    # More languages we might want someday, these have started on Transifex.
-    # fr
-    # ko_KR
-    # ru
-    # es_419
-    # ja_JP
-    # pt_BR
-    # zh_CN
-    # zh_TW
-    # ar
-    # es_ES
-    # fa_IR
-    # tr_TR
-    # de_DE
-    # id
-    # hi
-    # vi
-    # pt_PT
-    # lt_LT
-    # gl
-    # it_IT
-    # cs
-    # et_EE
-    # nb
-    # sk
 
 # The locale used for fake-accented English, for testing.
 dummy-locale: eo
@@ -53,7 +75,7 @@ segment:
         django-studio.po:       #  produces this .po file..
             - cms/*             #   by segregating strings from these files.
         # Anything that doesn't match a pattern stays in the original file.
-    djangojs.po:
+    djangojs-partial.po:
         djangojs-studio.po:
             - cms/*
     mako.po:
@@ -69,5 +91,5 @@ generate_merge:
         - mako-studio.po
         - messages.po
     djangojs.po:
-        - djangojs.po
+        - djangojs-partial.po
         - djangojs-studio.po