From d8a0b97f609164ac9f67b4a34d6a42d3c4e42b8c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 23 Mar 2015 14:00:07 +0400 Subject: Update CLDR to v27 + A bunch of fixes in the locale data + New scripts from Unicode 7.0 + New locales - Some locales disappeared (aa_DJ, aa_ER, st_LS, ss_SZ, swc_CD, tn_BW) - Some locales lost their contents (i.e. en_Dsrt_US) [ChangeLog][QtCore] QLocale data updated to CLDR v.27 Change-Id: Iba8c7884f8087e577cbb25a8fc106dd7bd3ebb5d Reviewed-by: Lars Knoll --- util/local_database/cldr2qlocalexml.py | 68 +++++++++++++++++----------------- util/local_database/enumdata.py | 55 ++++++++++++++++++++++++--- 2 files changed, 84 insertions(+), 39 deletions(-) (limited to 'util/local_database') diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py index 697a2b6f71..400b7a51f8 100755 --- a/util/local_database/cldr2qlocalexml.py +++ b/util/local_database/cldr2qlocalexml.py @@ -803,42 +803,42 @@ for key in locale_keys: print " " + fixOrdStrMinus(l['minus']) + "" print " " + fixOrdStrPlus(l['plus']) + "" print " " + fixOrdStrExp(l['exp']) + "" - print " " + l['quotationStart'].encode('utf-8') + "" - print " " + l['quotationEnd'].encode('utf-8') + "" - print " " + l['alternateQuotationStart'].encode('utf-8') + "" - print " " + l['alternateQuotationEnd'].encode('utf-8') + "" - print " " + l['listPatternPartStart'].encode('utf-8') + "" - print " " + l['listPatternPartMiddle'].encode('utf-8') + "" - print " " + l['listPatternPartEnd'].encode('utf-8') + "" - print " " + l['listPatternPartTwo'].encode('utf-8') + "" - print " " + l['am'].encode('utf-8') + "" - print " " + l['pm'].encode('utf-8') + "" - print " " + l['firstDayOfWeek'].encode('utf-8') + "" - print " " + l['weekendStart'].encode('utf-8') + "" - print " " + l['weekendEnd'].encode('utf-8') + "" - print " " + l['longDateFormat'].encode('utf-8') + "" - print " " + l['shortDateFormat'].encode('utf-8') + "" - print " " + l['longTimeFormat'].encode('utf-8') + "" - print " " + l['shortTimeFormat'].encode('utf-8') + "" - print " " + l['standaloneLongMonths'].encode('utf-8') + "" - print " "+ l['standaloneShortMonths'].encode('utf-8') + "" - print " "+ l['standaloneNarrowMonths'].encode('utf-8') + "" - print " " + l['longMonths'].encode('utf-8') + "" - print " " + l['shortMonths'].encode('utf-8') + "" - print " " + l['narrowMonths'].encode('utf-8') + "" - print " " + l['longDays'].encode('utf-8') + "" - print " " + l['shortDays'].encode('utf-8') + "" - print " " + l['narrowDays'].encode('utf-8') + "" - print " " + l['standaloneLongDays'].encode('utf-8') + "" - print " " + l['standaloneShortDays'].encode('utf-8') + "" - print " " + l['standaloneNarrowDays'].encode('utf-8') + "" - print " " + l['currencyIsoCode'].encode('utf-8') + "" - print " " + l['currencySymbol'].encode('utf-8') + "" - print " " + l['currencyDisplayName'].encode('utf-8') + "" + print " " + escape(l['quotationStart']).encode('utf-8') + "" + print " " + escape(l['quotationEnd']).encode('utf-8') + "" + print " " + escape(l['alternateQuotationStart']).encode('utf-8') + "" + print " " + escape(l['alternateQuotationEnd']).encode('utf-8') + "" + print " " + escape(l['listPatternPartStart']).encode('utf-8') + "" + print " " + escape(l['listPatternPartMiddle']).encode('utf-8') + "" + print " " + escape(l['listPatternPartEnd']).encode('utf-8') + "" + print " " + escape(l['listPatternPartTwo']).encode('utf-8') + "" + print " " + escape(l['am']).encode('utf-8') + "" + print " " + escape(l['pm']).encode('utf-8') + "" + print " " + escape(l['firstDayOfWeek']).encode('utf-8') + "" + print " " + escape(l['weekendStart']).encode('utf-8') + "" + print " " + escape(l['weekendEnd']).encode('utf-8') + "" + print " " + escape(l['longDateFormat']).encode('utf-8') + "" + print " " + escape(l['shortDateFormat']).encode('utf-8') + "" + print " " + escape(l['longTimeFormat']).encode('utf-8') + "" + print " " + escape(l['shortTimeFormat']).encode('utf-8') + "" + print " " + escape(l['standaloneLongMonths']).encode('utf-8') + "" + print " "+ escape(l['standaloneShortMonths']).encode('utf-8') + "" + print " "+ escape(l['standaloneNarrowMonths']).encode('utf-8') + "" + print " " + escape(l['longMonths']).encode('utf-8') + "" + print " " + escape(l['shortMonths']).encode('utf-8') + "" + print " " + escape(l['narrowMonths']).encode('utf-8') + "" + print " " + escape(l['longDays']).encode('utf-8') + "" + print " " + escape(l['shortDays']).encode('utf-8') + "" + print " " + escape(l['narrowDays']).encode('utf-8') + "" + print " " + escape(l['standaloneLongDays']).encode('utf-8') + "" + print " " + escape(l['standaloneShortDays']).encode('utf-8') + "" + print " " + escape(l['standaloneNarrowDays']).encode('utf-8') + "" + print " " + escape(l['currencyIsoCode']).encode('utf-8') + "" + print " " + escape(l['currencySymbol']).encode('utf-8') + "" + print " " + escape(l['currencyDisplayName']).encode('utf-8') + "" print " " + str(l['currencyDigits']) + "" print " " + str(l['currencyRounding']) + "" - print " " + l['currencyFormat'].encode('utf-8') + "" - print " " + l['currencyNegativeFormat'].encode('utf-8') + "" + print " " + escape(l['currencyFormat']).encode('utf-8') + "" + print " " + escape(l['currencyNegativeFormat']).encode('utf-8') + "" print " " print " " print "" diff --git a/util/local_database/enumdata.py b/util/local_database/enumdata.py index b9f8077a59..fbeadfb610 100644 --- a/util/local_database/enumdata.py +++ b/util/local_database/enumdata.py @@ -351,7 +351,32 @@ language_list = { 311 : [ "Ugaritic", "uga" ], 312 : [ "Akoose", "bss" ], 313 : [ "Lakota", "lkt" ], - 314 : [ "Standard Moroccan Tamazight", "zgh" ] + 314 : [ "Standard Moroccan Tamazight", "zgh" ], + 315 : [ "Mapuche", "arn" ], + 316 : [ "Central Kurdish", "ckb" ], + 317 : [ "LowerSorbian", "dsb" ], + 318 : [ "UpperSorbian", "hsb" ], + 319 : [ "Kenyang", "ken" ], + 320 : [ "Mohawk", "moh" ], + 321 : [ "Nko", "nqo" ], + 322 : [ "Prussian", "prg" ], + 323 : [ "Kiche", "quc" ], + 324 : [ "Southern Sami", "sma" ], + 325 : [ "Lule Sami", "smj" ], + 326 : [ "Inari Sami", "smn" ], + 327 : [ "Skolt Sami", "sms" ], + 328 : [ "Warlpiri", "wbp" ], + 329 : [ "Manichaean Middle Persian", "xmn" ], + 330 : [ "Mende", "men" ], + 331 : [ "Ancient North Arabian", "xna" ], + 332 : [ "Linear A", "lab" ], + 333 : [ "Hmong Njua", "hnj" ], + 334 : [ "Ho", "hoc" ], + 335 : [ "Lezghian", "lez" ], + 336 : [ "Bassa", "bsq" ], + 337 : [ "Mono", "mru" ], + 338 : [ "Tedim Chin", "ctd" ], + 339 : [ "Maithili", "mai" ] } country_list = { @@ -720,13 +745,33 @@ script_list = { 101 : [ "Takri", "Takr" ], 102 : [ "Ugaritic", "Ugar" ], 103 : [ "Braille", "Brai" ], - 104 : [ "Hiragana", "Hira" ] + 104 : [ "Hiragana", "Hira" ], + 105 : [ "Caucasian Albanian", "Aghb" ], + 106 : [ "Bassa Vah", "Bass" ], + 107 : [ "Duployan", "Dupl" ], + 108 : [ "Elbasan", "Elba" ], + 109 : [ "Grantha", "Gran" ], + 110 : [ "Pahawh Hmong", "Hmng" ], + 111 : [ "Khojki", "Khoj" ], + 112 : [ "Linear A", "Lina" ], + 113 : [ "Mahajani", "Mahj" ], + 114 : [ "Manichaean", "Mani" ], + 115 : [ "Mende Kikakui", "Mend" ], + 116 : [ "Modi", "Modi" ], + 117 : [ "Mro", "Mroo" ], + 118 : [ "Old North Arabian", "Narb" ], + 119 : [ "Nabataean", "Nbat" ], + 120 : [ "Palmyrene", "Palm" ], + 121 : [ "Pau Cin Hau", "Pauc" ], + 122 : [ "Old Permic", "Perm" ], + 123 : [ "Psalter Pahlavi", "Phlp" ], + 124 : [ "Siddham", "Sidd" ], + 125 : [ "Khudawadi", "Sind" ], + 126 : [ "Tirhuta", "Tirh" ], + 127 : [ "Varang Kshiti", "Wara" ] # ### : [ "Blissymbols", "Blis" ], -# ### : [ "Linear A", "Lina" ], # ### : [ "Naxi Geba", "Nkgb" ], -# ### : [ "Pahawh Hmong", "Hmng" ], -# ### : [ "Varang Kshiti", "Wara" ], } def countryCodeToId(code): -- cgit v1.2.3