Changeset 7857

Timestamp:

07/06/08 20:57:05 (2 months ago)

Author:

mtredinnick

Message:

Fixed #7163 -- Fixed a translation-sharing problem so that you can have en-gb
and en-us at the app-level, even though Django only has an "en" translation
(for example). Analysis and patch from ognjen.maric@gmail.com.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/utils/translation/trans_real.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -281 +281 @@
-    Todd O'Bryan <toddobryan@mac.com>
-    oggie rob <oz.robharvey@gmail.com>
+    oggy <ognjen.maric@gmail.com>
-    Jay Parlar <parlar@gmail.com>
-    Carlos Eduardo de Paula <carlosedp@gmail.com>

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

@@ -161 +161 @@
-
-        res = _translation(globalpath)
+
+        # We want to ensure that, for example,  "en-gb" and "en-us" don't share
+        # the same translation object (thus, merging en-us with a local update
+        # doesn't affect en-gb), even though they will both use the core "en"
+        # translation. So we have to subvert Python's internal gettext caching.
+        base_lang = lambda x: x.split('-', 1)[0]
+        if base_lang(lang) in [base_lang(trans) for trans in _translations]:
+            res._info = res._info.copy()
+            res._catalog = res._catalog.copy()
-
-        def _merge(path):