AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-generate TZ data from CLDR v29

Browse Source 
Change-Id: Ibc9c58e96c72ae9886946bcf2454f32552bd51a3
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Konstantin Ritt 2016-03-19 15:45:32 +04:00
parent 99490d3e8b
commit 2a0ab43f18
2 changed files with 860 additions and 857 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1701
src/corelib/tools/qtimezoneprivate_data_p.h
View File

File diff suppressed because it is too large Load Diff

16
util/local_database/cldr2qtimezone.py
View File

@ -153,7 +153,7 @@ windowsIdList = {
65 : [ u'North Asia East Standard Time', 28800 ],
66 : [ u'North Asia Standard Time', 25200 ],
67 : [ u'Pacific SA Standard Time', -10800 ],
68 : [ u'Pacific Standard Time (Mexico)', -28800 ],
68 : [ u'E. Europe Standard Time', 7200 ],
69 : [ u'Pacific Standard Time', -28800 ],
70 : [ u'Pakistan Standard Time', 18000 ],
71 : [ u'Paraguay Standard Time', -14400 ],
@ -190,7 +190,8 @@ windowsIdList = {
102: [ u'W. Europe Standard Time', 3600 ],
103: [ u'West Asia Standard Time', 18000 ],
104: [ u'West Pacific Standard Time', 36000 ],
105: [ u'Yakutsk Standard Time', 32400 ]
105: [ u'Yakutsk Standard Time', 32400 ],
106: [ u'North Korea Standard Time', 30600 ]
}
def windowsIdToKey(windowsId):
@ -241,7 +242,8 @@ utcIdList = {
35 : [ u'UTC+11:00', 39600 ],
36 : [ u'UTC+12:00', 43200 ],
37 : [ u'UTC+13:00', 46800 ],
38 : [ u'UTC+14:00', 50400 ]
38 : [ u'UTC+14:00', 50400 ],
39 : [ u'UTC+08:30', 30600 ]
}
def usage():
@ -276,9 +278,6 @@ for line in ldml:
# [[u'version', [(u'number', u'$Revision: 7825 $')]]]
versionNumber = findTagsInFile(windowsZonesPath, "version")[0][1][0][1]
# [[u'generation', [(u'date', u'$Date: 2012-10-10 14:45:31 -0700 (Wed, 10 Oct 2012) $')]]]
generationDate = findTagsInFile(windowsZonesPath, "generation")[0][1][0][1]
mapTimezones = findTagsInFile(windowsZonesPath, "windowsZones/mapTimezones")
defaultDict = {}
@ -332,13 +331,12 @@ newTempFile.write(GENERATED_BLOCK_START)
newTempFile.write("\n\
/*\n\
This part of the file was generated on %s from the\n\
Common Locale Data Repository v%s supplemental/windowsZones.xml file\n\
%s %s\n\
Common Locale Data Repository v%s supplemental/windowsZones.xml file %s\n\
\n\
http://www.unicode.org/cldr/\n\
\n\
Do not change this data, only generate it using cldr2qtimezone.py.\n\
*/\n\n" % (str(datetime.date.today()), cldr_version, versionNumber, generationDate) )
*/\n\n" % (str(datetime.date.today()), cldr_version, versionNumber) )
windowsIdData = ByteArrayData()
ianaIdData = ByteArrayData()