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

Update CLDR to version 33.1 (2018/June/20)

Browse Source 
Routine update in preparation for 5.12
* omitting Chakma because QLocale can't represent the zero digit,
* de_DE no longer uses vorm./nachm. but AM/PM

[ChangeLog][Third-party code] Updated CLDR to version 33.1

Task-number: QTBUG-67654
Change-Id: If20c47bb030abc3700b4f5a592152e617e2767c2
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
This commit is contained in:
Edward Welbourne 2018-07-05 20:51:31 +02:00
parent 05d49415ea
commit b82648bd59
5 changed files with 4537 additions and 4436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 v31.0.1.
QLocale's data is based on Common Locale Data Repository v33.1.
\sa QString::arg(), QString::toInt(), QString::toDouble(),
QInputMethod::locale()

8961
src/corelib/tools/qlocale_data_p.h
View File

File diff suppressed because it is too large Load Diff

1
src/corelib/tools/qlocale_p.h
View File

@ -274,6 +274,7 @@ public:
public:
quint16 m_language_id, m_script_id, m_country_id;
// FIXME QTBUG-69324: not all unicode code-points map to single-token UTF-16 :-(
quint16 m_decimal, m_group, m_list, m_percent, m_zero, m_minus, m_plus, m_exponential;
quint16 m_quotation_start, m_quotation_end;
quint16 m_alternate_quotation_start, m_alternate_quotation_end;

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

@ -26,10 +26,11 @@
world's languages, with the largest and most extensive standard repository of locale data
available.",
"Homepage": "http://cldr.unicode.org/",
"Version": "v31.0.1",
"Version": "v33.1",
"License": "// as specified in https://spdx.org/licenses/Unicode-DFS-2016.html",
"License": "Unicode License Agreement - Data Files and Software (2016)",
"LicenseId": "Unicode-DFS-2016",
"LicenseFile": "UNICODE_LICENSE.txt",
"Copyright": "Copyright (C) 1991-2017 Unicode, Inc."
"Copyright": "Copyright (C) 1991-2018 Unicode, Inc."
}
]

4
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -2245,8 +2245,8 @@ void tst_QLocale::ampm()
QCOMPARE(c.pmText(), QLatin1String("PM"));
QLocale de("de_DE");
QCOMPARE(de.amText(), QLatin1String("vorm."));
QCOMPARE(de.pmText(), QLatin1String("nachm."));
QCOMPARE(de.amText(), QLatin1String("AM"));
QCOMPARE(de.pmText(), QLatin1String("PM"));
QLocale sv("sv_SE");
QCOMPARE(sv.amText(), QLatin1String("fm"));