Ticket #7163: trans_real_v7513v3.diff
File trans_real_v7513v3.diff, 774 bytes (added by , 16 years ago) |
---|
-
django/utils/translation/trans_real.py
161 161 162 162 res = _translation(globalpath) 163 163 164 def _base_lang(lang): 165 try: 166 return lang[:lang.index('-')] 167 except ValueError: 168 return lang 169 170 if _base_lang(lang) in [_base_lang(trans) for trans in _translations]: 171 from copy import deepcopy 172 res._info = deepcopy(res._info) 173 res._catalog = deepcopy(res._catalog) 174 164 175 def _merge(path): 165 176 t = _translation(path) 166 177 if t is not None: