Ticket #750: translation.py.diff

django/utils/translation.py

@@ -259 +259 @@
     This is used to decide whether a user-provided language is available.
     """
     from django.conf import settings
+    is_supported = False
+    for l in settings.LANGUAGES:
+        if lang_code == l[0]:
+            is_supported = True
+    if not is_supported:
+        return False
     globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
     if gettext_module.find('django', globalpath, [to_locale(lang_code)]) is not None:
         return True
@@ -306 +312 @@
         langs.sort(lambda a,b: -1*cmp(a[1], b[1]))
 
         for lang, order in langs:
-            langfile = gettext_module.find('django', globalpath, [to_locale(lang)])
-            if langfile:
-                # reconstruct the actual language from the language
-                # filename, because otherwise we might incorrectly
-                # report de_DE if we only have de available, but
-                # did find de_DE because of language normalization
-                lang = langfile[len(globalpath):].split(os.path.sep)[1]
-                _accepted[accept] = lang
-                return lang
+            is_supported = False
+            for l in settings.LANGUAGES:
+                if lang == l[0]:
+                    is_supported = True
+            if is_supported:
+                langfile = gettext_module.find('django', globalpath, [to_locale(lang)])
+                if langfile:
+                    # reconstruct the actual language from the language
+                    # filename, because otherwise we might incorrectly
+                    # report de_DE if we only have de available, but
+                    # did find de_DE because of language normalization
+                    lang = langfile[len(globalpath):].split(os.path.sep)[1]
+                    _accepted[accept] = lang
+                    return lang
 
     return settings.LANGUAGE_CODE