1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use newer names for various languages, territories and scripts

Browse Source 
Our enumdata.py namings of countries had fallen somewhat out of sync
with CLDR's names. In the process, support including hyphenation in
the unsquashed name, along with spacing. Distinguish, in comments,
between older renamings and those first seen in Qt6.

Change-Id: I91ec444bf35222ab6a9332e389ace19cca0e4fdf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-10-19 15:13:21 +02:00
parent ed853a66f8
commit 73ceb71576
8 changed files with 983 additions and 1164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/corelib/text/qlocale.h
View File

@ -90,7 +90,7 @@ public:
Azerbaijani = 12,
Bashkir = 13,
Basque = 14,
Bengali = 15,
Bangla = 15,
Dzongkha = 16,
Bislama = 18,
Breton = 19,
@ -118,7 +118,7 @@ public:
Georgian = 41,
German = 42,
Greek = 43,
Greenlandic = 44,
Kalaallisut = 44,
Guarani = 45,
Gujarati = 46,
Hausa = 47,
@ -130,7 +130,7 @@ public:
Interlingua = 53,
Interlingue = 54,
Inuktitut = 55,
Inupiak = 56,
Inupiaq = 56,
Irish = 57,
Italian = 58,
Japanese = 59,
@ -139,7 +139,7 @@ public:
Kashmiri = 62,
Kazakh = 63,
Kinyarwanda = 64,
Kirghiz = 65,
Kyrgyz = 65,
Korean = 66,
Kurdish = 67,
Rundi = 68,
@ -161,7 +161,7 @@ public:
Nepali = 84,
NorwegianBokmal = 85,
Occitan = 86,
Oriya = 87,
Odia = 87,
Pashto = 88,
Persian = 89,
Polish = 90,
@ -202,7 +202,7 @@ public:
Turkish = 125,
Turkmen = 126,
Tahitian = 127,
Uighur = 128,
Uyghur = 128,
Ukrainian = 129,
Urdu = 130,
Uzbek = 131,
@ -236,7 +236,7 @@ public:
Friulian = 159,
Venda = 160,
Ewe = 161,
Walamo = 162,
Wolaytta = 162,
Hawaiian = 163,
Tyap = 164,
Nyanja = 165,
@ -286,7 +286,7 @@ public:
Rwa = 209,
Luo = 210,
Chiga = 211,
CentralMoroccoTamazight = 212,
CentralAtlasTamazight = 212,
KoyraboroSenni = 213,
Shambala = 214,
Bodo = 215,
@ -302,11 +302,11 @@ public:
Kanuri = 225,
Komi = 226,
Kongo = 227,
Kwanyama = 228,
Kuanyama = 228,
Limburgish = 229,
LubaKatanga = 230,
Luxembourgish = 231,
Navaho = 232,
Navajo = 232,
Ndonga = 233,
Ojibwa = 234,
Pali = 235,
@ -405,14 +405,24 @@ public:
NigerianPidgin = 370,
Afan = Oromo,
Bengali = Bangla,
Bhutani = Dzongkha,
Byelorussian = Belarusian,
Cambodian = Khmer,
CentralMoroccoTamazight = CentralAtlasTamazight,
Chewa = Nyanja,
Frisian = WesternFrisian,
Greenlandic = Kalaallisut,
Inupiak = Inupiaq,
Kirghiz = Kyrgyz,
Kurundi = Rundi,
Kwanyama = Kuanyama,
Navaho = Navajo,
Oriya = Odia,
RhaetoRomance = Romansh,
Uigur = Uighur,
Uighur = Uyghur,
Uigur = Uyghur,
Walamo = Wolaytta,
LastLanguage = NigerianPidgin
};
@ -429,7 +439,7 @@ public:
MongolianScript = 8,
TifinaghScript = 9,
ArmenianScript = 10,
BengaliScript = 11,
BanglaScript = 11,
CherokeeScript = 12,
DevanagariScript = 13,
EthiopicScript = 14,
@ -444,7 +454,7 @@ public:
LaoScript = 23,
MalayalamScript = 24,
MyanmarScript = 25,
OriyaScript = 26,
OdiaScript = 26,
TamilScript = 27,
TeluguScript = 28,
ThaanaScript = 29,
@ -533,7 +543,7 @@ public:
LinearAScript = 112,
MahajaniScript = 113,
ManichaeanScript = 114,
MendeKikakuiScript = 115,
MendeScript = 115,
ModiScript = 116,
MroScript = 117,
OldNorthArabianScript = 118,
@ -561,6 +571,9 @@ public:
HanWithBopomofoScript = 140,
JamoScript = 141,
BengaliScript = BanglaScript,
MendeKikakuiScript = MendeScript,
OriyaScript = OdiaScript,
SimplifiedChineseScript = SimplifiedHanScript,
TraditionalChineseScript = TraditionalHanScript,
@ -595,7 +608,7 @@ public:
Bermuda = 24,
Bhutan = 25,
Bolivia = 26,
BosniaAndHerzegowina = 27,
BosniaAndHerzegovina = 27,
Botswana = 28,
BouvetIsland = 29,
Brazil = 30,
@ -625,12 +638,12 @@ public:
Croatia = 54,
Cuba = 55,
Cyprus = 56,
CzechRepublic = 57,
Czechia = 57,
Denmark = 58,
Djibouti = 59,
Dominica = 60,
DominicanRepublic = 61,
EastTimor = 62,
TimorLeste = 62,
Ecuador = 63,
Egypt = 64,
ElSalvador = 65,
@ -694,7 +707,7 @@ public:
Liechtenstein = 123,
Lithuania = 124,
Luxembourg = 125,
Macau = 126,
Macao = 126,
Macedonia = 127,
Madagascar = 128,
Malawi = 129,
@ -720,7 +733,7 @@ public:
NauruCountry = 149,
Nepal = 150,
Netherlands = 151,
CuraSao = 152,
Curacao = 152,
NewCaledonia = 153,
NewZealand = 154,
Nicaragua = 155,
@ -750,7 +763,7 @@ public:
Rwanda = 179,
SaintKittsAndNevis = 180,
SaintLucia = 181,
SaintVincentAndTheGrenadines = 182,
SaintVincentAndGrenadines = 182,
Samoa = 183,
SanMarino = 184,
SaoTomeAndPrincipe = 185,
@ -764,15 +777,15 @@ public:
SolomonIslands = 193,
Somalia = 194,
SouthAfrica = 195,
SouthGeorgiaAndTheSouthSandwichIslands = 196,
SouthGeorgiaAndSouthSandwichIslands = 196,
Spain = 197,
SriLanka = 198,
SaintHelena = 199,
SaintPierreAndMiquelon = 200,
Sudan = 201,
Suriname = 202,
SvalbardAndJanMayenIslands = 203,
Swaziland = 204,
SvalbardAndJanMayen = 203,
Eswatini = 204,
Sweden = 205,
Switzerland = 206,
Syria = 207,
@ -794,16 +807,16 @@ public:
UnitedArabEmirates = 223,
UnitedKingdom = 224,
UnitedStates = 225,
UnitedStatesMinorOutlyingIslands = 226,
UnitedStatesOutlyingIslands = 226,
Uruguay = 227,
Uzbekistan = 228,
Vanuatu = 229,
VaticanCityState = 230,
VaticanCity = 230,
Venezuela = 231,
Vietnam = 232,
BritishVirginIslands = 233,
UnitedStatesVirginIslands = 234,
WallisAndFutunaIslands = 235,
WallisAndFutuna = 235,
WesternSahara = 236,
Yemen = 237,
CanaryIslands = 238,
@ -823,7 +836,7 @@ public:
Jersey = 252,
TristanDaCunha = 253,
SouthSudan = 254,
Bonaire = 255,
CaribbeanNetherlands = 255,
SintMaarten = 256,
Kosovo = 257,
EuropeanUnion = 258,
@ -831,13 +844,26 @@ public:
World = 260,
Europe = 261,
Bonaire = CaribbeanNetherlands,
BosniaAndHerzegowina = BosniaAndHerzegovina,
CuraSao = Curacao,
CzechRepublic = Czechia,
DemocraticRepublicOfCongo = CongoKinshasa,
DemocraticRepublicOfKorea = NorthKorea,
EastTimor = TimorLeste,
LatinAmericaAndTheCaribbean = LatinAmerica,
Macau = Macao,
PeoplesRepublicOfCongo = CongoBrazzaville,
RepublicOfKorea = SouthKorea,
RussianFederation = Russia,
SaintVincentAndTheGrenadines = SaintVincentAndGrenadines,
SouthGeorgiaAndTheSouthSandwichIslands = SouthGeorgiaAndSouthSandwichIslands,
SvalbardAndJanMayenIslands = SvalbardAndJanMayen,
Swaziland = Eswatini,
SyrianArabRepublic = Syria,
UnitedStatesMinorOutlyingIslands = UnitedStatesOutlyingIslands,
VaticanCityState = VaticanCity,
WallisAndFutunaIslands = WallisAndFutuna,
LastCountry = Europe
};

50
src/corelib/text/qlocale.qdoc
View File

@ -135,6 +135,7 @@
\value Balinese Since Qt 5.1
\value Bambara
\value Bamun Since Qt 5.1
\value Bangla Since Qt 6.0
\value Basaa
\value Bashkir
\value Basque
@ -142,7 +143,7 @@
\value Belarusian
\value Bemba
\value Bena
\value Bengali
\value Bengali Obsolete, please use Bangla
\value Bhojpuri Since Qt 5.7
\value Bhutani Obsolete, please use Dzongkha
\value Bislama
@ -158,8 +159,9 @@
\value Cantonese Since Qt 5.7
\value Catalan
\value Cebuano Since Qt 5.14
\value CentralAtlasTamazight Since Qt 6.0
\value CentralKurdish Since Qt 5.5
\value CentralMoroccoTamazight
\value CentralMoroccoTamazight Obsolete, please use CentralAtlasTamazight
\value Chakma Since Qt 5.1
\value Chamorro
\value Chechen
@ -207,7 +209,7 @@
\value German
\value Gothic Since Qt 5.1
\value Greek
\value Greenlandic
\value Greenlandic Obsolete, please use Kalaallisut
\value Guarani
\value Gujarati
\value Gusii
@ -228,7 +230,8 @@
\value Interlingua
\value Interlingue
\value Inuktitut
\value Inupiak
\value Inupiak Obsolete, please use Inupiaq
\value Inupiaq Since 6.0
\value Irish
\value Italian
\value Japanese
@ -238,6 +241,7 @@
\value Kabuverdianu
\value Kabyle
\value Kako
\value Kalaallisut Since Qt 6.0
\value Kalenjin
\value Kamba
\value Kannada
@ -249,7 +253,7 @@
\value Kiche Since Qt 5.5
\value Kikuyu
\value Kinyarwanda
\value Kirghiz
\value Kirghiz Obsolete, please use Kyrgyz
\value Komi
\value Kongo
\value Konkani
@ -258,10 +262,12 @@
\value KoyraboroSenni
\value KoyraChiini
\value Kpelle
\value Kuanyama Since 6.0
\value Kurdish
\value Kurundi Obsolete, please use Rundi
\value Kwanyama
\value Kwanyama Obsolete, please use Kuanyama
\value Kwasio
\value Kyrgyz Since 6.0
\value Lakota Since Qt 5.3
\value Langi
\value Lao
@ -308,7 +314,8 @@
\value Muscogee Since Qt 5.14
\value Nama
\value NauruLanguage
\value Navaho
\value Navaho Obsolete, please use Navajo
\value Navajo Since 6.0
\value Ndonga
\value Nepali
\value Newari Since Qt 5.7
@ -326,11 +333,12 @@
\value Nyanja
\value Nyankole
\value Occitan
\value Odia Since 6.0
\value Ojibwa
\value OldIrish Since Qt 5.1
\value OldNorse Since Qt 5.1
\value OldPersian Since Qt 5.1
\value Oriya
\value Oriya Obsolete, please use Odia
\value Oromo
\value Osage Since Qt 5.7
\value Ossetic
@ -415,24 +423,26 @@
\value TuvaluLanguage Since Qt 5.7
\value Tyap
\value Ugaritic Since Qt 5.1
\value Uighur
\value Uigur Obsolete, please use Uighur
\value Uighur Obsolete, please use Uyghur
\value Uigur Obsolete, please use Uyghur
\value Ukrainian
\value UpperSorbian Since Qt 5.5
\value Urdu
\value Uyghur Since 6.0
\value Uzbek
\value Vai
\value Venda
\value Vietnamese
\value Volapuk
\value Vunjo
\value Walamo
\value Walamo Obsolete, please use Wolaytta
\value Walloon
\value Walser
\value Warlpiri Since Qt 5.5
\value Welsh
\value WesternBalochi Since Qt 5.12
\value WesternFrisian same as Frisian
\value Wolaytta Since 6.0
\value Wolof
\value Xhosa
\value Yangben
@ -483,7 +493,8 @@
\value Bhutan
\value Bolivia
\value Bonaire
\value BosniaAndHerzegowina
\value BosniaAndHerzegowina Obsolete, please use BosniaAndHerzegovina
\value BosniaAndHerzegovina Since 6.0
\value Botswana
\value BouvetIsland
\value Brazil
@ -515,9 +526,11 @@
\value CostaRica
\value Croatia
\value Cuba
\value CuraSao
\value Curacao Since Qt 6.0
\value CuraSao Obsolete, please use Curacao
\value Cyprus
\value CzechRepublic
\value Czechia Since 6.0
\value CzechRepublic Obsolete, please use Czechia
\value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa
\value DemocraticRepublicOfKorea Obsolete, please use NorthKorea
\value Denmark
@ -743,9 +756,10 @@
\value AvestanScript Since Qt 5.1
\value BalineseScript Since Qt 5.1
\value BamumScript Since Qt 5.1
\value BanglaScript Since 6.0
\value BassaVahScript Since Qt 5.5
\value BatakScript Since Qt 5.1
\value BengaliScript
\value BengaliScript Obsolete, please use BanglaScript
\value BhaiksukiScript Since Qt 5.7
\value BopomofoScript Since Qt 5.1
\value BrahmiScript Since Qt 5.1
@ -813,7 +827,8 @@
\value ManichaeanScript Since Qt 5.5
\value MarchenScript Since Qt 5.7
\value MeiteiMayekScript Since Qt 5.1
\value MendeKikakuiScript Since Qt 5.5
\value MendeScript Since Qt 6.0
\value MendeKikakuiScript Obsolete, please use MendeScript
\value MeroiticCursiveScript Since Qt 5.1
\value MeroiticScript Since Qt 5.1
\value ModiScript Since Qt 5.5
@ -833,7 +848,8 @@
\value OldPermicScript Since Qt 5.5
\value OldPersianScript Since Qt 5.1
\value OldSouthArabianScript Since Qt 5.1
\value OriyaScript
\value OdiaScript Since 6.0
\value OriyaScript Obsolete, please use OdiaScript
\value OrkhonScript Since Qt 5.1
\value OsageScript Since Qt 5.7
\value OsmanyaScript Since Qt 5.1

1739
src/corelib/text/qlocale_data_p.h
View File

File diff suppressed because it is too large Load Diff

60
src/corelib/time/qhijricalendar_data_p.h
View File

@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2020-10-08 from the
This part of the file was generated on 2020-10-21 from the
Common Locale Data Repository v37
http://www.unicode.org/cldr/
@ -110,14 +110,14 @@ static const QCalendarLocale locale_data[] = {
{ 8, 1, 254, 284, 284, 284, 284, 380, 380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/South Sudan
{ 8, 1, 260, 284, 284, 284, 284, 380, 380, 96, 96, 96, 96, 26, 26 },// Arabic/Arabic/World
{ 9, 10, 11, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Armenian/Armenian/Armenia
{ 10, 11, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Assamese/Bengali/India
{ 10, 11, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Assamese/Bangla/India
{ 12, 7, 15, 406, 406, 516, 516, 184, 184,110,110, 71, 71, 26, 26 },// Azerbaijani/Latin/Azerbaijan
{ 12, 1, 102, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Azerbaijani/Arabic/Iran
{ 12, 2, 15, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
{ 13, 2, 178, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Bashkir/Cyrillic/Russia
{ 14, 7, 197, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Basque/Latin/Spain
{ 15, 11, 18, 587, 587, 587, 587, 691, 691,104,104,104,104, 26, 26 },// Bengali/Bengali/Bangladesh
{ 15, 11, 100, 587, 587, 587, 587, 691, 691,104,104,104,104, 26, 26 },// Bengali/Bengali/India
{ 15, 11, 18, 587, 587, 587, 587, 691, 691,104,104,104,104, 26, 26 },// Bangla/Bangla/Bangladesh
{ 15, 11, 100, 587, 587, 587, 587, 691, 691,104,104,104,104, 26, 26 },// Bangla/Bangla/India
{ 16, 31, 25, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Dzongkha/Tibetan/Bhutan
{ 19, 7, 74, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Breton/Latin/France
{ 20, 2, 33, 717, 717, 106, 106, 184, 184, 96, 96, 78, 78, 26, 26 },// Bulgarian/Cyrillic/Bulgaria
@ -130,23 +130,23 @@ static const QCalendarLocale locale_data[] = {
{ 24, 7, 106, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Catalan/Latin/Italy
{ 25, 5, 44, 813, 813, 850, 850, 184, 184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
{ 25, 5, 97, 813, 813, 850, 850, 184, 184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
{ 25, 5, 126, 813, 813, 850, 850, 184, 184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
{ 25, 5, 126, 813, 813, 850, 850, 184, 184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macao
{ 25, 5, 190, 813, 813, 850, 850, 184, 184, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
{ 25, 6, 97, 888, 888, 888, 888, 184, 184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Hong Kong
{ 25, 6, 126, 888, 888, 888, 888, 184, 184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Macau
{ 25, 6, 126, 888, 888, 888, 888, 184, 184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Macao
{ 25, 6, 208, 888, 888, 888, 888, 184, 184, 71, 71, 71, 71, 26, 26 },// Chinese/Traditional Han/Taiwan
{ 26, 7, 74, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Corsican/Latin/France
{ 27, 7, 54, 0, 0, 106, 106, 959, 959,106,106, 78, 78, 38, 38 },// Croatian/Latin/Croatia
{ 27, 7, 27, 0, 0, 106, 106, 959, 959,106,106, 78, 78, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
{ 28, 7, 57, 997, 997, 1126, 1126, 184, 184,129,129, 76, 76, 26, 26 },// Czech/Latin/Czech Republic
{ 27, 7, 27, 0, 0, 106, 106, 959, 959,106,106, 78, 78, 38, 38 },// Croatian/Latin/Bosnia And Herzegovina
{ 28, 7, 57, 997, 997, 1126, 1126, 184, 184,129,129, 76, 76, 26, 26 },// Czech/Latin/Czechia
{ 29, 7, 58, 1202, 1202, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Danish/Latin/Denmark
{ 29, 7, 86, 1202, 1202, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Danish/Latin/Greenland
{ 30, 7, 151, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Netherlands
{ 30, 7, 12, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Aruba
{ 30, 7, 21, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Belgium
{ 30, 7, 152, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Cura Sao
{ 30, 7, 152, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Curacao
{ 30, 7, 202, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Suriname
{ 30, 7, 255, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Bonaire
{ 30, 7, 255, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Caribbean Netherlands
{ 30, 7, 256, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Dutch/Latin/Sint Maarten
{ 31, 7, 225, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United States
{ 31, 3, 225, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Deseret/United States
@ -193,7 +193,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 112, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Kiribati
{ 31, 7, 120, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Lesotho
{ 31, 7, 121, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Liberia
{ 31, 7, 126, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Macau
{ 31, 7, 126, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Macao
{ 31, 7, 128, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Madagascar
{ 31, 7, 129, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Malawi
{ 31, 7, 130, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Malaysia
@ -219,7 +219,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 179, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Rwanda
{ 31, 7, 180, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Kitts And Nevis
{ 31, 7, 181, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Lucia
{ 31, 7, 182, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Vincent And The Grenadines
{ 31, 7, 182, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Vincent And Grenadines
{ 31, 7, 183, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Samoa
{ 31, 7, 188, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Seychelles
{ 31, 7, 189, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Sierra Leone
@ -229,7 +229,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 195, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/South Africa
{ 31, 7, 199, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Saint Helena
{ 31, 7, 201, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Sudan
{ 31, 7, 204, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Swaziland
{ 31, 7, 204, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Eswatini
{ 31, 7, 205, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Sweden
{ 31, 7, 206, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Switzerland
{ 31, 7, 210, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Tanzania
@ -241,7 +241,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 221, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Uganda
{ 31, 7, 223, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United Arab Emirates
{ 31, 7, 224, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United Kingdom
{ 31, 7, 226, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United States Minor Outlying Islands
{ 31, 7, 226, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United States Outlying Islands
{ 31, 7, 229, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/Vanuatu
{ 31, 7, 233, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/British Virgin Islands
{ 31, 7, 234, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// English/Latin/United States Virgin Islands
@ -302,7 +302,7 @@ static const QCalendarLocale locale_data[] = {
{ 37, 7, 212, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Togo
{ 37, 7, 216, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Tunisia
{ 37, 7, 229, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Vanuatu
{ 37, 7, 235, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Wallis And Futuna Islands
{ 37, 7, 235, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Wallis And Futuna
{ 37, 7, 244, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Saint Barthelemy
{ 37, 7, 245, 1654, 1654, 1793, 1883, 184, 184,139,139, 90, 90, 26, 26 },// French/Latin/Saint Martin
{ 38, 7, 151, 1308, 1308, 1442, 1442, 184, 184,134,134, 83, 83, 26, 26 },// Western Frisian/Latin/Netherlands
@ -318,7 +318,7 @@ static const QCalendarLocale locale_data[] = {
{ 42, 7, 206, 2170, 2170, 106, 106, 184, 184,116,116, 78, 78, 26, 26 },// German/Latin/Switzerland
{ 43, 16, 85, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Greek/Greek/Greece
{ 43, 16, 56, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Greek/Greek/Cyprus
{ 44, 7, 86, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Greenlandic/Latin/Greenland
{ 44, 7, 86, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kalaallisut/Latin/Greenland
{ 45, 7, 168, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Guarani/Latin/Paraguay
{ 46, 17, 100, 2286, 2286, 2384, 2384, 184, 184, 98, 98, 74, 74, 26, 26 },// Gujarati/Gujarati/India
{ 47, 7, 157, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Hausa/Latin/Nigeria
@ -339,7 +339,7 @@ static const QCalendarLocale locale_data[] = {
{ 58, 7, 106, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Italian/Latin/Italy
{ 58, 7, 184, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Italian/Latin/San Marino
{ 58, 7, 206, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Italian/Latin/Switzerland
{ 58, 7, 230, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Italian/Latin/Vatican City State
{ 58, 7, 230, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Italian/Latin/Vatican City
{ 59, 19, 108, 3468, 3468, 3468, 3468, 184, 184, 97, 97, 97, 97, 26, 26 },// Japanese/Japanese/Japan
{ 60, 7, 101, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Javanese/Latin/Indonesia
{ 61, 21, 100, 3565, 3565, 3665, 3665, 184, 184,100,100, 79, 79, 26, 26 },// Kannada/Kannada/India
@ -347,7 +347,7 @@ static const QCalendarLocale locale_data[] = {
{ 62, 13, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kashmiri/Devanagari/India
{ 63, 2, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kazakh/Cyrillic/Kazakhstan
{ 64, 7, 179, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kinyarwanda/Latin/Rwanda
{ 65, 2, 116, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kirghiz/Cyrillic/Kyrgyzstan
{ 65, 2, 116, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kyrgyz/Cyrillic/Kyrgyzstan
{ 66, 22, 114, 3744, 3744, 106, 106, 184, 184, 69, 69, 78, 78, 26, 26 },// Korean/Korean/South Korea
{ 66, 22, 113, 3744, 3744, 106, 106, 184, 184, 69, 69, 78, 78, 26, 26 },// Korean/Korean/North Korea
{ 67, 7, 217, 3813, 3813, 106, 106, 184, 184,109,109, 78, 78, 26, 26 },// Kurdish/Latin/Turkey
@ -375,9 +375,9 @@ static const QCalendarLocale locale_data[] = {
{ 84, 13, 150, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nepali/Devanagari/Nepal
{ 84, 13, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nepali/Devanagari/India
{ 85, 7, 161, 4955, 4955, 5061, 5139, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Norway
{ 85, 7, 203, 4955, 4955, 5061, 5139, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
{ 85, 7, 203, 4955, 4955, 5061, 5139, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen
{ 86, 7, 74, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Occitan/Latin/France
{ 87, 26, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Oriya/Oriya/India
{ 87, 26, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Odia/Odia/India
{ 88, 1, 1, 5217, 5291, 5366, 5439, 184, 184, 74, 75, 73, 73, 26, 26 },// Pashto/Arabic/Afghanistan
{ 88, 1, 163, 5512, 5591, 5366, 5439, 184, 184, 79, 80, 73, 73, 26, 26 },// Pashto/Arabic/Pakistan
{ 89, 1, 102, 5671, 5761, 5671, 5761, 5853, 5853, 90, 92, 90, 92, 23, 23 },// Persian/Arabic/Iran
@ -386,11 +386,11 @@ static const QCalendarLocale locale_data[] = {
{ 91, 7, 30, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Brazil
{ 91, 7, 6, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Angola
{ 91, 7, 39, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Cape Verde
{ 91, 7, 62, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/East Timor
{ 91, 7, 62, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Timor-Leste
{ 91, 7, 66, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Equatorial Guinea
{ 91, 7, 92, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Guinea Bissau
{ 91, 7, 125, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Luxembourg
{ 91, 7, 126, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Macau
{ 91, 7, 126, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Macao
{ 91, 7, 146, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Mozambique
{ 91, 7, 173, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Portugal
{ 91, 7, 185, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Portuguese/Latin/Sao Tome And Principe
@ -412,10 +412,10 @@ static const QCalendarLocale locale_data[] = {
{ 98, 7, 41, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Sango/Latin/Central African Republic
{ 99, 13, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Sanskrit/Devanagari/India
{ 100, 2, 243, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Serbia
{ 100, 7, 27, 6789, 6883, 6980, 6980, 184, 184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Bosnia And Herzegowina
{ 100, 7, 27, 6789, 6883, 6980, 6980, 184, 184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Bosnia And Herzegovina
{ 100, 7, 242, 6789, 6883, 6980, 6980, 184, 184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Montenegro
{ 100, 7, 243, 6789, 6883, 6980, 6980, 184, 184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Serbia
{ 100, 2, 27, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegowina
{ 100, 2, 27, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegovina
{ 100, 2, 242, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Montenegro
{ 100, 2, 257, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Serbian/Cyrillic/Kosovo
{ 100, 7, 257, 6789, 6883, 6980, 6980, 184, 184, 94, 97, 72, 72, 26, 26 },// Serbian/Latin/Kosovo
@ -488,7 +488,7 @@ static const QCalendarLocale locale_data[] = {
{ 125, 7, 217, 8855, 8855, 8965, 8965, 184, 184,110,110, 83, 83, 26, 26 },// Turkish/Latin/Turkey
{ 125, 7, 56, 8855, 8855, 8965, 8965, 184, 184,110,110, 83, 83, 26, 26 },// Turkish/Latin/Cyprus
{ 126, 7, 218, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Turkmen/Latin/Turkmenistan
{ 128, 1, 44, 9048, 9048, 9048, 9048, 184, 184,118,118,118,118, 26, 26 },// Uighur/Arabic/China
{ 128, 1, 44, 9048, 9048, 9048, 9048, 184, 184,118,118,118,118, 26, 26 },// Uyghur/Arabic/China
{ 129, 2, 222, 9166, 9166, 9269, 9340, 184, 184,103,103, 71, 81, 26, 26 },// Ukrainian/Cyrillic/Ukraine
{ 130, 1, 163, 9421, 9421, 9517, 9517, 184, 184, 96, 96, 98, 98, 26, 26 },// Urdu/Arabic/Pakistan
{ 130, 1, 100, 9421, 9421, 9517, 9517, 184, 184, 96, 96, 98, 98, 26, 26 },// Urdu/Arabic/India
@ -505,8 +505,8 @@ static const QCalendarLocale locale_data[] = {
{ 138, 7, 23, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Yoruba/Latin/Benin
{ 140, 7, 195, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Zulu/Latin/South Africa
{ 141, 7, 161, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Nynorsk/Latin/Norway
{ 142, 7, 27, 9933, 9933,10031,10031, 184, 184, 98, 98, 74, 74, 26, 26 },// Bosnian/Latin/Bosnia And Herzegowina
{ 142, 2, 27, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegowina
{ 142, 7, 27, 9933, 9933,10031,10031, 184, 184, 98, 98, 74, 74, 26, 26 },// Bosnian/Latin/Bosnia And Herzegovina
{ 142, 2, 27, 6533, 6623, 6720, 6720, 184, 184, 90, 97, 69, 69, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegovina
{ 143, 29, 131, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Divehi/Thaana/Maldives
{ 144, 7, 251, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Manx/Latin/Isle Of Man
{ 145, 7, 224, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Cornish/Latin/United Kingdom
@ -526,7 +526,7 @@ static const QCalendarLocale locale_data[] = {
{ 160, 7, 195, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Venda/Latin/South Africa
{ 161, 7, 83,10105,10105,10191,10191, 184, 184, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Ghana
{ 161, 7, 212,10105,10105,10191,10191, 184, 184, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Togo
{ 162, 14, 69, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Walamo/Ethiopic/Ethiopia
{ 162, 14, 69, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Wolaytta/Ethiopic/Ethiopia
{ 163, 7, 225, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Hawaiian/Latin/United States
{ 164, 7, 157, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Tyap/Latin/Nigeria
{ 165, 7, 129, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nyanja/Latin/Malawi
@ -608,7 +608,7 @@ static const QCalendarLocale locale_data[] = {
{ 209, 7, 210, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Rwa/Latin/Tanzania
{ 210, 7, 111, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Luo/Latin/Kenya
{ 211, 7, 221, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Chiga/Latin/Uganda
{ 212, 7, 145, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Central Morocco Tamazight/Latin/Morocco
{ 212, 7, 145, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Central Atlas Tamazight/Latin/Morocco
{ 213, 7, 132, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Koyraboro Senni/Latin/Mali
{ 214, 7, 210, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Shambala/Latin/Tanzania
{ 215, 13, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Bodo/Devanagari/India
@ -644,7 +644,7 @@ static const QCalendarLocale locale_data[] = {
{ 261, 7, 197, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Aragonese/Latin/Spain
{ 272, 46, 18,10769,10769, 106, 106,10990,10990,221,221, 78, 78, 41, 41 },// Chakma/Chakma/Bangladesh
{ 272, 46, 100,10769,10769, 106, 106,10990,10990,221,221, 78, 78, 41, 41 },// Chakma/Chakma/India
{ 290, 11, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Manipuri/Bengali/India
{ 290, 11, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Manipuri/Bangla/India
{ 290, 72, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Manipuri/Meitei Mayek/India
{ 304, 78, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Santali/Ol Chiki/India
{ 304, 13, 100, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Santali/Devanagari/India

60
src/corelib/time/qjalalicalendar_data_p.h
View File

@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2020-10-08 from the
This part of the file was generated on 2020-10-21 from the
Common Locale Data Repository v37
http://www.unicode.org/cldr/
@ -110,14 +110,14 @@ static const QCalendarLocale locale_data[] = {
{ 8, 1, 254, 179, 179, 179, 179, 153, 153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/South Sudan
{ 8, 1, 260, 179, 179, 179, 179, 153, 153, 67, 67, 67, 67, 26, 26 },// Arabic/Arabic/World
{ 9, 10, 11, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Armenian/Armenian/Armenia
{ 10, 11, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Assamese/Bengali/India
{ 10, 11, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Assamese/Bangla/India
{ 12, 7, 15, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Latin/Azerbaijan
{ 12, 1, 102, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Arabic/Iran
{ 12, 2, 15, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
{ 13, 2, 178, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Bashkir/Cyrillic/Russia
{ 14, 7, 197, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Basque/Latin/Spain
{ 15, 11, 18, 246, 246, 334, 334, 421, 421, 88, 88, 87, 87, 26, 26 },// Bengali/Bengali/Bangladesh
{ 15, 11, 100, 246, 246, 334, 334, 421, 421, 88, 88, 87, 87, 26, 26 },// Bengali/Bengali/India
{ 15, 11, 18, 246, 246, 334, 334, 421, 421, 88, 88, 87, 87, 26, 26 },// Bangla/Bangla/Bangladesh
{ 15, 11, 100, 246, 246, 334, 334, 421, 421, 88, 88, 87, 87, 26, 26 },// Bangla/Bangla/India
{ 16, 31, 25, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dzongkha/Tibetan/Bhutan
{ 19, 7, 74, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Breton/Latin/France
{ 20, 2, 33, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Bulgarian/Cyrillic/Bulgaria
@ -130,23 +130,23 @@ static const QCalendarLocale locale_data[] = {
{ 24, 7, 106, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Catalan/Latin/Italy
{ 25, 5, 44, 447, 447, 484, 484, 153, 153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
{ 25, 5, 97, 447, 447, 484, 484, 153, 153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
{ 25, 5, 126, 447, 447, 484, 484, 153, 153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
{ 25, 5, 126, 447, 447, 484, 484, 153, 153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macao
{ 25, 5, 190, 447, 447, 484, 484, 153, 153, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
{ 25, 6, 97, 484, 484, 484, 484, 153, 153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Hong Kong
{ 25, 6, 126, 484, 484, 484, 484, 153, 153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macau
{ 25, 6, 126, 484, 484, 484, 484, 153, 153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macao
{ 25, 6, 208, 484, 484, 484, 484, 153, 153, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Taiwan
{ 26, 7, 74, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Corsican/Latin/France
{ 27, 7, 54, 0, 0, 0, 0, 522, 522, 83, 83, 83, 83, 38, 38 },// Croatian/Latin/Croatia
{ 27, 7, 27, 0, 0, 0, 0, 522, 522, 83, 83, 83, 83, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
{ 28, 7, 57, 560, 560, 560, 560, 153, 153, 81, 81, 81, 81, 26, 26 },// Czech/Latin/Czech Republic
{ 27, 7, 27, 0, 0, 0, 0, 522, 522, 83, 83, 83, 83, 38, 38 },// Croatian/Latin/Bosnia And Herzegovina
{ 28, 7, 57, 560, 560, 560, 560, 153, 153, 81, 81, 81, 81, 26, 26 },// Czech/Latin/Czechia
{ 29, 7, 58, 641, 641, 641, 641, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Denmark
{ 29, 7, 86, 641, 641, 641, 641, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Greenland
{ 30, 7, 151, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Netherlands
{ 30, 7, 12, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Aruba
{ 30, 7, 21, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Belgium
{ 30, 7, 152, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Cura Sao
{ 30, 7, 152, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Curacao
{ 30, 7, 202, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Suriname
{ 30, 7, 255, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Bonaire
{ 30, 7, 255, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Caribbean Netherlands
{ 30, 7, 256, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Sint Maarten
{ 31, 7, 225, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States
{ 31, 3, 225, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Deseret/United States
@ -193,7 +193,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 112, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Kiribati
{ 31, 7, 120, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Lesotho
{ 31, 7, 121, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Liberia
{ 31, 7, 126, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Macau
{ 31, 7, 126, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Macao
{ 31, 7, 128, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Madagascar
{ 31, 7, 129, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Malawi
{ 31, 7, 130, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Malaysia
@ -219,7 +219,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 179, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Rwanda
{ 31, 7, 180, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Kitts And Nevis
{ 31, 7, 181, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Lucia
{ 31, 7, 182, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Vincent And The Grenadines
{ 31, 7, 182, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Vincent And Grenadines
{ 31, 7, 183, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Samoa
{ 31, 7, 188, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Seychelles
{ 31, 7, 189, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sierra Leone
@ -229,7 +229,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 195, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/South Africa
{ 31, 7, 199, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Saint Helena
{ 31, 7, 201, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sudan
{ 31, 7, 204, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Swaziland
{ 31, 7, 204, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Eswatini
{ 31, 7, 205, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Sweden
{ 31, 7, 206, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Switzerland
{ 31, 7, 210, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Tanzania
@ -241,7 +241,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 221, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Uganda
{ 31, 7, 223, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United Arab Emirates
{ 31, 7, 224, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United Kingdom
{ 31, 7, 226, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States Minor Outlying Islands
{ 31, 7, 226, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States Outlying Islands
{ 31, 7, 229, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/Vanuatu
{ 31, 7, 233, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/British Virgin Islands
{ 31, 7, 234, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// English/Latin/United States Virgin Islands
@ -302,7 +302,7 @@ static const QCalendarLocale locale_data[] = {
{ 37, 7, 212, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Togo
{ 37, 7, 216, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Tunisia
{ 37, 7, 229, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Vanuatu
{ 37, 7, 235, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Wallis And Futuna Islands
{ 37, 7, 235, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Wallis And Futuna
{ 37, 7, 244, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Saint Barthelemy
{ 37, 7, 245, 1063, 1063, 1144, 1144, 153, 153, 81, 81, 57, 57, 26, 26 },// French/Latin/Saint Martin
{ 38, 7, 151, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Western Frisian/Latin/Netherlands
@ -318,7 +318,7 @@ static const QCalendarLocale locale_data[] = {
{ 42, 7, 206, 1430, 1430, 1430, 1430, 153, 153, 86, 86, 86, 86, 26, 26 },// German/Latin/Switzerland
{ 43, 16, 85, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Greek/Greek/Greece
{ 43, 16, 56, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Greek/Greek/Cyprus
{ 44, 7, 86, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Greenlandic/Latin/Greenland
{ 44, 7, 86, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kalaallisut/Latin/Greenland
{ 45, 7, 168, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Guarani/Latin/Paraguay
{ 46, 17, 100, 1516, 1516, 1516, 1516, 153, 153, 85, 85, 85, 85, 26, 26 },// Gujarati/Gujarati/India
{ 47, 7, 157, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Hausa/Latin/Nigeria
@ -339,7 +339,7 @@ static const QCalendarLocale locale_data[] = {
{ 58, 7, 106, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Italy
{ 58, 7, 184, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/San Marino
{ 58, 7, 206, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Switzerland
{ 58, 7, 230, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Vatican City State
{ 58, 7, 230, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Italian/Latin/Vatican City
{ 59, 19, 108, 1750, 1750, 1750, 1750, 153, 153, 77, 77, 77, 77, 26, 26 },// Japanese/Japanese/Japan
{ 60, 7, 101, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Javanese/Latin/Indonesia
{ 61, 21, 100, 1827, 1827, 1827, 1827, 153, 153, 92, 92, 92, 92, 26, 26 },// Kannada/Kannada/India
@ -347,7 +347,7 @@ static const QCalendarLocale locale_data[] = {
{ 62, 13, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kashmiri/Devanagari/India
{ 63, 2, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kazakh/Cyrillic/Kazakhstan
{ 64, 7, 179, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kinyarwanda/Latin/Rwanda
{ 65, 2, 116, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kirghiz/Cyrillic/Kyrgyzstan
{ 65, 2, 116, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kyrgyz/Cyrillic/Kyrgyzstan
{ 66, 22, 114, 1919, 1919, 1919, 1919, 153, 153, 54, 54, 54, 54, 26, 26 },// Korean/Korean/South Korea
{ 66, 22, 113, 1919, 1919, 1919, 1919, 153, 153, 54, 54, 54, 54, 26, 26 },// Korean/Korean/North Korea
{ 67, 7, 217, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kurdish/Latin/Turkey
@ -375,9 +375,9 @@ static const QCalendarLocale locale_data[] = {
{ 84, 13, 150, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/Nepal
{ 84, 13, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/India
{ 85, 7, 161, 641, 641, 641, 641, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Norway
{ 85, 7, 203, 641, 641, 641, 641, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
{ 85, 7, 203, 641, 641, 641, 641, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen
{ 86, 7, 74, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Occitan/Latin/France
{ 87, 26, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Oriya/Oriya/India
{ 87, 26, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Odia/Odia/India
{ 88, 1, 1, 2618, 2618, 2618, 2618, 2680, 2680, 62, 62, 62, 62, 26, 26 },// Pashto/Arabic/Afghanistan
{ 88, 1, 163, 2618, 2618, 2618, 2618, 2680, 2680, 62, 62, 62, 62, 26, 26 },// Pashto/Arabic/Pakistan
{ 89, 1, 102, 2706, 2706, 2706, 2706, 2772, 2772, 66, 66, 66, 66, 23, 23 },// Persian/Arabic/Iran
@ -386,11 +386,11 @@ static const QCalendarLocale locale_data[] = {
{ 91, 7, 30, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Brazil
{ 91, 7, 6, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Angola
{ 91, 7, 39, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Cape Verde
{ 91, 7, 62, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/East Timor
{ 91, 7, 62, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Timor-Leste
{ 91, 7, 66, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Equatorial Guinea
{ 91, 7, 92, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Guinea Bissau
{ 91, 7, 125, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Luxembourg
{ 91, 7, 126, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Macau
{ 91, 7, 126, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Macao
{ 91, 7, 146, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Mozambique
{ 91, 7, 173, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Portugal
{ 91, 7, 185, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Portuguese/Latin/Sao Tome And Principe
@ -412,10 +412,10 @@ static const QCalendarLocale locale_data[] = {
{ 98, 7, 41, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Sango/Latin/Central African Republic
{ 99, 13, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Sanskrit/Devanagari/India
{ 100, 2, 243, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Serbia
{ 100, 7, 27, 3279, 3279, 3279, 3279, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Bosnia And Herzegowina
{ 100, 7, 27, 3279, 3279, 3279, 3279, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Bosnia And Herzegovina
{ 100, 7, 242, 3279, 3279, 3279, 3279, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Montenegro
{ 100, 7, 243, 3279, 3279, 3279, 3279, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Serbia
{ 100, 2, 27, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegowina
{ 100, 2, 27, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Bosnia And Herzegovina
{ 100, 2, 242, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Montenegro
{ 100, 2, 257, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Cyrillic/Kosovo
{ 100, 7, 257, 3279, 3279, 3279, 3279, 153, 153, 80, 80, 80, 80, 26, 26 },// Serbian/Latin/Kosovo
@ -488,7 +488,7 @@ static const QCalendarLocale locale_data[] = {
{ 125, 7, 217, 4046, 4046, 4046, 4046, 153, 153, 80, 80, 80, 80, 26, 26 },// Turkish/Latin/Turkey
{ 125, 7, 56, 4046, 4046, 4046, 4046, 153, 153, 80, 80, 80, 80, 26, 26 },// Turkish/Latin/Cyprus
{ 126, 7, 218, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Turkmen/Latin/Turkmenistan
{ 128, 1, 44, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Uighur/Arabic/China
{ 128, 1, 44, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Uyghur/Arabic/China
{ 129, 2, 222, 4126, 4126, 4206, 4255, 153, 153, 80, 80, 49, 57, 26, 26 },// Ukrainian/Cyrillic/Ukraine
{ 130, 1, 163, 4312, 4312, 4312, 4312, 153, 153, 66, 66, 66, 66, 26, 26 },// Urdu/Arabic/Pakistan
{ 130, 1, 100, 4312, 4312, 4312, 4312, 153, 153, 66, 66, 66, 66, 26, 26 },// Urdu/Arabic/India
@ -505,8 +505,8 @@ static const QCalendarLocale locale_data[] = {
{ 138, 7, 23, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Yoruba/Latin/Benin
{ 140, 7, 195, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Zulu/Latin/South Africa
{ 141, 7, 161, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Nynorsk/Latin/Norway
{ 142, 7, 27, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Bosnian/Latin/Bosnia And Herzegowina
{ 142, 2, 27, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegowina
{ 142, 7, 27, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Bosnian/Latin/Bosnia And Herzegovina
{ 142, 2, 27, 3199, 3199, 3199, 3199, 153, 153, 80, 80, 80, 80, 26, 26 },// Bosnian/Cyrillic/Bosnia And Herzegovina
{ 143, 29, 131, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Divehi/Thaana/Maldives
{ 144, 7, 251, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Manx/Latin/Isle Of Man
{ 145, 7, 224, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Cornish/Latin/United Kingdom
@ -526,7 +526,7 @@ static const QCalendarLocale locale_data[] = {
{ 160, 7, 195, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Venda/Latin/South Africa
{ 161, 7, 83, 4378, 4378, 4464, 4464, 153, 153, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Ghana
{ 161, 7, 212, 4378, 4378, 4464, 4464, 153, 153, 86, 86, 47, 47, 26, 26 },// Ewe/Latin/Togo
{ 162, 14, 69, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Walamo/Ethiopic/Ethiopia
{ 162, 14, 69, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Wolaytta/Ethiopic/Ethiopia
{ 163, 7, 225, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Hawaiian/Latin/United States
{ 164, 7, 157, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Tyap/Latin/Nigeria
{ 165, 7, 129, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nyanja/Latin/Malawi
@ -608,7 +608,7 @@ static const QCalendarLocale locale_data[] = {
{ 209, 7, 210, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Rwa/Latin/Tanzania
{ 210, 7, 111, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Luo/Latin/Kenya
{ 211, 7, 221, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Chiga/Latin/Uganda
{ 212, 7, 145, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Central Morocco Tamazight/Latin/Morocco
{ 212, 7, 145, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Central Atlas Tamazight/Latin/Morocco
{ 213, 7, 132, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Koyraboro Senni/Latin/Mali
{ 214, 7, 210, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Shambala/Latin/Tanzania
{ 215, 13, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Bodo/Devanagari/India
@ -644,7 +644,7 @@ static const QCalendarLocale locale_data[] = {
{ 261, 7, 197, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Aragonese/Latin/Spain
{ 272, 46, 18, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Chakma/Chakma/Bangladesh
{ 272, 46, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Chakma/Chakma/India
{ 290, 11, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Manipuri/Bengali/India
{ 290, 11, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Manipuri/Bangla/India
{ 290, 72, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Manipuri/Meitei Mayek/India
{ 304, 78, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Santali/Ol Chiki/India
{ 304, 13, 100, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Santali/Devanagari/India

60
src/corelib/time/qromancalendar_data_p.h
View File

@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2020-10-08 from the
This part of the file was generated on 2020-10-21 from the
Common Locale Data Repository v37
http://www.unicode.org/cldr/
@ -110,14 +110,14 @@ static const QCalendarLocale locale_data[] = {
{ 8, 1, 254, 837, 837, 837, 837, 911, 911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/South Sudan
{ 8, 1, 260, 837, 837, 837, 837, 911, 911, 74, 74, 74, 74, 23, 23 },// Arabic/Arabic/World
{ 9, 10, 11, 1418, 1511, 1616, 1616, 1663, 1663, 93,105, 47, 47, 23, 23 },// Armenian/Armenian/Armenia
{ 10, 11, 100, 1686, 1686, 1774, 1774, 1837, 1837, 88, 88, 63, 63, 23, 23 },// Assamese/Bengali/India
{ 10, 11, 100, 1686, 1686, 1774, 1774, 1837, 1837, 88, 88, 63, 63, 23, 23 },// Assamese/Bangla/India
{ 12, 7, 15, 1860, 1936, 2012, 2012, 155, 155, 76, 76, 47, 47, 26, 26 },// Azerbaijani/Latin/Azerbaijan
{ 12, 1, 102, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Azerbaijani/Arabic/Iran
{ 12, 2, 15, 2059, 2135, 2211, 2211, 155, 155, 76, 76, 47, 47, 26, 26 },// Azerbaijani/Cyrillic/Azerbaijan
{ 13, 2, 178, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Bashkir/Cyrillic/Russia
{ 14, 7, 197, 2258, 2350, 2454, 2454, 2513, 2513, 92,104, 59, 59, 23, 23 },// Basque/Latin/Spain
{ 15, 11, 18, 2536, 2536, 2536, 2625, 2701, 2701, 89, 89, 89, 76, 32, 32 },// Bengali/Bengali/Bangladesh
{ 15, 11, 100, 2536, 2536, 2536, 2625, 2701, 2701, 89, 89, 89, 76, 32, 32 },// Bengali/Bengali/India
{ 15, 11, 18, 2536, 2536, 2536, 2625, 2701, 2701, 89, 89, 89, 76, 32, 32 },// Bangla/Bangla/Bangladesh
{ 15, 11, 100, 2536, 2536, 2536, 2625, 2701, 2701, 89, 89, 89, 76, 32, 32 },// Bangla/Bangla/India
{ 16, 31, 25, 2733, 2923, 3054, 3116, 3142, 3168,190,131, 62, 26, 26, 26 },// Dzongkha/Tibetan/Bhutan
{ 19, 7, 74, 3194, 3194, 3271, 3271, 3333, 3333, 77, 77, 62, 62, 35, 35 },// Breton/Latin/France
{ 20, 2, 33, 3368, 3368, 3449, 3449, 3497, 3497, 81, 81, 48, 48, 23, 23 },// Bulgarian/Cyrillic/Bulgaria
@ -130,23 +130,23 @@ static const QCalendarLocale locale_data[] = {
{ 24, 7, 106, 4073, 4154, 4268, 4327, 4419, 4419, 81,114, 59, 92, 35, 35 },// Catalan/Latin/Italy
{ 25, 5, 44, 4454, 4454, 4491, 4491, 155, 155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/China
{ 25, 5, 97, 4454, 4454, 4491, 4491, 155, 155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Hong Kong
{ 25, 5, 126, 4454, 4454, 4491, 4491, 155, 155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macau
{ 25, 5, 126, 4454, 4454, 4491, 4491, 155, 155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Macao
{ 25, 5, 190, 4454, 4454, 4491, 4491, 155, 155, 37, 37, 38, 38, 26, 26 },// Chinese/Simplified Han/Singapore
{ 25, 6, 97, 4491, 4491, 4491, 4491, 155, 155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Hong Kong
{ 25, 6, 126, 4491, 4491, 4491, 4491, 155, 155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macau
{ 25, 6, 126, 4491, 4491, 4491, 4491, 155, 155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Macao
{ 25, 6, 208, 4491, 4491, 4491, 4491, 155, 155, 38, 38, 38, 38, 26, 26 },// Chinese/Traditional Han/Taiwan
{ 26, 7, 74, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Corsican/Latin/France
{ 27, 7, 54, 4529, 4622, 4719, 4719, 4767, 4767, 93, 97, 48, 48, 38, 38 },// Croatian/Latin/Croatia
{ 27, 7, 27, 4529, 4622, 4719, 4719, 4767, 4767, 93, 97, 48, 48, 38, 38 },// Croatian/Latin/Bosnia And Herzegowina
{ 28, 7, 57, 4805, 4886, 4969, 4969, 155, 155, 81, 83, 47, 47, 26, 26 },// Czech/Latin/Czech Republic
{ 27, 7, 27, 4529, 4622, 4719, 4719, 4767, 4767, 93, 97, 48, 48, 38, 38 },// Croatian/Latin/Bosnia And Herzegovina
{ 28, 7, 57, 4805, 4886, 4969, 4969, 155, 155, 81, 83, 47, 47, 26, 26 },// Czech/Latin/Czechia
{ 29, 7, 58, 5016, 5016, 5099, 5099, 132, 132, 83, 83, 58, 58, 23, 23 },// Danish/Latin/Denmark
{ 29, 7, 86, 5016, 5016, 5099, 5099, 132, 132, 83, 83, 58, 58, 23, 23 },// Danish/Latin/Greenland
{ 30, 7, 151, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Netherlands
{ 30, 7, 12, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Aruba
{ 30, 7, 21, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Belgium
{ 30, 7, 152, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Cura Sao
{ 30, 7, 152, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Curacao
{ 30, 7, 202, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Suriname
{ 30, 7, 255, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Bonaire
{ 30, 7, 255, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Caribbean Netherlands
{ 30, 7, 256, 5157, 5157, 5244, 5244, 132, 132, 87, 87, 58, 58, 23, 23 },// Dutch/Latin/Sint Maarten
{ 31, 7, 225, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States
{ 31, 3, 225, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// English/Deseret/United States
@ -193,7 +193,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 112, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Kiribati
{ 31, 7, 120, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Lesotho
{ 31, 7, 121, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Liberia
{ 31, 7, 126, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Macau
{ 31, 7, 126, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Macao
{ 31, 7, 128, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Madagascar
{ 31, 7, 129, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Malawi
{ 31, 7, 130, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Malaysia
@ -219,7 +219,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 179, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Rwanda
{ 31, 7, 180, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Kitts And Nevis
{ 31, 7, 181, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Lucia
{ 31, 7, 182, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Vincent And The Grenadines
{ 31, 7, 182, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Vincent And Grenadines
{ 31, 7, 183, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Samoa
{ 31, 7, 188, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Seychelles
{ 31, 7, 189, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sierra Leone
@ -229,7 +229,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 195, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/South Africa
{ 31, 7, 199, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Saint Helena
{ 31, 7, 201, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sudan
{ 31, 7, 204, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Swaziland
{ 31, 7, 204, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Eswatini
{ 31, 7, 205, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Sweden
{ 31, 7, 206, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Switzerland
{ 31, 7, 210, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Tanzania
@ -241,7 +241,7 @@ static const QCalendarLocale locale_data[] = {
{ 31, 7, 221, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Uganda
{ 31, 7, 223, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United Arab Emirates
{ 31, 7, 224, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United Kingdom
{ 31, 7, 226, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States Minor Outlying Islands
{ 31, 7, 226, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States Outlying Islands
{ 31, 7, 229, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/Vanuatu
{ 31, 7, 233, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/British Virgin Islands
{ 31, 7, 234, 0, 0, 85, 85, 132, 132, 85, 85, 47, 47, 23, 23 },// English/Latin/United States Virgin Islands
@ -302,7 +302,7 @@ static const QCalendarLocale locale_data[] = {
{ 37, 7, 212, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Togo
{ 37, 7, 216, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Tunisia
{ 37, 7, 229, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Vanuatu
{ 37, 7, 235, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Wallis And Futuna Islands
{ 37, 7, 235, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Wallis And Futuna
{ 37, 7, 244, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Saint Barthelemy
{ 37, 7, 245, 6270, 6270, 6354, 6354, 132, 132, 84, 84, 62, 62, 23, 23 },// French/Latin/Saint Martin
{ 38, 7, 151, 6539, 6539, 6633, 6633, 132, 132, 94, 94, 47, 47, 23, 23 },// Western Frisian/Latin/Netherlands
@ -318,7 +318,7 @@ static const QCalendarLocale locale_data[] = {
{ 42, 7, 206, 7586, 7586, 7668, 7715, 132, 132, 82, 82, 47, 59, 23, 23 },// German/Latin/Switzerland
{ 43, 16, 85, 7961, 8075, 8189, 8238, 8287, 8287,114,114, 49, 49, 23, 23 },// Greek/Greek/Greece
{ 43, 16, 56, 7961, 8075, 8189, 8238, 8287, 8287,114,114, 49, 49, 23, 23 },// Greek/Greek/Cyprus
{ 44, 7, 86, 8310, 8408, 8518, 8518, 132, 132, 98,110, 49, 49, 23, 23 },// Greenlandic/Latin/Greenland
{ 44, 7, 86, 8310, 8408, 8518, 8518, 132, 132, 98,110, 49, 49, 23, 23 },// Kalaallisut/Latin/Greenland
{ 45, 7, 168, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Guarani/Latin/Paraguay
{ 46, 17, 100, 8567, 8567, 8653, 8653, 8719, 8719, 86, 86, 66, 66, 30, 30 },// Gujarati/Gujarati/India
{ 47, 7, 157, 8749, 8749, 8833, 8833, 8880, 8880, 84, 84, 47, 47, 23, 23 },// Hausa/Latin/Nigeria
@ -339,7 +339,7 @@ static const QCalendarLocale locale_data[] = {
{ 58, 7, 106,10021,10021,10114,10114,10161,10161, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Italy
{ 58, 7, 184,10021,10021,10114,10114,10161,10161, 93, 93, 47, 47, 23, 23 },// Italian/Latin/San Marino
{ 58, 7, 206,10021,10021,10114,10114,10161,10161, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Switzerland
{ 58, 7, 230,10021,10021,10114,10114,10161,10161, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Vatican City State
{ 58, 7, 230,10021,10021,10114,10114,10161,10161, 93, 93, 47, 47, 23, 23 },// Italian/Latin/Vatican City
{ 59, 19, 108, 4491, 4491, 4491, 4491, 155, 155, 38, 38, 38, 38, 26, 26 },// Japanese/Japanese/Japan
{ 60, 7, 101, 9536, 9536,10184,10184, 132, 132, 86, 86, 47, 47, 23, 23 },// Javanese/Latin/Indonesia
{ 61, 21, 100,10231,10231,10317,10379,10447,10447, 86, 86, 62, 68, 30, 30 },// Kannada/Kannada/India
@ -347,7 +347,7 @@ static const QCalendarLocale locale_data[] = {
{ 62, 13, 100, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Kashmiri/Devanagari/India
{ 63, 2, 110,10571,10653,10735,10735,10794,10794, 82, 82, 59, 59, 23, 23 },// Kazakh/Cyrillic/Kazakhstan
{ 64, 7, 179,10817,10817,10917,10917, 155, 155,100,100, 59, 59, 26, 26 },// Kinyarwanda/Latin/Rwanda
{ 65, 2, 116,10976,11055,11134,11181,11239,11239, 79, 79, 47, 58, 23, 23 },// Kirghiz/Cyrillic/Kyrgyzstan
{ 65, 2, 116,10976,11055,11134,11181,11239,11239, 79, 79, 47, 58, 23, 23 },// Kyrgyz/Cyrillic/Kyrgyzstan
{ 66, 22, 114,11262,11262,11262,11262,11262,11262, 38, 38, 38, 38, 38, 38 },// Korean/Korean/South Korea
{ 66, 22, 113,11262,11262,11262,11262,11262,11262, 38, 38, 38, 38, 38, 38 },// Korean/Korean/North Korea
{ 67, 7, 217,11300,11387,11487,11487,11534,11534, 87,100, 47, 47, 23, 23 },// Kurdish/Latin/Turkey
@ -375,9 +375,9 @@ static const QCalendarLocale locale_data[] = {
{ 84, 13, 150,14311,14311,14311,14311,14395,14447, 84, 84, 84, 84, 52, 51 },// Nepali/Devanagari/Nepal
{ 84, 13, 100,14311,14311,14311,14311,14395,14447, 84, 84, 84, 84, 52, 51 },// Nepali/Devanagari/India
{ 85, 7, 161,14498,14498, 5750, 5797, 132, 132, 82, 82, 47, 58, 23, 23 },// Norwegian Bokmal/Latin/Norway
{ 85, 7, 203,14498,14498, 5750, 5797, 132, 132, 82, 82, 47, 58, 23, 23 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen Islands
{ 85, 7, 203,14498,14498, 5750, 5797, 132, 132, 82, 82, 47, 58, 23, 23 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen
{ 86, 7, 74, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Occitan/Latin/France
{ 87, 26, 100,14580,14580,14580,14580,14665,14665, 85, 85, 85, 85, 31, 31 },// Oriya/Oriya/India
{ 87, 26, 100,14580,14580,14580,14580,14665,14665, 85, 85, 85, 85, 31, 31 },// Odia/Odia/India
{ 88, 1, 1,14696,14764,14832,14764, 155,14899, 68, 68, 67, 68, 26, 23 },// Pashto/Arabic/Afghanistan
{ 88, 1, 163,14696,14764,14832,14764, 155,14899, 68, 68, 67, 68, 26, 23 },// Pashto/Arabic/Pakistan
{ 89, 1, 102,14922,14991,14922,14991,15064,15064, 69, 73, 69, 73, 23, 23 },// Persian/Arabic/Iran
@ -386,11 +386,11 @@ static const QCalendarLocale locale_data[] = {
{ 91, 7, 30,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Brazil
{ 91, 7, 6,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Angola
{ 91, 7, 39,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Cape Verde
{ 91, 7, 62,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/East Timor
{ 91, 7, 62,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Timor-Leste
{ 91, 7, 66,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Equatorial Guinea
{ 91, 7, 92,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Guinea Bissau
{ 91, 7, 125,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Luxembourg
{ 91, 7, 126,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Macau
{ 91, 7, 126,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Macao
{ 91, 7, 146,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Mozambique
{ 91, 7, 173,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Portugal
{ 91, 7, 185,15502,15502,15590,15590, 132, 132, 88, 88, 59, 59, 23, 23 },// Portuguese/Latin/Sao Tome And Principe
@ -412,10 +412,10 @@ static const QCalendarLocale locale_data[] = {
{ 98, 7, 41,16678,16678,16768,16768,16815,16815, 90, 90, 47, 47, 23, 23 },// Sango/Latin/Central African Republic
{ 99, 13, 100, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Sanskrit/Devanagari/India
{ 100, 2, 243,16838,16838,16918,16918,12719,12719, 80, 80, 47, 47, 23, 23 },// Serbian/Cyrillic/Serbia
{ 100, 7, 27,16965,16965,17045,17045, 9808, 9808, 80, 80, 47, 47, 23, 23 },// Serbian/Latin/Bosnia And Herzegowina
{ 100, 7, 27,16965,16965,17045,17045, 9808, 9808, 80, 80, 47, 47, 23, 23 },// Serbian/Latin/Bosnia And Herzegovina
{ 100, 7, 242,16965,16965,17092,17092, 9808, 9808, 80, 80, 49, 49, 23, 23 },// Serbian/Latin/Montenegro
{ 100, 7, 243,16965,16965,17045,17045, 9808, 9808, 80, 80, 47, 47, 23, 23 },// Serbian/Latin/Serbia
{ 100, 2, 27,16838,16838,16918,16918,12719,12719, 80, 80, 47, 47, 23, 23 },// Serbian/Cyrillic/Bosnia And Herzegowina
{ 100, 2, 27,16838,16838,16918,16918,12719,12719, 80, 80, 47, 47, 23, 23 },// Serbian/Cyrillic/Bosnia And Herzegovina
{ 100, 2, 242,16838,16838,17141,17141,12719,12719, 80, 80, 49, 49, 23, 23 },// Serbian/Cyrillic/Montenegro
{ 100, 2, 257,16838,16838,17141,17141,12719,12719, 80, 80, 49, 49, 23, 23 },// Serbian/Cyrillic/Kosovo
{ 100, 7, 257,16965,16965,17092,17092, 9808, 9808, 80, 80, 49, 49, 23, 23 },// Serbian/Latin/Kosovo
@ -488,7 +488,7 @@ static const QCalendarLocale locale_data[] = {
{ 125, 7, 217,21026,21026,21100,21100,21147,21147, 74, 74, 47, 47, 23, 23 },// Turkish/Latin/Turkey
{ 125, 7, 56,21026,21026,21100,21100,21147,21147, 74, 74, 47, 47, 23, 23 },// Turkish/Latin/Cyprus
{ 126, 7, 218,21170,21246,21322,21371,21421,21421, 76, 76, 49, 50, 23, 23 },// Turkmen/Latin/Turkmenistan
{ 128, 1, 44,21444,21444,21444,21444, 155, 155, 83, 83, 83, 83, 26, 26 },// Uighur/Arabic/China
{ 128, 1, 44,21444,21444,21444,21444, 155, 155, 83, 83, 83, 83, 26, 26 },// Uyghur/Arabic/China
{ 129, 2, 222,21527,21621,21707,21754,21820,21843, 94, 86, 47, 66, 23, 23 },// Ukrainian/Cyrillic/Ukraine
{ 130, 1, 163,21866,21866,21866,21866, 132, 132, 67, 67, 67, 67, 23, 23 },// Urdu/Arabic/Pakistan
{ 130, 1, 100,21866,21866,21866,21866, 132, 132, 67, 67, 67, 67, 23, 23 },// Urdu/Arabic/India
@ -505,8 +505,8 @@ static const QCalendarLocale locale_data[] = {
{ 138, 7, 23,23837,23910,24043,24083,24138,24138, 73,133, 40, 55, 26, 26 },// Yoruba/Latin/Benin
{ 140, 7, 195,24164,24164,24254,24254, 132,24301, 90, 90, 47, 47, 23, 23 },// Zulu/Latin/South Africa
{ 141, 7, 161,14498,14498, 5750,24324, 132, 132, 82, 82, 47, 58, 23, 23 },// Norwegian Nynorsk/Latin/Norway
{ 142, 7, 27,24382,24382,24464,24464, 9808, 9808, 82, 82, 47, 47, 23, 23 },// Bosnian/Latin/Bosnia And Herzegowina
{ 142, 2, 27,24511,24511,24593,24593,12719,12719, 82, 82, 47, 47, 23, 23 },// Bosnian/Cyrillic/Bosnia And Herzegowina
{ 142, 7, 27,24382,24382,24464,24464, 9808, 9808, 82, 82, 47, 47, 23, 23 },// Bosnian/Latin/Bosnia And Herzegovina
{ 142, 2, 27,24511,24511,24593,24593,12719,12719, 82, 82, 47, 47, 23, 23 },// Bosnian/Cyrillic/Bosnia And Herzegovina
{ 143, 29, 131, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Divehi/Thaana/Maldives
{ 144, 7, 251,24640,24640,24779,24779, 155, 155,139,139,101,101, 26, 26 },// Manx/Latin/Isle Of Man
{ 145, 7, 224,24880,24880,25009,25009, 155, 155,129,129, 45, 45, 26, 26 },// Cornish/Latin/United Kingdom
@ -526,7 +526,7 @@ static const QCalendarLocale locale_data[] = {
{ 160, 7, 195, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Venda/Latin/South Africa
{ 161, 7, 83,25995,25995,26081,26081,26128,26128, 86, 86, 47, 47, 23, 23 },// Ewe/Latin/Ghana
{ 161, 7, 212,25995,25995,26081,26081,26128,26128, 86, 86, 47, 47, 23, 23 },// Ewe/Latin/Togo
{ 162, 14, 69, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Walamo/Ethiopic/Ethiopia
{ 162, 14, 69, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Wolaytta/Ethiopic/Ethiopia
{ 163, 7, 225,26151,26151,26245,26245, 155, 155, 94, 94, 58, 58, 26, 26 },// Hawaiian/Latin/United States
{ 164, 7, 157, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Tyap/Latin/Nigeria
{ 165, 7, 129, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Nyanja/Latin/Malawi
@ -608,7 +608,7 @@ static const QCalendarLocale locale_data[] = {
{ 209, 7, 210,30105,30105,19544,19544, 132, 132, 86, 86, 47, 47, 23, 23 },// Rwa/Latin/Tanzania
{ 210, 7, 111,33047,33047,33232,33232,33279,33279,185,185, 47, 47, 23, 23 },// Luo/Latin/Kenya
{ 211, 7, 221,29584,29584,29735,29735, 132, 132,151,151, 47, 47, 23, 23 },// Chiga/Latin/Uganda
{ 212, 7, 145,33302,33302,33387,33387,33434,33434, 85, 85, 47, 47, 23, 23 },// Central Morocco Tamazight/Latin/Morocco
{ 212, 7, 145,33302,33302,33387,33387,33434,33434, 85, 85, 47, 47, 23, 23 },// Central Atlas Tamazight/Latin/Morocco
{ 213, 7, 132,32892,32892,32979,32979,33024,33024, 87, 87, 45, 45, 23, 23 },// Koyraboro Senni/Latin/Mali
{ 214, 7, 210,33457,33457,19544,19544, 132, 132, 83, 83, 47, 47, 23, 23 },// Shambala/Latin/Tanzania
{ 215, 13, 100,33540,33540,33540,33540,33627,33627, 87, 87, 87, 87, 30, 30 },// Bodo/Devanagari/India
@ -644,7 +644,7 @@ static const QCalendarLocale locale_data[] = {
{ 261, 7, 197, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Aragonese/Latin/Spain
{ 272, 46, 18,38407,38596,38407,38785,38952,38952,189,189,189,167, 57, 57 },// Chakma/Chakma/Bangladesh
{ 272, 46, 100,38407,38596,38407,38785,38952,38952,189,189,189,167, 57, 57 },// Chakma/Chakma/India
{ 290, 11, 100,39009,39009,39096,39009,39153,39189, 87, 87, 57, 87, 36, 37 },// Manipuri/Bengali/India
{ 290, 11, 100,39009,39009,39096,39009,39153,39189, 87, 87, 57, 87, 36, 37 },// Manipuri/Bangla/India
{ 290, 72, 100, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Manipuri/Meitei Mayek/India
{ 304, 78, 100,39226,39226,39308,39308,39354,39354, 82, 82, 46, 46, 23, 23 },// Santali/Ol Chiki/India
{ 304, 13, 100, 361, 361, 361, 361, 155, 155, 47, 47, 47, 47, 26, 26 },// Santali/Devanagari/India

96
util/locale_database/enumdata.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8; -*-
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
@ -59,7 +59,7 @@ language_list = {
12: ["Azerbaijani", "az"], # macrolanguage
13: ["Bashkir", "ba"],
14: ["Basque", "eu"],
15: ["Bengali", "bn"],
15: ["Bangla", "bn"],
16: ["Dzongkha", "dz"],
18: ["Bislama", "bi"],
19: ["Breton", "br"],
@ -87,7 +87,7 @@ language_list = {
41: ["Georgian", "ka"],
42: ["German", "de"],
43: ["Greek", "el"],
44: ["Greenlandic", "kl"],
44: ["Kalaallisut", "kl"],
45: ["Guarani", "gn"], # macrolanguage
46: ["Gujarati", "gu"],
47: ["Hausa", "ha"],
@ -99,7 +99,7 @@ language_list = {
53: ["Interlingua", "ia"],
54: ["Interlingue", "ie"],
55: ["Inuktitut", "iu"], # macrolanguage
56: ["Inupiak", "ik"], # macrolanguage
56: ["Inupiaq", "ik"], # macrolanguage
57: ["Irish", "ga"],
58: ["Italian", "it"],
59: ["Japanese", "ja"],
@ -108,7 +108,7 @@ language_list = {
62: ["Kashmiri", "ks"],
63: ["Kazakh", "kk"],
64: ["Kinyarwanda", "rw"],
65: ["Kirghiz", "ky"],
65: ["Kyrgyz", "ky"],
66: ["Korean", "ko"],
67: ["Kurdish", "ku"], # macrolanguage
68: ["Rundi", "rn"],
@ -130,7 +130,7 @@ language_list = {
84: ["Nepali", "ne"], # macrolanguage
85: ["Norwegian Bokmal", "nb"],
86: ["Occitan", "oc"],
87: ["Oriya", "or"], # macrolanguage
87: ["Odia", "or"], # macrolanguage
88: ["Pashto", "ps"], # macrolanguage
89: ["Persian", "fa"], # macrolanguage
90: ["Polish", "pl"],
@ -171,7 +171,7 @@ language_list = {
125: ["Turkish", "tr"],
126: ["Turkmen", "tk"],
127: ["Tahitian", "ty"],
128: ["Uighur", "ug"],
128: ["Uyghur", "ug"],
129: ["Ukrainian", "uk"],
130: ["Urdu", "ur"],
131: ["Uzbek", "uz"], # macrolanguage
@ -205,7 +205,7 @@ language_list = {
159: ["Friulian", "fur"],
160: ["Venda", "ve" ],
161: ["Ewe", "ee" ],
162: ["Walamo", "wal"],
162: ["Wolaytta", "wal"],
163: ["Hawaiian", "haw"],
164: ["Tyap", "kcg"],
165: ["Nyanja", "ny" ],
@ -255,7 +255,7 @@ language_list = {
209: ["Rwa", "rwk"],
210: ["Luo", "luo"],
211: ["Chiga", "cgg"],
212: ["Central Morocco Tamazight", "tzm"],
212: ["Central Atlas Tamazight", "tzm"],
213: ["Koyraboro Senni", "ses"],
214: ["Shambala", "ksb"],
215: ["Bodo", "brx"],
@ -271,11 +271,11 @@ language_list = {
225: ["Kanuri", "kr"], # macrolanguage
226: ["Komi", "kv"], # macrolanguage
227: ["Kongo", "kg"], # macrolanguage
228: ["Kwanyama", "kj"],
228: ["Kuanyama", "kj"],
229: ["Limburgish", "li"],
230: ["Luba Katanga", "lu"],
231: ["Luxembourgish", "lb"],
232: ["Navaho", "nv"],
232: ["Navajo", "nv"],
233: ["Ndonga", "ng"],
234: ["Ojibwa", "oj"], # macrolanguage
235: ["Pali", "pi"], # macrolanguage
@ -375,7 +375,7 @@ language_list = {
}
language_aliases = {
# Renamings:
# Renamings prior to Qt 6.0 (CLDR v37):
'Afan': 'Oromo',
'Byelorussian': 'Belarusian',
'Bhutani': 'Dzongkha',
@ -384,8 +384,19 @@ language_aliases = {
'RhaetoRomance': 'Romansh',
'Chewa': 'Nyanja',
'Frisian': 'WesternFrisian',
'Uigur': 'Uighur',
}
'Uigur': 'Uyghur',
# Renamings:
'Uighur': 'Uyghur',
'Kwanyama': 'Kuanyama',
'Inupiak': 'Inupiaq',
'Bengali': 'Bangla',
'CentralMoroccoTamazight': 'CentralAtlasTamazight',
'Greenlandic': 'Kalaallisut',
'Walamo': 'Wolaytta',
'Navaho': 'Navajo',
'Oriya': 'Odia',
'Kirghiz': 'Kyrgyz'
}
country_list = {
0: ["AnyCountry", "ZZ"],
@ -415,7 +426,7 @@ country_list = {
24: ["Bermuda", "BM"],
25: ["Bhutan", "BT"],
26: ["Bolivia", "BO"],
27: ["Bosnia And Herzegowina", "BA"],
27: ["Bosnia And Herzegovina", "BA"],
28: ["Botswana", "BW"],
29: ["Bouvet Island", "BV"],
30: ["Brazil", "BR"],
@ -441,16 +452,19 @@ country_list = {
50: ["Congo Brazzaville", "CG"],
51: ["Cook Islands", "CK"],
52: ["Costa Rica", "CR"],
# Officially Côte d’Ivoire, which we'd ned to map to CotedIvoire
# or CoteDIvoire, either failing to make the d' separate from
# Cote or messing with its case. So stick with Ivory Coast:
53: ["Ivory Coast", "CI"],
54: ["Croatia", "HR"],
55: ["Cuba", "CU"],
56: ["Cyprus", "CY"],
57: ["Czech Republic", "CZ"],
57: ["Czechia", "CZ"],
58: ["Denmark", "DK"],
59: ["Djibouti", "DJ"],
60: ["Dominica", "DM"],
61: ["Dominican Republic", "DO"],
62: ["East Timor", "TL"],
62: ["Timor-Leste", "TL"],
63: ["Ecuador", "EC"],
64: ["Egypt", "EG"],
65: ["El Salvador", "SV"],
@ -514,7 +528,7 @@ country_list = {
123: ["Liechtenstein", "LI"],
124: ["Lithuania", "LT"],
125: ["Luxembourg", "LU"],
126: ["Macau", "MO"],
126: ["Macao", "MO"],
127: ["Macedonia", "MK"],
128: ["Madagascar", "MG"],
129: ["Malawi", "MW"],
@ -540,7 +554,7 @@ country_list = {
149: ["Nauru", "NR"],
150: ["Nepal", "NP"],
151: ["Netherlands", "NL"],
152: ["Cura Sao", "CW"],
152: ["Curacao", "CW"],
153: ["New Caledonia", "NC"],
154: ["New Zealand", "NZ"],
155: ["Nicaragua", "NI"],
@ -570,7 +584,7 @@ country_list = {
179: ["Rwanda", "RW"],
180: ["Saint Kitts And Nevis", "KN"],
181: ["Saint Lucia", "LC"],
182: ["Saint Vincent And The Grenadines", "VC"],
182: ["Saint Vincent And Grenadines", "VC"],
183: ["Samoa", "WS"],
184: ["San Marino", "SM"],
185: ["Sao Tome And Principe", "ST"],
@ -584,15 +598,15 @@ country_list = {
193: ["Solomon Islands", "SB"],
194: ["Somalia", "SO"],
195: ["South Africa", "ZA"],
196: ["South Georgia And The South Sandwich Islands", "GS"],
196: ["South Georgia And South Sandwich Islands", "GS"],
197: ["Spain", "ES"],
198: ["Sri Lanka", "LK"],
199: ["Saint Helena", "SH"],
200: ["Saint Pierre And Miquelon", "PM"],
201: ["Sudan", "SD"],
202: ["Suriname", "SR"],
203: ["Svalbard And Jan Mayen Islands", "SJ"],
204: ["Swaziland", "SZ"],
203: ["Svalbard And Jan Mayen", "SJ"],
204: ["Eswatini", "SZ"],
205: ["Sweden", "SE"],
206: ["Switzerland", "CH"],
207: ["Syria", "SY"],
@ -614,16 +628,16 @@ country_list = {
223: ["United Arab Emirates", "AE"],
224: ["United Kingdom", "GB"],
225: ["United States", "US"],
226: ["United States Minor Outlying Islands", "UM"],
226: ["United States Outlying Islands", "UM"],
227: ["Uruguay", "UY"],
228: ["Uzbekistan", "UZ"],
229: ["Vanuatu", "VU"],
230: ["Vatican City State", "VA"],
230: ["Vatican City", "VA"],
231: ["Venezuela", "VE"],
232: ["Vietnam", "VN"],
233: ["British Virgin Islands", "VG"],
234: ["United States Virgin Islands", "VI"],
235: ["Wallis And Futuna Islands", "WF"],
235: ["Wallis And Futuna", "WF"],
236: ["Western Sahara", "EH"],
237: ["Yemen", "YE"],
238: ["Canary Islands", "IC"],
@ -643,7 +657,7 @@ country_list = {
252: ["Jersey", "JE"],
253: ["Tristan Da Cunha", "TA"],
254: ["South Sudan", "SS"],
255: ["Bonaire", "BQ"],
255: ["Caribbean Netherlands", "BQ"],
256: ["Sint Maarten", "SX"],
257: ["Kosovo", "XK"],
258: ["European Union", "EU"],
@ -653,7 +667,7 @@ country_list = {
}
country_aliases = {
# Renamings:
# Renamings prior to Qt 6.0 (CLDR v37):
'DemocraticRepublicOfCongo': 'CongoKinshasa',
'PeoplesRepublicOfCongo': 'CongoBrazzaville',
'DemocraticRepublicOfKorea': 'NorthKorea',
@ -661,6 +675,20 @@ country_aliases = {
'RussianFederation': 'Russia',
'SyrianArabRepublic': 'Syria',
'LatinAmericaAndTheCaribbean': 'LatinAmerica',
# Renamings:
'EastTimor': 'TimorLeste',
'Bonaire': 'CaribbeanNetherlands',
'Macau': 'Macao',
'SouthGeorgiaAndTheSouthSandwichIslands': 'SouthGeorgiaAndSouthSandwichIslands',
'WallisAndFutunaIslands': 'WallisAndFutuna',
'SaintVincentAndTheGrenadines': 'SaintVincentAndGrenadines',
'BosniaAndHerzegowina': 'BosniaAndHerzegovina',
'SvalbardAndJanMayenIslands': 'SvalbardAndJanMayen',
'VaticanCityState': 'VaticanCity',
'Swaziland': 'Eswatini',
'UnitedStatesMinorOutlyingIslands': 'UnitedStatesOutlyingIslands',
'CuraSao': 'Curacao',
'CzechRepublic': 'Czechia',
}
script_list = {
@ -675,7 +703,7 @@ script_list = {
8: ["Mongolian", "Mong"],
9: ["Tifinagh", "Tfng"],
10: ["Armenian", "Armn"],
11: ["Bengali", "Beng"],
11: ["Bangla", "Beng"],
12: ["Cherokee", "Cher"],
13: ["Devanagari", "Deva"],
14: ["Ethiopic", "Ethi"],
@ -690,7 +718,7 @@ script_list = {
23: ["Lao", "Laoo"],
24: ["Malayalam", "Mlym"],
25: ["Myanmar", "Mymr"],
26: ["Oriya", "Orya"],
26: ["Odia", "Orya"],
27: ["Tamil", "Taml"],
28: ["Telugu", "Telu"],
29: ["Thaana", "Thaa"],
@ -779,7 +807,7 @@ script_list = {
112: ["Linear A", "Lina"],
113: ["Mahajani", "Mahj"],
114: ["Manichaean", "Mani"],
115: ["Mende Kikakui", "Mend"],
115: ["Mende", "Mend"],
116: ["Modi", "Modi"],
117: ["Mro", "Mroo"],
118: ["Old North Arabian", "Narb"],
@ -809,9 +837,13 @@ script_list = {
}
script_aliases = {
# Renamings:
# Renamings prior to Qt 6.0 (CLDR v37):
'SimplifiedChineseScript': 'SimplifiedHanScript',
'TraditionalChineseScript': 'TraditionalHanScript',
# Renamings:
'OriyaScript': 'OdiaScript',
'MendeKikakuiScript': 'MendeScript',
'BengaliScript': 'BanglaScript',
}
def countryCodeToId(code):

2
util/locale_database/qlocalexml2cpp.py
View File

@ -470,7 +470,7 @@ class LocaleHeaderWriter (SourceFileEditor):
out, dupes = self.writer.write, self.__dupes
out(' enum {} : ushort {{\n'.format(name))
for key, value in book.items():
member = value[0]
member = value[0].replace('-', ' ')
if name == 'Script':
# Don't .capitalize() as some names are already camel-case (see enumdata.py):
member = ''.join(word[0].upper() + word[1:] for word in member.split())