Changeset 841

Timestamp:

10/11/05 13:26:32 (3 years ago)

Author:

hugo

Message:

i18n: corrected sublanguage handling (de-de now mapps to de, if de-de isn't present) in django.utils.translation

Files:

• django/branches/i18n/django/utils/translation.py (modified) (1 diff)

django/branches/i18n/django/utils/translation.py

@@ -283 +283 @@
-                _accepted[accept] = lang
-                return lang
+            elif lang.find('-') >= 0:
+                (lang, sublang) = lang.split('-', 1)
+                if lang == 'en' or os.path.isfile(os.path.join(globalpath, lang, 'LC_MESSAGES', 'django.mo')):
+                    _accepted[accept] = lang
+                    return lang
-    
-    return settings.LANGUAGE_CODE