equal
deleted
inserted
replaced
126 elt = nextSiblingElt(elt, "defaultCountry"); |
126 elt = nextSiblingElt(elt, "defaultCountry"); |
127 return result |
127 return result |
128 |
128 |
129 def fixedCountryName(name, dupes): |
129 def fixedCountryName(name, dupes): |
130 if name in dupes: |
130 if name in dupes: |
131 return name + "Country" |
131 return name.replace(" ", "") + "Country" |
132 return name |
132 return name.replace(" ", "") |
133 |
133 |
134 def fixedLanguageName(name, dupes): |
134 def fixedLanguageName(name, dupes): |
135 if name in dupes: |
135 if name in dupes: |
136 return name + "Language" |
136 return name.replace(" ", "") + "Language" |
137 return name |
137 return name.replace(" ", "") |
138 |
138 |
139 def findDupes(country_map, language_map): |
139 def findDupes(country_map, language_map): |
140 country_set = set([ v[0] for a, v in country_map.iteritems() ]) |
140 country_set = set([ v[0] for a, v in country_map.iteritems() ]) |
141 language_set = set([ v[0] for a, v in language_map.iteritems() ]) |
141 language_set = set([ v[0] for a, v in language_map.iteritems() ]) |
142 return country_set & language_set |
142 return country_set & language_set |
225 locale_list_elt = firstChildElt(doc.documentElement, "localeList") |
225 locale_list_elt = firstChildElt(doc.documentElement, "localeList") |
226 locale_elt = firstChildElt(locale_list_elt, "locale") |
226 locale_elt = firstChildElt(locale_list_elt, "locale") |
227 while locale_elt: |
227 while locale_elt: |
228 locale = Locale(locale_elt) |
228 locale = Locale(locale_elt) |
229 language_id = languageNameToId(locale.language, language_map) |
229 language_id = languageNameToId(locale.language, language_map) |
|
230 if language_id == -1: |
|
231 sys.stderr.write("Cannot find a language id for %s\n" % locale.language) |
230 country_id = countryNameToId(locale.country, country_map) |
232 country_id = countryNameToId(locale.country, country_map) |
|
233 if country_id == -1: |
|
234 sys.stderr.write("Cannot find a country id for %s\n" % locale.country) |
231 result[(language_id, country_id)] = locale |
235 result[(language_id, country_id)] = locale |
232 |
236 |
233 locale_elt = nextSiblingElt(locale_elt, "locale") |
237 locale_elt = nextSiblingElt(locale_elt, "locale") |
234 |
238 |
235 return result |
239 return result |