summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-11-14 18:09:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-15 13:55:00 +0100
commite4c2a5c29f78def39801d8f2ea12b954594f7e7d (patch)
tree78c3749c98ed937c3b3ddde0b67e2376ae6b0bdf /util
parent1e0e5f2d68f58843d900467eea6981b5a28244f5 (diff)
downloadqtbase-e4c2a5c29f78def39801d8f2ea12b954594f7e7d.tar.gz
Assign correct codes to QLocale::AnyCountry and AnyScript
as their meaning, in fact, is unknown (or default) country/script. Change-Id: Id75a70d4b33c2092de414f3ac357f6bcb627ba47 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/local_database/cldr2qlocalexml.py14
-rw-r--r--util/local_database/enumdata.py10
2 files changed, 13 insertions, 11 deletions
diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py
index e5accece74..2ad41cbec9 100755
--- a/util/local_database/cldr2qlocalexml.py
+++ b/util/local_database/cldr2qlocalexml.py
@@ -135,26 +135,22 @@ def generateLocaleInfo(path):
return {}
language_id = enumdata.languageCodeToId(language_code)
- if language_id == -1:
+ if language_id <= 0:
sys.stderr.write("unknown language code \"" + language_code + "\"\n")
return {}
language = enumdata.language_list[language_id][0]
script_id = enumdata.scriptCodeToId(script_code)
- if script_code == -1:
+ if script_id == -1:
sys.stderr.write("unknown script code \"" + script_code + "\"\n")
return {}
- script = "AnyScript"
- if script_id != -1:
- script = enumdata.script_list[script_id][0]
+ script = enumdata.script_list[script_id][0]
country_id = enumdata.countryCodeToId(country_code)
- country = ""
- if country_id != -1:
- country = enumdata.country_list[country_id][0]
- if country == "":
+ if country_id <= 0:
sys.stderr.write("unknown country code \"" + country_code + "\"\n")
return {}
+ country = enumdata.country_list[country_id][0]
# So we say we accept only those values that have "contributed" or
# "approved" resolution. see http://www.unicode.org/cldr/process.html
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index 326eaab287..1c92aec944 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -264,7 +264,7 @@ language_list = {
}
country_list = {
- 0 : [ "AnyCountry", " " ],
+ 0 : [ "AnyCountry", "ZZ" ],
1 : [ "Afghanistan", "AF" ],
2 : [ "Albania", "AL" ],
3 : [ "Algeria", "DZ" ],
@@ -514,7 +514,7 @@ country_list = {
}
script_list = {
- 0 : [ "AnyScript", "" ],
+ 0 : [ "AnyScript", "Zzzz" ],
1 : [ "Arabic", "Arab" ],
2 : [ "Cyrillic", "Cyrl" ],
3 : [ "Deseret", "Dsrt" ],
@@ -552,18 +552,24 @@ script_list = {
}
def countryCodeToId(code):
+ if not code:
+ return 0
for country_id in country_list:
if country_list[country_id][1] == code:
return country_id
return -1
def languageCodeToId(code):
+ if not code:
+ return 0
for language_id in language_list:
if language_list[language_id][1] == code:
return language_id
return -1
def scriptCodeToId(code):
+ if not code:
+ return 0
for script_id in script_list:
if script_list[script_id][1] == code:
return script_id