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

Update CLDR to v45, adding language Kuvi

Browse Source 
This was in fact present in v44, but we overlooked it somehow. The new
version also fixes some inconsistencies in the data, that I reported
against v44.1; in particular, Tamil no longer claims to override the
root AM/PM markers (probably because it uses 24-hour time so doesn't
need them).

Add the test-file under util to the list of files containing generated
content.

[ChangeLog][Third-Party Code] Updated CLDR data, used by QLocale, to
v45.

Task-number: QTBUG-126060
Pick-to: 6.8 6.7 6.5 6.2
Change-Id: I81a5bcca49519b55091fc541de6b73b606661bb4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-05-31 10:55:31 +02:00
parent efab6e6983
commit f79548e268
11 changed files with 3258 additions and 3152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,6 +385,7 @@ public:
Anii = 341,
Kangri = 342,
Venetian = 343,
Kuvi = 344,
Afan = Oromo,
Bengali = Bangla,
@ -406,7 +407,7 @@ public:
Uigur = Uyghur,
Walamo = Wolaytta,
LastLanguage = Venetian
LastLanguage = Kuvi
};
enum Script : ushort {

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

@ -51,7 +51,7 @@
\note For the current keyboard input locale take a look at
QInputMethod::locale().
QLocale's data is based on Common Locale Data Repository v44.1.
QLocale's data is based on Common Locale Data Repository v45.
\section1 Matching combinations of language, script and territory
@ -254,6 +254,7 @@
\value [since 6.0] Kuanyama
\value Kurdish
\value Kurundi Obsolete, please use Rundi
\value [since 6.8] Kuvi
\value Kwanyama Obsolete, please use Kuanyama
\value Kwasio
\value [since 6.0] Kyrgyz

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

File diff suppressed because it is too large Load Diff

5
src/corelib/text/qt_attribution.json
View File

@ -30,13 +30,14 @@
"Comment": { "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py" },
"Files": [ "qlocale_data_p.h",
"../time/qtimezoneprivate_data_p.h", "../time/qhijricalendar_data_p.h",
"../time/qjalalicalendar_data_p.h", "../time/qromancalendar_data_p.h" ],
"../time/qjalalicalendar_data_p.h", "../time/qromancalendar_data_p.h",
"../../../util/locale_database/testlocales/localemodel.cpp" ],
"Description": "The Unicode CLDR provides key building blocks for software to support the
world's languages, with the largest and most extensive standard repository of locale data
available.",
"Homepage": "https://cldr.unicode.org/",
"Version": "v44.1",
"Version": "v45",
"License": "Unicode License v3",
"LicenseId": "Unicode-3.0",
"Copyright": "Copyright (C) 2004-2023 Unicode, Inc."

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

@ -25,8 +25,8 @@ namespace QtPrivate::Hijri {
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2024-01-09 from the
Common Locale Data Repository v44.1
This part of the file was generated on 2024-05-31 from the
Common Locale Data Repository v45
http://www.unicode.org/cldr/
@ -706,6 +706,10 @@ static constexpr QCalendarLocale locale_data[] = {
{ 341, 66, 25, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Anii/Latin/Benin
{ 342, 29, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kangri/Devanagari/India
{ 343, 66, 117, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Venetian/Latin/Italy
{ 344, 66, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kuvi/Latin/India
{ 344, 29, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kuvi/Devanagari/India
{ 344, 91, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kuvi/Odia/India
{ 344, 131, 110, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Kuvi/Telugu/India
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros
};

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

@ -25,8 +25,8 @@ namespace QtPrivate::Jalali {
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2024-01-09 from the
Common Locale Data Repository v44.1
This part of the file was generated on 2024-05-31 from the
Common Locale Data Repository v45
http://www.unicode.org/cldr/
@ -706,6 +706,10 @@ static constexpr QCalendarLocale locale_data[] = {
{ 341, 66, 25, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Anii/Latin/Benin
{ 342, 29, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kangri/Devanagari/India
{ 343, 66, 117, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Venetian/Latin/Italy
{ 344, 66, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kuvi/Latin/India
{ 344, 29, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kuvi/Devanagari/India
{ 344, 91, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kuvi/Odia/India
{ 344, 131, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Kuvi/Telugu/India
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros
};

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

@ -25,8 +25,8 @@ namespace QtPrivate::Roman {
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2024-01-09 from the
Common Locale Data Repository v44.1
This part of the file was generated on 2024-05-31 from the
Common Locale Data Repository v45
http://www.unicode.org/cldr/
@ -706,6 +706,10 @@ static constexpr QCalendarLocale locale_data[] = {
{ 341, 66, 25,51992,51992,52190,52190, 155, 155,198,198, 44, 44, 26, 26 },// Anii/Latin/Benin
{ 342, 29, 110,18092,18092,18164,18164,18222,18222, 72, 72, 58, 58, 29, 29 },// Kangri/Devanagari/India
{ 343, 66, 117,52234,52234,52318,52318,52365,52365, 84, 84, 47, 47, 23, 23 },// Venetian/Latin/Italy
{ 344, 66, 110,52388,52388,52526,52526,52592,52592,138,138, 66, 66, 35, 35 },// Kuvi/Latin/India
{ 344, 29, 110,52627,52627,52627,52627, 155, 155,155,155,155,155, 26, 26 },// Kuvi/Devanagari/India
{ 344, 91, 110,52782,52782,52782,52782, 155, 155,157,157,157,157, 26, 26 },// Kuvi/Odia/India
{ 344, 131, 110,52939,52939,52939,52939, 155, 155, 71, 71, 71, 71, 26, 26 },// Kuvi/Telugu/India
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },// trailing zeros
};
@ -5075,7 +5079,59 @@ static constexpr char16_t months_data[] = {
0x6a, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74,
0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x4a, 0x3b, 0x46,
0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41,
0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44
0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x70, 0x75, 0x73, 0x75,
0x20, 0x6c, 0x65, 0x6e, 0x6a, 0x75, 0x3b, 0x6d, 0x61, 0x68, 0x61, 0x20,
0x6c, 0x65, 0x6e, 0x6a, 0x75, 0x3b, 0x70, 0x61, 0x67, 0x75, 0x20, 0x6c,
0x65, 0x6e, 0x6a, 0x75, 0x3b, 0x68, 0x69, 0x72, 0x65, 0x20, 0x6c, 0x65,
0x6e, 0x6a, 0x75, 0x3b, 0x62, 0x65, 0x73, 0x65, 0x20, 0x6c, 0x65, 0x6e,
0x6a, 0x75, 0x3b, 0x6a, 0x61, 0x1e6d, 0x1e6d, 0x61, 0x20, 0x6c, 0x65, 0x6e,
0x6a, 0x75, 0x3b, 0x61, 0x61, 0x73, 0x61, 0x1e0d, 0x69, 0x20, 0x6c, 0x65,
0x6e, 0x6a, 0x75, 0x3b, 0x73, 0x72, 0x61, 0x62, 0x129, 0x20, 0x6c, 0x65,
0x6e, 0x6a, 0x75, 0x3b, 0x62, 0x61, 0x64, 0x6f, 0x20, 0x6c, 0x65, 0x6e,
0x6a, 0x75, 0x3b, 0x64, 0x61, 0x73, 0x61, 0x72, 0x61, 0x20, 0x6c, 0x65,
0x6e, 0x6a, 0x75, 0x3b, 0x64, 0x69, 0x76, 0x69, 0x20, 0x6c, 0x65, 0x6e,
0x6a, 0x75, 0x3b, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x20, 0x6c, 0x65, 0x6e,
0x6a, 0x75, 0x70, 0x75, 0x73, 0x75, 0x3b, 0x6d, 0x61, 0x68, 0x61, 0x3b,
0x70, 0x61, 0x67, 0x75, 0x3b, 0x68, 0x69, 0x72, 0x65, 0x3b, 0x62, 0x65,
0x73, 0x65, 0x3b, 0x6a, 0x61, 0x1e6d, 0x1e6d, 0x61, 0x3b, 0x61, 0x61, 0x73,
0x61, 0x1e0d, 0x69, 0x3b, 0x73, 0x72, 0x61, 0x62, 0x129, 0x3b, 0x62, 0x61,
0x64, 0x6f, 0x3b, 0x64, 0x61, 0x73, 0x61, 0x72, 0x61, 0x3b, 0x64, 0x69,
0x76, 0x69, 0x3b, 0x70, 0x61, 0x6e, 0x64, 0x65, 0x70, 0x75, 0x3b, 0x6d,
0x61, 0x3b, 0x70, 0x61, 0x3b, 0x68, 0x69, 0x3b, 0x62, 0x65, 0x3b, 0x6a,
0x61, 0x3b, 0x61, 0x61, 0x3b, 0x73, 0x72, 0x61, 0x3b, 0x62, 0x3b, 0x64,
0x61, 0x3b, 0x64, 0x69, 0x3b, 0x70, 0x61, 0x92a, 0x941, 0x938, 0x941, 0x20,
0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x92e, 0x93e, 0x939, 0x93e, 0x915,
0x93e, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x92a, 0x93e, 0x917,
0x941, 0x923, 0x940, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x939,
0x93f, 0x930, 0x947, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x92c,
0x947, 0x938, 0x947, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x91c,
0x93e, 0x91f, 0x93e, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x906,
0x938, 0x93e, 0x921, 0x93c, 0x940, 0x20, 0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941,
0x3b, 0x938, 0x94d, 0x930, 0x93e, 0x92c, 0x93e, 0x901, 0x20, 0x932, 0x947, 0x91e,
0x94d, 0x91c, 0x941, 0x3b, 0x92c, 0x94b, 0x926, 0x94b, 0x20, 0x932, 0x947, 0x91e,
0x94d, 0x91c, 0x941, 0x3b, 0x926, 0x938, 0x93e, 0x930, 0x93e, 0x20, 0x932, 0x947,
0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x926, 0x93f, 0x935, 0x940, 0x20, 0x932, 0x947,
0x91e, 0x94d, 0x91c, 0x941, 0x3b, 0x92a, 0x93e, 0x928, 0x94d, 0x921, 0x947, 0x20,
0x932, 0x947, 0x91e, 0x94d, 0x91c, 0x941, 0xb2a, 0xb41, 0xb38, 0xb41, 0x20, 0xb32,
0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb2e, 0xb3e, 0xb39, 0xb3e, 0xb15, 0xb3e,
0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb2a, 0xb3e, 0xb17, 0xb41,
0xb23, 0xb3f, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb39, 0xb3f,
0xb30, 0xb47, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb2c, 0xb47,
0xb38, 0xb47, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb3e,
0xb1f, 0xb3e, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb06, 0xb38,
0xb3e, 0xb21, 0xb3c, 0xb3f, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b,
0xb38, 0xb4d, 0xb30, 0xb3e, 0xb2c, 0xb3e, 0xb01, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d,
0xb1c, 0xb41, 0x3b, 0xb2c, 0xb26, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41,
0x3b, 0xb26, 0xb3e, 0xb38, 0xb3e, 0xb30, 0xb3e, 0x20, 0xb32, 0xb47, 0xb1e, 0xb4d,
0xb1c, 0xb41, 0x3b, 0xb26, 0xb3f, 0xb71, 0xb3f, 0xb21, 0xb3c, 0xb3f, 0x20, 0xb32,
0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0x3b, 0xb2a, 0xb3e, 0xb23, 0xb4d, 0xb21, 0xb47,
0x20, 0xb32, 0xb47, 0xb1e, 0xb4d, 0xb1c, 0xb41, 0xc2e, 0xc3e, 0xc17, 0x3b, 0xc17,
0xc41, 0xc02, 0xc21, 0xc41, 0x3b, 0xc39, 0xc3f, 0xc30, 0xc46, 0xc07, 0x3b, 0xc2c,
0xc46, 0xc38, 0xc46, 0xc15, 0xc3f, 0x3b, 0xc32, 0xc02, 0xc21, 0xc3f, 0x3b, 0xc30,
0xc3e, 0xc24, 0x3b, 0xc2c, 0xc3e, 0xc28, 0xc4d, 0xc26, 0xc2a, 0xc3e, 0xc23, 0xc3e,
0x3b, 0xc2c, 0xc3e, 0xc30, 0xc4d, 0xc38, 0xc3f, 0x3b, 0xc05, 0xc38, 0xc4d, 0xc30,
0x3b, 0xc26, 0xc3f, 0xc35, 0xc46, 0xc21, 0xc3f, 0x3b, 0xc2a, 0xc3e, 0xc02, 0xc21,
0xc41, 0x3b, 0xc2a, 0xc41, 0xc38, 0xc41
};
// GENERATED PART ENDS HERE

1743
src/corelib/time/qtimezoneprivate_data_p.h
View File

File diff suppressed because it is too large Load Diff

3
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -3270,8 +3270,7 @@ void tst_QLocale::ampm_data()
QTest::newRow("tr_TR") << QString::fromUtf8("\303\226\303\226")
<< QString::fromUtf8("\303\226\123");
QTest::newRow("id_ID") << QStringLiteral("AM") << QStringLiteral("PM");
// CLDR v44 made Tamil's AM/PM inconsistent; AM was "முற்பகல்" before.
QTest::newRow("ta_LK") << QString::fromUtf8("AM") << QString::fromUtf8("பிற்பகல்");
QTest::newRow("ta_LK") << QString::fromUtf8("AM") << QString::fromUtf8("PM");
}
void tst_QLocale::ampm()

2
util/locale_database/enumdata.py
View File

@ -406,6 +406,8 @@ language_map = {
341: ("Anii", "blo"),
342: ("Kangri", "xnr"),
343: ("Venetian", "vec"),
# added in CLDR v45
344: ("Kuvi", "kxv"),
}
# Don't add languages just because they exist; check CLDR does provide
# substantial data for locales using it; and check, once added, they

5
util/locale_database/testlocales/localemodel.cpp
View File

@ -17,8 +17,8 @@ struct LocaleListItem
// GENERATED PART STARTS HERE
/*
This part of the file was generated on 2024-04-22 from the
Common Locale Data Repository v44.1
This part of the file was generated on 2024-05-31 from the
Common Locale Data Repository v45
http://www.unicode.org/cldr/
@ -661,6 +661,7 @@ const LocaleListItem g_locale_list[] = {
{ 341, 25 }, // Anii/Benin
{ 342, 110 }, // Kangri/India
{ 343, 117 }, // Venetian/Italy
{ 344, 110 }, // Kuvi/India
};
// GENERATED PART ENDS HERE