Commit a2fd05ab authored by Barry Warsaw's avatar Barry Warsaw

find(): Application of (slightly modified) SF patch #101928 by Ulf

Betlehem, verified by Peter Funk.  Fixes preservation of language
search order lost due to use of dictionary keys instead of a list.
Closes SF bug #116964.
parent e6ea573b
...@@ -208,13 +208,13 @@ def find(domain, localedir=None, languages=None): ...@@ -208,13 +208,13 @@ def find(domain, localedir=None, languages=None):
if 'C' not in languages: if 'C' not in languages:
languages.append('C') languages.append('C')
# now normalize and expand the languages # now normalize and expand the languages
langdict = {} nelangs = []
for lang in languages: for lang in languages:
for nelang in _expand_lang(lang): for nelang in _expand_lang(lang):
langdict[nelang] = nelang if nelang not in nelangs:
languages = langdict.keys() nelangs.append(nelang)
# select a language # select a language
for lang in languages: for lang in nelangs:
if lang == 'C': if lang == 'C':
break break
mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain) mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment