summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-11-21 15:53:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-21 18:23:59 +0100
commit3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6 (patch)
tree6dd2968d79937e5278a3b6a0ed0f5fcabf548802 /util
parent4a115ab4ae7b6bf0327d35ce23bccab23eb7e460 (diff)
downloadqtbase-3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6.tar.gz
qtbase-3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6.tar.bz2
qtbase-3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6.zip
Update Qlocale data up to CLDR 22.1
Change-Id: Ie6ddfec14cb052e0b89230dc93290ff79488fb25 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'util')
-rw-r--r--util/local_database/enumdata.py18
-rw-r--r--util/local_database/xpathlite.py2
2 files changed, 15 insertions, 5 deletions
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index 49f6579648..446f8a0f2f 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -299,7 +299,13 @@ language_list = {
251 : [ "Tasawaq", "twq" ],
252 : [ "Vai", "vai" ],
253 : [ "Walser", "wae" ],
- 254 : [ "Yangben", "yav" ]
+ 254 : [ "Yangben", "yav" ],
+ 255 : [ "Avestan", "ae" ],
+ 256 : [ "Asturian", "ast" ],
+ 257 : [ "Ngomba", "jgo" ],
+ 258 : [ "Kako", "kkj" ],
+ 259 : [ "Meta", "mgo" ],
+ 260 : [ "Ngiemboon", "nnh" ]
}
country_list = {
@@ -455,7 +461,7 @@ country_list = {
149 : [ "Nauru", "NR" ],
150 : [ "Nepal", "NP" ],
151 : [ "Netherlands", "NL" ],
- 152 : [ "NetherlandsAntilles", "AN" ],
+ 152 : [ "CuraSao", "CW" ],
153 : [ "NewCaledonia", "NC" ],
154 : [ "NewZealand", "NZ" ],
155 : [ "Nicaragua", "NI" ],
@@ -556,7 +562,10 @@ country_list = {
250 : [ "CeutaAndMelilla", "EA" ],
251 : [ "IsleOfMan", "IM" ],
252 : [ "Jersey", "JE" ],
- 253 : [ "TristanDaCunha", "TA" ]
+ 253 : [ "TristanDaCunha", "TA" ],
+ 254 : [ "SouthSudan", "SS" ],
+ 255 : [ "Bonaire", "BQ" ],
+ 256 : [ "SintMaarten", "SX" ]
}
script_list = {
@@ -594,7 +603,8 @@ script_list = {
31 : [ "Tibetan", "Tibt" ],
32 : [ "Sinhala", "Sinh" ],
33 : [ "Syriac", "Syri" ],
- 34 : [ "Yi", "Yiii" ]
+ 34 : [ "Yi", "Yiii" ],
+ 35 : [ "Vai", "Vaii" ]
}
def countryCodeToId(code):
diff --git a/util/local_database/xpathlite.py b/util/local_database/xpathlite.py
index 02cdc65e04..71c4557fc7 100644
--- a/util/local_database/xpathlite.py
+++ b/util/local_database/xpathlite.py
@@ -150,7 +150,7 @@ def _findEntryInFile(file, path, draft=None, attribute=None):
tag_name = tag_spec[:left_bracket]
arg_value = tag_spec[left_bracket+1:-1].split("=")
if len(arg_value) == 2:
- arg_name = arg_value[0]
+ arg_name = arg_value[0].replace("@", "").replace("'", "")
arg_value = arg_value[1]
else:
arg_value = arg_value[0]