Ticket #7163: trans_real_v7513v2.diff

django/utils/translation/trans_real.py

@@ -161 +161 @@
 
         res = _translation(globalpath)
 
+        def _base_lang(lang):
+            try:
+                return lang[:lang.index('-')]
+            except ValueError:
+                return lang
+        
+        if _base_lang(lang) in [_base_lang(trans) for trans in _translations]:
+            from copy import deepcopy
+            res = deepcopy(res)
+
         def _merge(path):
             t = _translation(path)
             if t is not None: