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

Update CLDR to v38

Browse Source 
Fresh on the heels of our update to v37, they've released a new version.
No new languages to complicate life, fortunately.

Updated license (year range) and attribution. One test also needed an
update: Catalan's long time format now parenthesizes the zone.

Task-number: QTBUG-87925
Pick-to: 5.15
Change-Id: I54fb9b7f084b5cd019c983c1e3862dc03865a272
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2020-10-30 16:12:38 +01:00
parent 4ab6358039
commit 246ba8ca61
9 changed files with 5852 additions and 5842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/text/UNICODE_LICENSE.txt
View File

@ -13,7 +13,7 @@ THE DATA FILES OR SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE COPYRIGHT AND PERMISSION NOTICE
Copyright © 1991-2019 Unicode, Inc. All rights reserved. Copyright © 1991-2020 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining

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

@ -92,7 +92,7 @@
\note For the current keyboard input locale take a look at \note For the current keyboard input locale take a look at
QInputMethod::locale(). QInputMethod::locale().
QLocale's data is based on Common Locale Data Repository v37. QLocale's data is based on Common Locale Data Repository v38.
\sa QString::arg(), QString::toInt(), QString::toDouble(), \sa QString::arg(), QString::toInt(), QString::toDouble(),
QInputMethod::locale() QInputMethod::locale()

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

File diff suppressed because it is too large Load Diff

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

@ -30,7 +30,7 @@
world's languages, with the largest and most extensive standard repository of locale data world's languages, with the largest and most extensive standard repository of locale data
available.", available.",
"Homepage": "http://cldr.unicode.org/", "Homepage": "http://cldr.unicode.org/",
"Version": "v36", "Version": "v38",
"License": "// as specified in https://spdx.org/licenses/Unicode-DFS-2016.html", "License": "// as specified in https://spdx.org/licenses/Unicode-DFS-2016.html",
"License": "Unicode License Agreement - Data Files and Software (2016)", "License": "Unicode License Agreement - Data Files and Software (2016)",
"LicenseId": "Unicode-DFS-2016", "LicenseId": "Unicode-DFS-2016",

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

File diff suppressed because it is too large Load Diff

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

@ -59,8 +59,8 @@ QT_BEGIN_NAMESPACE
// GENERATED PART STARTS HERE // GENERATED PART STARTS HERE
/* /*
This part of the file was generated on 2020-10-21 from the This part of the file was generated on 2020-10-30 from the
Common Locale Data Repository v37 Common Locale Data Repository v38
http://www.unicode.org/cldr/ http://www.unicode.org/cldr/
@ -171,6 +171,7 @@ static const QCalendarLocale locale_data[] = {
{ 68, 66, 65, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Denmark { 68, 66, 65, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Denmark
{ 68, 66, 95, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Greenland { 68, 66, 95, 822, 822, 822, 822, 153, 153, 83, 83, 83, 83, 26, 26 },// Danish/Latin/Greenland
{ 69, 132, 144, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Divehi/Thaana/Maldives { 69, 132, 144, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Divehi/Thaana/Maldives
{ 70, 29, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dogri/Devanagari/India
{ 71, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Duala/Latin/Cameroon { 71, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Duala/Latin/Cameroon
{ 72, 66, 165, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Netherlands { 72, 66, 165, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Netherlands
{ 72, 66, 13, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Aruba { 72, 66, 13, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Dutch/Latin/Aruba
@ -440,6 +441,7 @@ static const QCalendarLocale locale_data[] = {
{ 151, 66, 248, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lakota/Latin/United States { 151, 66, 248, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lakota/Latin/United States
{ 152, 66, 230, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Langi/Latin/Tanzania { 152, 66, 230, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Langi/Latin/Tanzania
{ 153, 65, 129, 2287, 2287, 2367, 2446, 153, 153, 80, 80, 79, 79, 26, 26 },// Lao/Lao/Laos { 153, 65, 129, 2287, 2287, 2367, 2446, 153, 153, 80, 80, 79, 79, 26, 26 },// Lao/Lao/Laos
{ 154, 66, 253, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Latin/Latin/Vatican City
{ 155, 66, 131, 2525, 2525, 2525, 2525, 153, 153, 92, 92, 92, 92, 26, 26 },// Latvian/Latin/Latvia { 155, 66, 131, 2525, 2525, 2525, 2525, 153, 153, 92, 92, 92, 92, 26, 26 },// Latvian/Latin/Latvia
{ 158, 66, 57, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Congo Kinshasa { 158, 66, 57, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Congo Kinshasa
{ 158, 66, 7, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Angola { 158, 66, 7, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Lingala/Latin/Angola
@ -486,6 +488,7 @@ static const QCalendarLocale locale_data[] = {
{ 193, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Mundang/Latin/Cameroon { 193, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Mundang/Latin/Cameroon
{ 194, 66, 248, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Muscogee/Latin/United States { 194, 66, 248, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Muscogee/Latin/United States
{ 195, 66, 162, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nama/Latin/Namibia { 195, 66, 162, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nama/Latin/Namibia
{ 197, 66, 248, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Navajo/Latin/United States
{ 199, 29, 164, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/Nepal { 199, 29, 164, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/Nepal
{ 199, 29, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/India { 199, 29, 110, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Nepali/Devanagari/India
{ 201, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Ngiemboon/Latin/Cameroon { 201, 66, 40, 0, 0, 0, 0, 153, 153, 83, 83, 83, 83, 26, 26 },// Ngiemboon/Latin/Cameroon

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -2568,7 +2568,7 @@ void tst_QLocale::timeFormat()
const QLocale cat("ca_ES"); const QLocale cat("ca_ES");
QCOMPARE(cat.timeFormat(QLocale::ShortFormat), QLatin1String("H:mm")); QCOMPARE(cat.timeFormat(QLocale::ShortFormat), QLatin1String("H:mm"));
QCOMPARE(cat.timeFormat(QLocale::LongFormat), QLatin1String("H:mm:ss t")); QCOMPARE(cat.timeFormat(QLocale::LongFormat), QLatin1String("H:mm:ss (t)"));
const QLocale bra("pt_BR"); const QLocale bra("pt_BR");
QCOMPARE(bra.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm")); QCOMPARE(bra.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm"));