Changeset 7091

Timestamp:

02/05/08 19:04:30 (5 months ago)

Author:

mtredinnick

Message:

Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn).

This was inadvertently broken back in [6608]. Slightly backwards-incompatible:
people specifying "es_AR" in their LANGUAGES list will need to change that to
"es-ar". Thanks, simonb and Ramiro Morales for making the effort to fix this.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/utils/translation/trans_real.py (modified) (4 diffs)
• django/trunk/tests/regressiontests/i18n/misc.py (modified) (2 diffs)

django/trunk/django/conf/global_settings.py

@@ -48 +48 @@
-    ('en', gettext_noop('English')),
-    ('es', gettext_noop('Spanish')),
-_AR
+-ar
-    ('fa', gettext_noop('Persian')),
-    ('fi', gettext_noop('Finnish')),

django/trunk/django/utils/translation/trans_real.py

@@ -43 +43 @@
-
-def to_locale(language, to_lower=False):
-
+
+
+
+
-    p = language.find('-')
-    if p >= 0:
@@ -358 +361 @@
-
-    accept = request.META.get('HTTP_ACCEPT_LANGUAGE', '')
-
-
+accept_
+accept_
-            break
-
@@ -365 +368 @@
-        # specifier, since they all must be UTF-8 and only one possible
-        # language each time. So we avoid the overhead of gettext.find() and
-
-
-
+
+
+
+
+
-        if not normalized:
-            continue
-
-        # Remove the default encoding from locale_alias
-        normalized = normalized.split('.')[0]
@@ -379 +383 @@
-            return _accepted[normalized]
-
-
+
+
-            if lang not in supported:
-                continue
-lang
+dirname
-                    'django.mo')
-            if os.path.exists(langfile):

django/trunk/tests/regressiontests/i18n/misc.py

@@ -2 +2 @@
->>> from django.utils.translation.trans_real import parse_accept_lang_header
->>> p = parse_accept_lang_header
+
+#
+# Testing HTTP header parsing. First, we test that we can parse the values
+# according to the spec (and that we extract all the pieces in the right order).
+#
-
-Good headers.
@@ -55 +60 @@
-[]
-
+#
+# Now test that we parse a literal HTTP header correctly.
+#
+
+>>> from django.utils.translation.trans_real import get_language_from_request
+>>> g = get_language_from_request
+>>> from django.http import HttpRequest
+>>> r = HttpRequest
+>>> r.COOKIES = {}
+
+These tests assumes the es, es_AR, pt and pt_BR translations exit in the Django
+source tree.
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'pt-br'}
+>>> g(r)
+'pt-br'
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'pt'}
+>>> g(r)
+'pt'
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es,de'}
+>>> g(r)
+'es'
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-ar,de'}
+>>> g(r)
+'es-ar'
+
+This test assumes there won't be a Django translation to a US variation
+of the Spanish language, a safe assumption. When the user sets it
+as the preferred language, the main 'es' translation should be selected
+instead.
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-us'}
+>>> g(r)
+'es'
+
+This tests the following scenario: there isn't a main language (zh)
+translation of Django but there is a translation to variation (zh_CN)
+the user sets zh-cn as the preferred language, it should be selected by
+Django without falling back nor ignoring it.
+>>> r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-cn,de'}
+>>> g(r)
+'zh-cn'
-"""