summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-10-08 14:02:18 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-10-09 14:39:55 +0200
commit48ab30e02aead35b1258400ae4574cba465940e2 (patch)
tree57f981c24380e0d6f8b1776ebd689901b4cb3605 /util
parent4de97909b20ca86145c4e8f6d33f12f193ec218e (diff)
Update util/locale_database/'s README and timezone script instructions
The script told me the wrong path to pass as first argument, so correct that; and the README didn't mention the need to run it. CLDR v37 makes no change to the actual generated data, though. Tweaked wording of a comment in the script. Task-number: QTBUG-84669 Change-Id: I56b510c666f414d9719cef650aeec6192c4fde6e Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'util')
-rw-r--r--util/locale_database/README3
-rwxr-xr-xutil/locale_database/cldr2qtimezone.py14
2 files changed, 10 insertions, 7 deletions
diff --git a/util/locale_database/README b/util/locale_database/README
index 8654968d66..f55e53faa6 100644
--- a/util/locale_database/README
+++ b/util/locale_database/README
@@ -3,3 +3,6 @@ locale_database is used to generate qlocale data from CLDR.
CLDR is the Common Locale Data Repository, a database for localized
data (like date formats, country names etc). It is provided by the
Unicode consortium.
+
+See cldr2qtimezone.py on how to update tables of Windows-specific
+names for zones and UTC-offset zone names.
diff --git a/util/locale_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py
index 56e26a6b94..4695c0d162 100755
--- a/util/locale_database/cldr2qtimezone.py
+++ b/util/locale_database/cldr2qtimezone.py
@@ -28,12 +28,12 @@
#############################################################################
"""Parse CLDR data for QTimeZone use with MS-Windows
-Script to parse the CLDR supplemental/windowsZones.xml file and encode
-for use in QTimeZone. See ``./cldr2qlocalexml.py`` for where to get
-the CLDR data. Pass its common/ directory as first parameter to this
-script and the qtbase root directory as second parameter. It shall
-update qtbase's src/corelib/time/qtimezoneprivate_data_p.h ready for
-use.
+Script to parse the CLDR common/supplemental/windowsZones.xml file and
+encode for use in QTimeZone. See ``./cldr2qlocalexml.py`` for where
+to get the CLDR data. Pass its root directory as first parameter to
+this script and the qtbase root directory as second parameter. It
+shall update qtbase's src/corelib/time/qtimezoneprivate_data_p.h ready
+for use.
"""
import os
@@ -45,7 +45,7 @@ from cldr import CldrAccess
### Data that may need updates in response to new entries in the CLDR file ###
-# This script shall report the update you need, if this arises.
+# This script shall report the updates you need to make, if any arise.
# However, you may need to research the relevant zone's standard offset.
# List of currently known Windows IDs.