Add some missing language codes to our locale data
We were missing a few languages CLDR knew about; so add them to the list in enumdata.py (and add trailing commas to lists to make future additions not need to change the prior last line; python is perfectly happy with this). [ChangeLog][QtCore][QLocale] Added support for Western Balochi, Ido, Lojban, Sicilian and Souther Kurdish. Change-Id: I0d24cff46a0ae8db48ec1db8762088f877319982 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
Edward Welbourne
parent
e31febb024
commit
89451f5428
@ -436,6 +436,11 @@ public:
|
||||
Cantonese = 357,
|
||||
Osage = 358,
|
||||
Tangut = 359,
|
||||
Ido = 360,
|
||||
Lojban = 361,
|
||||
Sicilian = 362,
|
||||
SouthernKurdish = 363,
|
||||
WesternBalochi = 364,
|
||||
|
||||
Afan = Oromo,
|
||||
Bhutani = Dzongkha,
|
||||
@ -452,7 +457,7 @@ public:
|
||||
Twi = Akan,
|
||||
Uigur = Uighur,
|
||||
|
||||
LastLanguage = Tangut
|
||||
LastLanguage = WesternBalochi
|
||||
};
|
||||
|
||||
enum Script {
|
||||
|
||||
@ -483,6 +483,11 @@
|
||||
\value TokPisin Since Qt 5.7
|
||||
\value TuvaluLanguage Since Qt 5.7
|
||||
\value UncodedLanguages Since Qt 5.7
|
||||
\value Ido Since Qt 5.12
|
||||
\value Lojban Since Qt 5.12
|
||||
\value Sicilian Since Qt 5.12
|
||||
\value SouthernKurdish Since Qt 5.12
|
||||
\value WesternBalochi Since Qt 5.12
|
||||
\omitvalue LastLanguage
|
||||
|
||||
\sa language(), languageToString()
|
||||
|
||||
@ -77,7 +77,7 @@ static const int ImperialMeasurementSystemsCount =
|
||||
// GENERATED PART STARTS HERE
|
||||
|
||||
/*
|
||||
This part of the file was generated on 2018-08-13 from the
|
||||
This part of the file was generated on 2018-08-15 from the
|
||||
Common Locale Data Repository v33.1
|
||||
|
||||
http://www.unicode.org/cldr/
|
||||
@ -122,6 +122,7 @@ static const QLocaleId likely_subtags[] = {
|
||||
{ 195, 0, 0 }, { 195, 7, 239 }, // bem -> bem_Latn_ZM
|
||||
{ 186, 0, 0 }, { 186, 7, 210 }, // bez -> bez_Latn_TZ
|
||||
{ 20, 0, 0 }, { 20, 2, 33 }, // bg -> bg_Cyrl_BG
|
||||
{ 364, 0, 0 }, { 364, 1, 163 }, // bgn -> bgn_Arab_PK
|
||||
{ 343, 0, 0 }, { 343, 13, 100 }, // bho -> bho_Deva_IN
|
||||
{ 18, 0, 0 }, { 18, 7, 229 }, // bi -> bi_Latn_VU
|
||||
{ 270, 0, 0 }, { 270, 7, 170 }, // bku -> bku_Latn_PH
|
||||
@ -224,10 +225,12 @@ static const QLocaleId likely_subtags[] = {
|
||||
{ 168, 0, 0 }, { 168, 34, 44 }, // ii -> ii_Yiii_CN
|
||||
{ 56, 0, 0 }, { 56, 7, 225 }, // ik -> ik_Latn_US
|
||||
{ 281, 0, 0 }, { 281, 2, 178 }, // inh -> inh_Cyrl_RU
|
||||
{ 360, 0, 0 }, { 360, 7, 260 }, // io -> io_Latn_001
|
||||
{ 51, 0, 0 }, { 51, 7, 99 }, // is -> is_Latn_IS
|
||||
{ 58, 0, 0 }, { 58, 7, 106 }, // it -> it_Latn_IT
|
||||
{ 55, 0, 0 }, { 55, 44, 38 }, // iu -> iu_Cans_CA
|
||||
{ 59, 0, 0 }, { 59, 19, 108 }, // ja -> ja_Jpan_JP
|
||||
{ 361, 0, 0 }, { 361, 7, 260 }, // jbo -> jbo_Latn_001
|
||||
{ 257, 0, 0 }, { 257, 7, 37 }, // jgo -> jgo_Latn_CM
|
||||
{ 200, 0, 0 }, { 200, 7, 210 }, // jmc -> jmc_Latn_TZ
|
||||
{ 60, 0, 0 }, { 60, 7, 101 }, // jv -> jv_Latn_ID
|
||||
@ -385,10 +388,12 @@ static const QLocaleId likely_subtags[] = {
|
||||
{ 305, 0, 0 }, { 305, 90, 100 }, // saz -> saz_Saur_IN
|
||||
{ 249, 0, 0 }, { 249, 7, 210 }, // sbp -> sbp_Latn_TZ
|
||||
{ 115, 0, 0 }, { 115, 7, 106 }, // sc -> sc_Latn_IT
|
||||
{ 362, 0, 0 }, { 362, 7, 106 }, // scn -> scn_Latn_IT
|
||||
{ 105, 0, 0 }, { 105, 1, 163 }, // sd -> sd_Arab_PK
|
||||
{ 105, 13, 0 }, { 105, 13, 100 }, // sd_Deva -> sd_Deva_IN
|
||||
{ 105, 111, 0 }, { 105, 111, 100 }, // sd_Khoj -> sd_Khoj_IN
|
||||
{ 105, 125, 0 }, { 105, 125, 100 }, // sd_Sind -> sd_Sind_IN
|
||||
{ 363, 0, 0 }, { 363, 1, 102 }, // sdh -> sdh_Arab_IR
|
||||
{ 173, 0, 0 }, { 173, 7, 161 }, // se -> se_Latn_NO
|
||||
{ 180, 0, 0 }, { 180, 7, 146 }, // seh -> seh_Latn_MZ
|
||||
{ 213, 0, 0 }, { 213, 7, 132 }, // ses -> ses_Latn_ML
|
||||
@ -1252,6 +1257,11 @@ static const quint16 locale_index[] = {
|
||||
564, // Cantonese
|
||||
0, // Osage
|
||||
0, // Tangut
|
||||
566, // Ido
|
||||
567, // Lojban
|
||||
568, // Sicilian
|
||||
569, // Southern Kurdish
|
||||
570, // Western Balochi
|
||||
0 // trailing 0
|
||||
};
|
||||
|
||||
@ -1823,6 +1833,11 @@ static const QLocaleData locale_data[] = {
|
||||
{ 349, 1, 103, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 18,7 , 25,12 , 38181,77 , 38181,77 , 158,27 , 38181,77 , 38181,77 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,81,68}, 44,5 , 0,7 , 8,5 , 4,0 , 5731,11 , 0,0 , 0, 0, 6, 5, 6 }, // Northern Luri/Arabic/Iraq
|
||||
{ 357, 6, 97, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 170,5 , 170,5 , 951,5 , 951,5 , 412,8 , 441,14 , 198,6 , 215,13 , 4671,39 , 4671,39 , 158,27 , 4671,39 , 4671,39 , 158,27 , 2023,28 , 2023,28 , 2051,14 , 2023,28 , 2023,28 , 2051,14 , 60,2 , 57,2 , 45,4 , 5,17 , 22,23 , {72,75,68}, 130,3 , 17057,11 , 4,4 , 4,0 , 5742,2 , 5744,14 , 2, 1, 7, 6, 7 }, // Cantonese/Traditional Han/Hong Kong
|
||||
{ 357, 5, 44, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 170,5 , 170,5 , 951,5 , 951,5 , 412,8 , 420,13 , 198,6 , 204,11 , 4671,39 , 4710,38 , 158,27 , 4671,39 , 4710,38 , 158,27 , 2002,21 , 2023,28 , 2051,14 , 2002,21 , 2023,28 , 2051,14 , 60,2 , 57,2 , 45,4 , 5,17 , 22,23 , {67,78,89}, 129,1 , 3122,13 , 4,4 , 4,0 , 5758,2 , 5760,7 , 2, 1, 7, 6, 7 }, // Cantonese/Simplified Han/China
|
||||
{ 360, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Ido/Latin/World
|
||||
{ 361, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Lojban/Latin/World
|
||||
{ 362, 7, 106, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {69,85,82}, 14,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Sicilian/Latin/Italy
|
||||
{ 363, 1, 102, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,82,82}, 0,0 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 0, 0, 6, 5, 5 }, // Southern Kurdish/Arabic/Iran
|
||||
{ 364, 1, 163, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {80,75,82}, 172,2 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 0, 0, 7, 6, 7 }, // Western Balochi/Arabic/Pakistan
|
||||
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, {0,0,0}, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0, 0, 0, 0, 0 } // trailing 0s
|
||||
};
|
||||
|
||||
@ -6667,6 +6682,11 @@ static const char language_name_list[] =
|
||||
"Cantonese\0"
|
||||
"Osage\0"
|
||||
"Tangut\0"
|
||||
"Ido\0"
|
||||
"Lojban\0"
|
||||
"Sicilian\0"
|
||||
"Southern Kurdish\0"
|
||||
"Western Balochi\0"
|
||||
;
|
||||
|
||||
static const quint16 language_name_index[] = {
|
||||
@ -7030,6 +7050,11 @@ static const quint16 language_name_index[] = {
|
||||
3050, // Cantonese
|
||||
3060, // Osage
|
||||
3066, // Tangut
|
||||
3073, // Ido
|
||||
3077, // Lojban
|
||||
3084, // Sicilian
|
||||
3093, // Southern Kurdish
|
||||
3110, // Western Balochi
|
||||
};
|
||||
|
||||
static const char script_name_list[] =
|
||||
@ -8213,6 +8238,11 @@ static const unsigned char language_code_list[] =
|
||||
"yue" // Cantonese
|
||||
"osa" // Osage
|
||||
"txg" // Tangut
|
||||
"io\0" // Ido
|
||||
"jbo" // Lojban
|
||||
"scn" // Sicilian
|
||||
"sdh" // Southern Kurdish
|
||||
"bgn" // Western Balochi
|
||||
;
|
||||
|
||||
static const unsigned char script_code_list[] =
|
||||
|
||||
@ -2651,9 +2651,11 @@ void tst_QLocale::textDirection_data()
|
||||
case QLocale::Sabaean:
|
||||
case QLocale::Samaritan:
|
||||
case QLocale::Sindhi:
|
||||
case QLocale::SouthernKurdish:
|
||||
case QLocale::Syriac:
|
||||
case QLocale::Uighur:
|
||||
case QLocale::Urdu:
|
||||
case QLocale::WesternBalochi:
|
||||
case QLocale::Yiddish:
|
||||
// false if there is no locale data for language:
|
||||
rightToLeft = (QLocale(QLocale::Language(language)).language()
|
||||
|
||||
@ -396,7 +396,12 @@ language_list = {
|
||||
356 : ["Uncoded Languages", "mis"],
|
||||
357 : ["Cantonese", "yue"],
|
||||
358 : ["Osage", "osa"],
|
||||
359 : ["Tangut", "txg"]
|
||||
359 : ["Tangut", "txg"],
|
||||
360 : ["Ido", "io"],
|
||||
361 : ["Lojban", "jbo"],
|
||||
362 : ["Sicilian", "scn"],
|
||||
363 : ["Southern Kurdish", "sdh"],
|
||||
364 : ["Western Balochi", "bgn"],
|
||||
}
|
||||
|
||||
language_aliases = {
|
||||
@ -680,7 +685,7 @@ country_list = {
|
||||
258 : ["European Union", "EU"],
|
||||
259 : ["Outlying Oceania", "QO"],
|
||||
260 : ["World", "001"],
|
||||
261 : ["Europe", "150"]
|
||||
261 : ["Europe", "150"],
|
||||
}
|
||||
|
||||
country_aliases = {
|
||||
@ -839,7 +844,7 @@ script_list = {
|
||||
138 : ["Osage", "Osge"],
|
||||
139 : ["Tangut", "Tang"],
|
||||
140 : ["Han with Bopomofo", "Hanb"],
|
||||
141 : ["Jamo", "Jamo"]
|
||||
141 : ["Jamo", "Jamo"],
|
||||
}
|
||||
|
||||
script_aliases = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user