Follow SHORTER_LANGUAGES when creating app manifests (bug 835407)

This also fixes a bug in the translations app where we were comparing
the lowercase locale to settings.HIDDEN_LANGUAGES which (for
Marketplace) had locales of the form xx-YY. The result was no
translation saved for locales in HIDDEN_LANGUAGES. This updates them to
go through amo.utils.to_language which returns the xx-YY form. It also
switches from using settings.LANGUAGES (lowercase locales) to
settings.AMO_LANGUAGES.

Author: Rob Hudson

apps/files/utils.py

@@ -265,11 +265,7 @@ def parse(self, fileorpath):
                 'default_locale': default_locale}
 
     def trans_locale(self, locale):
-        # TODO(Kumar) translate all possible locale differences.
-        # 'en' might be the only one in need of translating.
-        if locale == 'en':
-            locale = 'en-us'
-        return to_language(locale)
+        return to_language(settings.SHORTER_LANGUAGES.get(locale, locale))
 
     def trans_all_locales(self, locale_dict):
         trans = {}

apps/translations/fields.py

@@ -136,7 +136,6 @@ def __set__(self, instance, value):
         elif getattr(instance, self.field.attname, None) is None:
             super(TranslationDescriptor, self).__set__(instance, None)
 
-
     def translation_from_string(self, instance, lang, string):
         """Create, save, and return a Translation from a string."""
         try:
@@ -165,11 +164,12 @@ def translation_from_dict(self, instance, lang, dict_):
 
         If one of the locales matches lang, that Translation will be returned.
         """
+        from amo.utils import to_language as amo_to_language
+
         rv = None
         for locale, string in dict_.items():
-            loc = locale.lower()
-            if (loc not in settings.LANGUAGES and
-                loc not in settings.HIDDEN_LANGUAGES):
+            loc = amo_to_language(locale)
+            if loc not in settings.AMO_LANGUAGES + settings.HIDDEN_LANGUAGES:
                 continue
             # The Translation is created and saved in here.
             trans = self.translation_from_string(instance, locale, string)

apps/translations/tests/test_models.py

@@ -201,7 +201,7 @@ def test_update_with_dict(self):
         trans_eq(get_model().name, 'oui', 'fr')
 
     def test_dict_with_hidden_locale(self):
-        with self.settings(HIDDEN_LANGUAGES=['xxx']):
+        with self.settings(HIDDEN_LANGUAGES=('xxx',)):
             o = TranslatedModel.objects.get(id=1)
             o.name = {'en-US': 'active language', 'xxx': 'hidden language',
                       'de': 'another language'}

mkt/submit/tests/test_views.py

@@ -353,7 +353,17 @@ def test_premium(self):
         self.assertSetEqual(app.device_types, [amo.DEVICE_GAIA])
         eq_(app.premium_type, amo.ADDON_PREMIUM)
 
+    def test_short_locale(self):
+        # This manifest has a locale code of "pt" which is in the
+        # SHORTER_LANGUAGES setting and should get converted to "pt-PT".
+        self.manifest = self.manifest_path('short-locale.webapp')
+        self.upload = self.get_upload(abspath=self.manifest)
+        addon = self.post_addon()
+        eq_(addon.default_locale, 'pt-PT')
+
     def test_unsupported_detail_locale(self):
+        # This manifest has a locale code of "en-GB" which is unsupported, so
+        # we default to "en-US".
         self.manifest = self.manifest_path('unsupported-default-locale.webapp')
         self.upload = self.get_upload(abspath=self.manifest)
         addon = self.post_addon()

mkt/submit/tests/webapps/short-locale.webapp

@@ -0,0 +1,31 @@
+{
+  "version": "1.0",
+  "name": "MozillaBall ょ",
+  "description": "God save the Queen!",
+  "icons": {
+    "16": "/img/icon-16.png",
+    "48": "/img/icon-48.png",
+    "128": "/img/icon-128.png"
+  },
+  "widget": {
+    "path": "/widget.html",
+    "width": 100,
+    "height": 200
+  },
+  "developer": {
+    "name": "Mozilla Labs",
+    "url": "http://mozillalabs.com"
+  },
+  "installs_allowed_from": [
+    "*"
+  ],
+  "locales": {
+    "es": {
+      "description": "¡Acción abierta emocionante del desarrollo del Web!",
+      "developer": {
+        "url": "http://es.mozillalabs.com/"
+      }
+    }
+  },
+  "default_locale": "pt"
+}