From 72544950e198c08ac49ba9d878ea7440313b13a7 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 7 Jul 2008 01:57:05 +0000 Subject: [PATCH] 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. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7857 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- AUTHORS | 1 + django/utils/translation/trans_real.py | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/AUTHORS b/AUTHORS index c902404f3c3..7e91eda833a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -280,6 +280,7 @@ answer newbie questions, and generally made Django that much better: Neal Norwitz Todd O'Bryan oggie rob + oggy Jay Parlar Carlos Eduardo de Paula pavithran s diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index bcc5e4b83d4..451420c7d88 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -161,6 +161,15 @@ def translation(language): 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): t = _translation(path) if t is not None: