Update CLDR-derived data to newly-released v39
Routine update with minor changes to locale data, no new languages, territories or scripts. Various Spanish locales change m_grouping_top from 1 to 2, reversing a change to a test of Costa Rica's currency formatting made in commit bb6a73260ec8272647265f42180963604ad0f755. Includes updates to time-zone IDs. Fixes: QTBUG-91478 Pick-to: 6.1 6.0 5.15 Change-Id: I78ee161275b3c456c5800a7317a96947c932cf8e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
5f5fc9bf6f
commit
6235893d54
@ -74,7 +74,7 @@
|
||||
\note For the current keyboard input locale take a look at
|
||||
QInputMethod::locale().
|
||||
|
||||
QLocale's data is based on Common Locale Data Repository v38.
|
||||
QLocale's data is based on Common Locale Data Repository v39.
|
||||
|
||||
\section1 Matching combinations of language, script and territory
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -59,8 +59,8 @@ QT_BEGIN_NAMESPACE
|
||||
// GENERATED PART STARTS HERE
|
||||
|
||||
/*
|
||||
This part of the file was generated on 2021-03-12 from the
|
||||
Common Locale Data Repository v38
|
||||
This part of the file was generated on 2021-04-09 from the
|
||||
Common Locale Data Repository v39
|
||||
|
||||
http://www.unicode.org/cldr/
|
||||
|
||||
@ -504,7 +504,7 @@ static const QCalendarLocale locale_data[] = {
|
||||
{ 208, 66, 261, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// North Ndebele/Latin/Zimbabwe
|
||||
{ 209, 66, 175, 6381, 6381, 6487, 6565, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Norway
|
||||
{ 209, 66, 224, 6381, 6381, 6487, 6565, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen
|
||||
{ 210, 66, 175, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Nynorsk/Latin/Norway
|
||||
{ 210, 66, 175, 6381, 6381, 6487, 6565, 184, 184,106,106, 78, 78, 26, 26 },// Norwegian Nynorsk/Latin/Norway
|
||||
{ 211, 66, 219, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nuer/Latin/South Sudan
|
||||
{ 212, 66, 142, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nyanja/Latin/Malawi
|
||||
{ 213, 66, 243, 0, 0, 106, 106, 184, 184,106,106, 78, 78, 26, 26 },// Nyankole/Latin/Uganda
|
||||
|
@ -59,8 +59,8 @@ QT_BEGIN_NAMESPACE
|
||||
// GENERATED PART STARTS HERE
|
||||
|
||||
/*
|
||||
This part of the file was generated on 2021-03-12 from the
|
||||
Common Locale Data Repository v38
|
||||
This part of the file was generated on 2021-04-09 from the
|
||||
Common Locale Data Repository v39
|
||||
|
||||
http://www.unicode.org/cldr/
|
||||
|
||||
@ -504,7 +504,7 @@ static const QCalendarLocale locale_data[] = {
|
||||
{ 208, 66, 261, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// North Ndebele/Latin/Zimbabwe
|
||||
{ 209, 66, 175, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Norway
|
||||
{ 209, 66, 224, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Bokmal/Latin/Svalbard And Jan Mayen
|
||||
{ 210, 66, 175, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Nynorsk/Latin/Norway
|
||||
{ 210, 66, 175, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Norwegian Nynorsk/Latin/Norway
|
||||
{ 211, 66, 219, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nuer/Latin/South Sudan
|
||||
{ 212, 66, 142, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nyanja/Latin/Malawi
|
||||
{ 213, 66, 243, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nyankole/Latin/Uganda
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2715,7 +2715,7 @@ void tst_QLocale::currency()
|
||||
|
||||
const QLocale es_CR(QLocale::Spanish, QLocale::CostaRica);
|
||||
QCOMPARE(es_CR.toCurrencyString(double(1565.25)),
|
||||
QString::fromUtf8("\xE2\x82\xA1" "1565,25"));
|
||||
QString::fromUtf8("\xE2\x82\xA1" "1\xC2\xA0" "565,25"));
|
||||
QCOMPARE(es_CR.toCurrencyString(double(12565.25)),
|
||||
QString::fromUtf8("\xE2\x82\xA1" "12\xC2\xA0" "565,25"));
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user