diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-01-20 17:27:21 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-02 11:56:16 +0000 |
| commit | 2a2783e8248214af5a5c77ec73896e4884a4b1e1 (patch) | |
| tree | 918ffe5623043028fb35e35016c3b00b2ffd397e /util | |
| parent | 8b1194edea390f5608526a7f15cc562a3f17656b (diff) | |
Update to CLDR v38.1, adding Yukon Standard Time
No change to QLocale's data, one addition to the Windows time-zone
data. What was formerly "Us Mountain Standard time / Canada" is now
Yukon Standard Time.
Fixes: QTBUG-89784
Change-Id: I4c9a23620e74ea379be8a4c5ba0896d35fe9b594
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 05e67fbcab40ae702f58053d18cac567e805047a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/locale_database/cldr2qlocalexml.py | 2 | ||||
| -rwxr-xr-x | util/locale_database/cldr2qtimezone.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/util/locale_database/cldr2qlocalexml.py b/util/locale_database/cldr2qlocalexml.py index b0016fc750..20dda77965 100755 --- a/util/locale_database/cldr2qlocalexml.py +++ b/util/locale_database/cldr2qlocalexml.py @@ -32,7 +32,7 @@ The CLDR data can be downloaded from CLDR_, which has a sub-directory for each version; you need the ``core.zip`` file for your version of choice (typically the latest). This script has had updates to cope up -to v35; for later versions, we may need adaptations. Unpack the +to v38.1; for later versions, we may need adaptations. Unpack the downloaded ``core.zip`` and check it has a common/main/ sub-directory: pass the path of that root of the download to this script as its first command-line argument. Pass the name of the file in which to write diff --git a/util/locale_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py index 98076e2ec1..7c06fe8561 100755 --- a/util/locale_database/cldr2qtimezone.py +++ b/util/locale_database/cldr2qtimezone.py @@ -191,6 +191,7 @@ windowsIdList = ( (u'West Bank Standard Time', 7200), (u'West Pacific Standard Time', 36000), (u'Yakutsk Standard Time', 32400), + (u'Yukon Standard Time', -25200), # Non-DST Mountain Standard Time since 2020-11-01 ) # List of standard UTC IDs to use. Not public so may be safely changed. |