From: Barry Warsaw <barry@python.org>
Date: Mon, 16 Oct 2000 15:47:50 +0000 (+0000)
Subject: find(): Application of (slightly modified) SF patch #101928 by Ulf
X-Git-Tag: v2.0~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75f8101c429e132472bba92f3972b7eac68f35f8;p=python

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.
---

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 578490f68c..9bebb11ac4 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -208,13 +208,13 @@ def find(domain, localedir=None, languages=None):
         if 'C' not in languages:
             languages.append('C')
     # now normalize and expand the languages
-    langdict = {}
+    nelangs = []
     for lang in languages:
         for nelang in _expand_lang(lang):
-            langdict[nelang] = nelang
-    languages = langdict.keys()
+            if nelang not in nelangs:
+                nelangs.append(nelang)
     # select a language
-    for lang in languages:
+    for lang in nelangs:
         if lang == 'C':
             break
         mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % domain)