diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-01-09 16:03:55 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2024-02-07 16:17:52 +0100 |
| commit | 4f88c3e3ac3d201c2f6334770ce72677319d01b8 (patch) | |
| tree | 06c771054f5b797dabe097d93df1bf3d12402957 /util | |
| parent | 9a3da1b6d645eb4f1569deec85924118a90ab048 (diff) | |
Update QLocale and calendar data to CLDR v44.1
(This turns out to be identical to v44, for our purposes.)
The CLDR license has been revised at v44 to "UNICODE LICENSE V3",
which is now included (as LICENSES/UNICODE-3.0.txt) in addition to the
old license (still in use, presumably, by UCD - at least until its
next update). Some new QLocale::Language entries are needed. There is
no change to the time-zone data.
Some tests needed changes:
* Various Arabic locales now use U+0623 (Arabic letter aleph with
hamza above) in exponent separator, replacing plain U+0627 (Arabic
letter aleph); it is still followed by U+0633 (Arabic letter seen).
* Where likely sub-tags used to fill in world, 001, as territory for a
language, they now (e.g. for Prussian and Yiddish) give specific
countries.
* Tamil locales now have something of a mix of inherited and localized
forms for AM/PM, which looks a lot like a mistake in CLDR.
Conflict resolution at 6.7: a test fixed in dev is not present in 6.7,
as it wasn't reworked or given the new test-case, so that's omitted.
Conflict resolution in 6.6: regenerated data using 6.6's scripts.
[ChangeLog][Third-Party Code] Updated QLocale's data extracted from
the Unicode Common Locale Data Repository (CLDR) to v44.1. The license
changed to Unicode License V3.
Pick-to: 6.5
Fixes: QTBUG-121485
Task-number: QTBUG-121325
Change-Id: Ide1a68016129526d7a5aa3fc67f1a674858696bc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 063026cc503e0c02af781caf920f5abfa0416268)
(cherry picked from commit 41c786781ae3f75d02cf34c1b41e326181a03e38)
Diffstat (limited to 'util')
| -rw-r--r-- | util/locale_database/enumdata.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py index 17279e6e26..8ca1239e3b 100644 --- a/util/locale_database/enumdata.py +++ b/util/locale_database/enumdata.py @@ -372,10 +372,15 @@ language_map = { 338: ("Ligurian", "lij"), 339: ("Rohingya", "rhg"), 340: ("Torwali", "trw"), + # added in CLDR v44 + 341: ("Anii", "blo"), + 342: ("Kangri", "xnr"), + 343: ("Venetian", "vec"), } # Don't add languages just because they exist; check CLDR does provide # substantial data for locales using it; and check, once added, they -# don't show up in cldr2qlocalexmo.py's unused listing. +# don't show up in cldr2qlocalexmo.py's unused listing. Do also check +# the data's draft status; if it's (nearly) all unconfirmed, leave it. language_aliases = { # Renamings prior to Qt 6.0 (CLDR v37): |