summaryrefslogtreecommitdiffstats
path: root/util/local_database/enumdata.py
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-08-10 15:11:30 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2018-08-13 16:17:53 +0000
commit44b6757fe50b6bf581864d3da519a3ff60818fa8 (patch)
tree2a3407a6de781c63112b18176b4d510c56311f5b /util/local_database/enumdata.py
parentfd38c97a6c5b7bfab39b5f814d68a02e4d197e70 (diff)
Add support for numbered territories in CLDR
The CLDR data contains eight locales with numeric territory codes, 001 for World, 150 for Europe and 419 for Latin America. The last was already known in our enumdata.py, but as "Latin America and The Caribbean", which is not supported by the CLDR, so I've amended it while adding the other two. This gives us support for Esperanto and Yiddish (among others). [ChangeLog][QtCore][QLocale] Added support for World and Europe as (numeric) "country" codes ("territory" in CLDR terms), thereby enabling support for Yiddish and Esperanto, among other locales using such codes. Task-number: QTBUG-57802 Change-Id: Ibb1180fb720743a3a0589527649d10f3c9cd123d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'util/local_database/enumdata.py')
-rw-r--r--util/local_database/enumdata.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py
index 2d16e5851d..d8f6453d31 100644
--- a/util/local_database/enumdata.py
+++ b/util/local_database/enumdata.py
@@ -29,7 +29,8 @@
# language_list and country_list reflect the current values of enums in qlocale.h
# If new xml language files are available in CLDR, these languages and countries
-# need to be *appended* to this list.
+# need to be *appended* to this list (for compatibility between versions).
+### Qt 6: restore alphabetic order in each list.
language_list = {
0 : [ "AnyLanguage", " " ],
@@ -641,7 +642,7 @@ country_list = {
243 : [ "Serbia", "RS" ],
244 : [ "Saint Barthelemy", "BL" ],
245 : [ "Saint Martin", "MF" ],
- 246 : [ "LatinAmericaAndTheCaribbean", "419" ],
+ 246 : [ "Latin America", "419" ],
247 : [ "AscensionIsland", "AC" ],
248 : [ "AlandIslands", "AX" ],
249 : [ "DiegoGarcia", "DG" ],
@@ -654,7 +655,9 @@ country_list = {
256 : [ "SintMaarten", "SX" ],
257 : [ "Kosovo", "XK" ],
258 : [ "European Union", "EU" ],
- 259 : [ "Outlying Oceania", "QO" ]
+ 259 : [ "Outlying Oceania", "QO" ],
+ 260 : [ "World", "001" ],
+ 261 : [ "Europe", "150" ]
}
script_list = {