diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-23 17:42:24 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-25 11:44:48 +0200 |
| commit | 43f64b4dc810cc5f7877d57cc095d0fa16c8c26b (patch) | |
| tree | 59f7b9a214f53cdded84a27dfea799d860dff5a8 /util | |
| parent | 6852ba815de30de1c321599d0864f0786a2d2652 (diff) | |
| download | qtbase-43f64b4dc810cc5f7877d57cc095d0fa16c8c26b.tar.gz | |
Update CLDR to v36
Released on October 4th.
Adds Windows names for two time zones, Qyzylorda and Volgograd.
Added languages Chickasaw (cic), Muscogee (mus) and Silesian (szl).
Norwegian number formatting has flipped back to using colon rather
than dot as time separator; it's flipped back and forth over the last
several CLDR releases. The dot form is present as a variant, the
colon form was long given as the normal pattern, then went away; but
now it's back as a contributed draft and that's what we pick up.
The MS-Win time-zone ID script was iterating a dict, causing random
reshuffling when new entries are added. Fixed that by doing the
critical iteration in sorted order.
Omitted locales ccp_BD and ccp_IN due to QTBUG-69324.
Task-number: QTBUG-79418
Change-Id: I43869ee1810ecc1fe876523947ddcbcddf4e550a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/locale_database/cldr2qtimezone.py | 6 | ||||
| -rw-r--r-- | util/locale_database/enumdata.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/util/locale_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py index c240d0d190..4c3609056d 100755 --- a/util/locale_database/cldr2qtimezone.py +++ b/util/locale_database/cldr2qtimezone.py @@ -1,7 +1,7 @@ #!/usr/bin/env python2 ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -181,6 +181,7 @@ windowsIdList = ( (u'Pacific Standard Time (Mexico)', -28800), (u'Pakistan Standard Time', 18000), (u'Paraguay Standard Time', -14400), + (u'Qyzylorda Standard Time', 18000), # a.k.a. Kyzylorda, in Kazakhstan (u'Romance Standard Time', 3600), (u'Russia Time Zone 3', 14400), (u'Russia Time Zone 10', 39600), @@ -221,6 +222,7 @@ windowsIdList = ( (u'UTC+13', 46800), (u'Venezuela Standard Time', -16200), (u'Vladivostok Standard Time', 36000), + (u'Volgograd Standard Time', 14400), (u'W. Australia Standard Time', 28800), (u'W. Central Africa Standard Time', 3600), (u'W. Europe Standard Time', 3600), @@ -386,7 +388,7 @@ ianaIdData = ByteArrayData() # Write Windows/IANA table newTempFile.write("// Windows ID Key, Country Enum, IANA ID Index\n") newTempFile.write("static const QZoneData zoneDataTable[] = {\n") -for index in windowsIdDict: +for index in sorted(windowsIdDict): data = windowsIdDict[index] newTempFile.write(" { %6d,%6d,%6d }, // %s / %s\n" % (data['windowsKey'], diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py index 0e40d8a9ee..4b4febf002 100644 --- a/util/locale_database/enumdata.py +++ b/util/locale_database/enumdata.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -404,6 +404,9 @@ language_list = { 364: ["Western Balochi", "bgn"], 365: ["Cebuano", "ceb"], 366: ["Erzya", "myv"], + 367: ["Chickasaw", "cic"], + 368: ["Muscogee", "mus"], + 369: ["Silesian", "szl"], } language_aliases = { |