Update Qlocale data up to CLDR 22.1
Change-Id: Ie6ddfec14cb052e0b89230dc93290ff79488fb25 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt
The Qt Project
parent
4a115ab4ae
commit
3791d21f72
3
dist/changes-5.0.0
vendored
3
dist/changes-5.0.0
vendored
@ -347,6 +347,9 @@ General Improvements
|
||||
- The Unicode Data and Algorithms has been updated to match the
|
||||
Unicode Standard of version 6.2. For more information see http://www.unicode.org/
|
||||
|
||||
- The QLocale data has been updated to CLDR 22.1.
|
||||
For more information see http://cldr.unicode.org/
|
||||
|
||||
Third party components
|
||||
----------------------
|
||||
|
||||
|
||||
@ -333,6 +333,12 @@ public:
|
||||
Vai = 252,
|
||||
Walser = 253,
|
||||
Yangben = 254,
|
||||
Avestan = 255,
|
||||
Asturian = 256,
|
||||
Ngomba = 257,
|
||||
Kako = 258,
|
||||
Meta = 259,
|
||||
Ngiemboon = 260,
|
||||
Norwegian = NorwegianBokmal,
|
||||
Moldavian = Romanian,
|
||||
SerboCroatian = Serbian,
|
||||
@ -344,7 +350,7 @@ public:
|
||||
Cambodian = Khmer,
|
||||
Kurundi = Rundi,
|
||||
RhaetoRomance = Romansh,
|
||||
LastLanguage = Yangben
|
||||
LastLanguage = Ngiemboon
|
||||
};
|
||||
|
||||
enum Script {
|
||||
@ -383,9 +389,10 @@ public:
|
||||
SinhalaScript = 32,
|
||||
SyriacScript = 33,
|
||||
YiScript = 34,
|
||||
VaiScript = 35,
|
||||
SimplifiedChineseScript = SimplifiedHanScript,
|
||||
TraditionalChineseScript = TraditionalHanScript,
|
||||
LastScript = YiScript
|
||||
LastScript = VaiScript
|
||||
};
|
||||
enum Country {
|
||||
AnyCountry = 0,
|
||||
@ -540,7 +547,7 @@ public:
|
||||
NauruCountry = 149,
|
||||
Nepal = 150,
|
||||
Netherlands = 151,
|
||||
NetherlandsAntilles = 152,
|
||||
CuraSao = 152,
|
||||
NewCaledonia = 153,
|
||||
NewZealand = 154,
|
||||
Nicaragua = 155,
|
||||
@ -642,13 +649,16 @@ public:
|
||||
IsleOfMan = 251,
|
||||
Jersey = 252,
|
||||
TristanDaCunha = 253,
|
||||
SouthSudan = 254,
|
||||
Bonaire = 255,
|
||||
SintMaarten = 256,
|
||||
DemocraticRepublicOfCongo = CongoKinshasa,
|
||||
PeoplesRepublicOfCongo = CongoBrazzaville,
|
||||
DemocraticRepublicOfKorea = NorthKorea,
|
||||
RepublicOfKorea = SouthKorea,
|
||||
RussianFederation = Russia,
|
||||
SyrianArabRepublic = Syria,
|
||||
LastCountry = TristanDaCunha
|
||||
LastCountry = SintMaarten
|
||||
};
|
||||
// GENERATED PART ENDS HERE
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
\note For the current keyboard input locale take a look at
|
||||
QInputMethod::locale().
|
||||
|
||||
QLocale's data is based on Common Locale Data Repository v2.0.1.
|
||||
QLocale's data is based on Common Locale Data Repository v22.1.
|
||||
|
||||
The double-to-string and string-to-double conversion functions are
|
||||
covered by the following licenses:
|
||||
@ -393,6 +393,12 @@
|
||||
\value Vai
|
||||
\value Walser
|
||||
\value Yangben
|
||||
\value Avestan
|
||||
\value Asturian
|
||||
\value Ngomba
|
||||
\value Kako
|
||||
\value Meta
|
||||
\value Ngiemboon
|
||||
\omitvalue LastLanguage
|
||||
|
||||
\sa language(), languageToString()
|
||||
@ -558,7 +564,6 @@
|
||||
\value NauruCountry
|
||||
\value Nepal
|
||||
\value Netherlands
|
||||
\value NetherlandsAntilles
|
||||
\value NewCaledonia
|
||||
\value NewZealand
|
||||
\value Nicaragua
|
||||
@ -660,6 +665,10 @@
|
||||
\value IsleOfMan
|
||||
\value Jersey
|
||||
\value TristanDaCunha
|
||||
\value SouthSudan
|
||||
\value CuraSao
|
||||
\value Bonaire
|
||||
\value SintMaarten
|
||||
\omitvalue LastCountry
|
||||
|
||||
\sa country(), countryToString()
|
||||
@ -707,6 +716,7 @@
|
||||
\value SinhalaScript
|
||||
\value SyriacScript
|
||||
\value YiScript
|
||||
\value VaiiScript
|
||||
\omitvalue LastScript
|
||||
|
||||
\sa script(), scriptToString(), languageToString()
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -349,7 +349,6 @@ void tst_QLocale::ctor()
|
||||
// test default countries for languages
|
||||
TEST_CTOR("zh", Chinese, China)
|
||||
TEST_CTOR("zh-Hans", Chinese, China)
|
||||
TEST_CTOR("mn", Mongolian, Mongolia)
|
||||
TEST_CTOR("ne", Nepali, Nepal)
|
||||
|
||||
#undef TEST_CTOR
|
||||
@ -1489,7 +1488,7 @@ void tst_QLocale::dayName_data()
|
||||
|
||||
QTest::newRow("ru_RU long") << QString("ru_RU") << QString::fromUtf8("\320\262\320\276\321\201\320\272\321\200\320\265\321\201\320\265\320\275\321\214\320\265") << 7 << QLocale::LongFormat;
|
||||
QTest::newRow("ru_RU short") << QString("ru_RU") << QString::fromUtf8("\320\262\321\201") << 7 << QLocale::ShortFormat;
|
||||
QTest::newRow("ru_RU narrow") << QString("ru_RU") << QString::fromUtf8("\320\222") << 7 << QLocale::NarrowFormat;
|
||||
QTest::newRow("ru_RU narrow") << QString("ru_RU") << QString::fromUtf8("\320\262\321\201") << 7 << QLocale::NarrowFormat;
|
||||
}
|
||||
|
||||
void tst_QLocale::dayName()
|
||||
@ -1635,13 +1634,13 @@ void tst_QLocale::monthName()
|
||||
|
||||
const QLocale de("de_DE");
|
||||
QCOMPARE(de.monthName(12, QLocale::LongFormat), QLatin1String("Dezember"));
|
||||
QCOMPARE(de.monthName(12, QLocale::ShortFormat), QLatin1String("Dez"));
|
||||
QCOMPARE(de.monthName(12, QLocale::ShortFormat), QLatin1String("Dez."));
|
||||
// 'de' locale doesn't have narrow month name
|
||||
QCOMPARE(de.monthName(12, QLocale::NarrowFormat), QLatin1String("D"));
|
||||
|
||||
QLocale ru("ru_RU");
|
||||
QCOMPARE(ru.monthName(1, QLocale::LongFormat), QString::fromUtf8("\321\217\320\275\320\262\320\260\321\200\321\217"));
|
||||
QCOMPARE(ru.monthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262"));
|
||||
QCOMPARE(ru.monthName(1, QLocale::ShortFormat), QString::fromUtf8("\321\217\320\275\320\262\56"));
|
||||
QCOMPARE(ru.monthName(1, QLocale::NarrowFormat), QString::fromUtf8("\320\257"));
|
||||
|
||||
// check that our CLDR scripts handle surrogate pairs correctly
|
||||
|
||||
@ -299,7 +299,13 @@ language_list = {
|
||||
251 : [ "Tasawaq", "twq" ],
|
||||
252 : [ "Vai", "vai" ],
|
||||
253 : [ "Walser", "wae" ],
|
||||
254 : [ "Yangben", "yav" ]
|
||||
254 : [ "Yangben", "yav" ],
|
||||
255 : [ "Avestan", "ae" ],
|
||||
256 : [ "Asturian", "ast" ],
|
||||
257 : [ "Ngomba", "jgo" ],
|
||||
258 : [ "Kako", "kkj" ],
|
||||
259 : [ "Meta", "mgo" ],
|
||||
260 : [ "Ngiemboon", "nnh" ]
|
||||
}
|
||||
|
||||
country_list = {
|
||||
@ -455,7 +461,7 @@ country_list = {
|
||||
149 : [ "Nauru", "NR" ],
|
||||
150 : [ "Nepal", "NP" ],
|
||||
151 : [ "Netherlands", "NL" ],
|
||||
152 : [ "NetherlandsAntilles", "AN" ],
|
||||
152 : [ "CuraSao", "CW" ],
|
||||
153 : [ "NewCaledonia", "NC" ],
|
||||
154 : [ "NewZealand", "NZ" ],
|
||||
155 : [ "Nicaragua", "NI" ],
|
||||
@ -556,7 +562,10 @@ country_list = {
|
||||
250 : [ "CeutaAndMelilla", "EA" ],
|
||||
251 : [ "IsleOfMan", "IM" ],
|
||||
252 : [ "Jersey", "JE" ],
|
||||
253 : [ "TristanDaCunha", "TA" ]
|
||||
253 : [ "TristanDaCunha", "TA" ],
|
||||
254 : [ "SouthSudan", "SS" ],
|
||||
255 : [ "Bonaire", "BQ" ],
|
||||
256 : [ "SintMaarten", "SX" ]
|
||||
}
|
||||
|
||||
script_list = {
|
||||
@ -594,7 +603,8 @@ script_list = {
|
||||
31 : [ "Tibetan", "Tibt" ],
|
||||
32 : [ "Sinhala", "Sinh" ],
|
||||
33 : [ "Syriac", "Syri" ],
|
||||
34 : [ "Yi", "Yiii" ]
|
||||
34 : [ "Yi", "Yiii" ],
|
||||
35 : [ "Vai", "Vaii" ]
|
||||
}
|
||||
|
||||
def countryCodeToId(code):
|
||||
|
||||
@ -150,7 +150,7 @@ def _findEntryInFile(file, path, draft=None, attribute=None):
|
||||
tag_name = tag_spec[:left_bracket]
|
||||
arg_value = tag_spec[left_bracket+1:-1].split("=")
|
||||
if len(arg_value) == 2:
|
||||
arg_name = arg_value[0]
|
||||
arg_name = arg_value[0].replace("@", "").replace("'", "")
|
||||
arg_value = arg_value[1]
|
||||
else:
|
||||
arg_value = arg_value[0]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user