diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-05-12 11:59:18 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-08 13:37:06 +0000 |
| commit | 08cfd02312d21391c956b8bf50ab7d6caa0d8082 (patch) | |
| tree | e8eafe2ba54f0389605244e5018410f88b9f384c /src/corelib/tools | |
| parent | 72900b3d88dc326ace5b091d2ba8cea5ffb28a90 (diff) | |
Use python more competently in CLDR/qLocaleXML scripts
Make the python2 dependency explicit (sooner or later, python3 shall
be the default /bin/env python), make time-zone script executable (it
had a shebang). Use triple-quoted strings, or single quotes, to avoid
extra backslashes, remove some simply spurious backslashes. Use
generators rather than map or filter with lambdas and iterate rather
than duplicating code. Clarify some comments.
Regenerated headers: this upates the date of generation, cuts back a
double-blank-line to single and skips a spurious trailing
comma-newline on an array's data.
Change-Id: I54439f0dec132865991fe5147d509cea0f9419a0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_data_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_data_p.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 869153942e..da65326146 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -77,7 +77,7 @@ static const int ImperialMeasurementSystemsCount = // GENERATED PART STARTS HERE /* - This part of the file was generated on 2016-03-19 from the + This part of the file was generated on 2017-05-23 from the Common Locale Data Repository v29 http://www.unicode.org/cldr/ @@ -86,7 +86,6 @@ static const int ImperialMeasurementSystemsCount = cldr2qlocalexml.py and qlocalexml2cpp.py. */ - static const QLocaleId likely_subtags[] = { { 4, 0, 0 }, { 4, 7, 69 }, // aa -> aa_Latn_ET { 2, 0, 0 }, { 2, 2, 81 }, // ab -> ab_Cyrl_GE @@ -1851,8 +1850,7 @@ static const ushort list_pattern_part_data[] = { 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x438, 0x486, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x28, 0x6e, 0x29, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x14b, 0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x1e3f, 0x62, 0x25b, 0x6e, 0x20, 0x14b, -0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x70, 0x254, 0x70, 0x20, 0x25, 0x32, 0x25, 0x31, 0x540c, 0x25, 0x32, - +0x301, 0x67, 0x25b, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x70, 0x254, 0x70, 0x20, 0x25, 0x32, 0x25, 0x31, 0x540c, 0x25, 0x32 }; static const ushort date_format_data[] = { diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index 6bbcb0e2cd..4a6a73fe63 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -114,7 +114,7 @@ struct QUtcData { // GENERATED PART STARTS HERE /* - This part of the file was generated on 2016-03-19 from the + This part of the file was generated on 2017-05-23 from the Common Locale Data Repository v29 supplemental/windowsZones.xml file $Revision: 12348 $ http://www.unicode.org/cldr/ |