Ticket #750: translation.2.py.diff

django/utils/translation.py

@@ -253 +253 @@
 gettext_lazy = lazy(gettext, str)
 ngettext_lazy = lazy(ngettext, str)
 
-def check_for_language(lang_code):
+def check_for_language(lang, supported_langs, globalpath):
     """
     Checks whether there is a global language file for the given language code.
     This is used to decide whether a user-provided language is available.
     """
-    from django.conf import settings
-    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
-    else:
-        return False
+    return ((lang in supported_langs or (lang.find('_')>=0 and lang.split('_')[0] in supported_langs))
+            and gettext_module.find('django', globalpath, [to_locale(lang)]) is not None)
 
 def get_language_from_request(request):
     """
@@ -273 +269 @@
     from django.conf import settings
     globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
 
+    supported_langs = [a for (a,b) in settings.LANGUAGES]
+    # take into account language normalization
+    sublangs = filter(lambda a:a.find('_')>=0, supported_langs)
+    supported_langs += [a.split('_')[0] for a in sublangs]
+
     if hasattr(request, 'session'):
         lang_code = request.session.get('django_language', None)
-        if lang_code is not None and check_for_language(lang_code):
+        if lang_code is not None and check_for_language(lang_code, supported_langs, globalpath):
             return lang_code
 
     lang_code = request.COOKIES.get('django_language', None)
-    if lang_code is not None and check_for_language(lang_code):
+    if lang_code is not None and check_for_language(lang_code, supported_langs, globalpath):
         return lang_code
 
     accept = request.META.get('HTTP_ACCEPT_LANGUAGE', None)
@@ -306 +307 @@
         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
+            if lang in supported_langs or (lang.find('_')>=0 and lang.split('_')[0] in supported_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
 
     return settings.LANGUAGE_CODE