diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/local_database/enumdata.py | 9 | ||||
| -rwxr-xr-x | util/local_database/qlocalexml2cpp.py | 1 |
2 files changed, 7 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 = { diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py index 0f10f8ce2d..b1dfddea23 100755 --- a/util/local_database/qlocalexml2cpp.py +++ b/util/local_database/qlocalexml2cpp.py @@ -809,6 +809,7 @@ def main(): qlocaleh_temp_file.write(" RepublicOfKorea = SouthKorea,\n") qlocaleh_temp_file.write(" RussianFederation = Russia,\n") qlocaleh_temp_file.write(" SyrianArabRepublic = Syria,\n") + qlocaleh_temp_file.write(" LatinAmericaAndTheCaribbean = LatinAmerica,\n") qlocaleh_temp_file.write("\n") qlocaleh_temp_file.write(" LastCountry = " + country + "\n") qlocaleh_temp_file.write(" };\n") |