diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-07 01:57:05 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-07 01:57:05 +0000 |
| commit | 72544950e198c08ac49ba9d878ea7440313b13a7 (patch) | |
| tree | ba67840f7cc0dffbad919808bfafe3bc368b9d06 | |
| parent | 8975bba742151a6a3164d5c7df7d793f12a7c5c1 (diff) | |
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
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/utils/translation/trans_real.py | 9 |
2 files changed, 10 insertions, 0 deletions
@@ -280,6 +280,7 @@ answer newbie questions, and generally made Django that much better: Neal Norwitz <nnorwitz@google.com> 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> pavithran s <pavithran.s@gmail.com> diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index bcc5e4b83d..451420c7d8 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: |