summaryrefslogtreecommitdiffstats
path: root/util/local_database/cldr2qtimezone.py
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2016-03-19 15:45:32 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2016-03-30 09:43:30 +0000
commit2a0ab43f18d8e84a4547d55c0bbc219c19925ea0 (patch)
treee4b2dfa043bf15b0806fa1247dcc807f3585a0ae /util/local_database/cldr2qtimezone.py
parent99490d3e8b1c6cbedd64dbe29f28a22d0f99cc42 (diff)
Re-generate TZ data from CLDR v29
Change-Id: Ibc9c58e96c72ae9886946bcf2454f32552bd51a3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'util/local_database/cldr2qtimezone.py')
-rw-r--r--util/local_database/cldr2qtimezone.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/util/local_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py
index c6dcc807f9..502ab92fd5 100644
--- a/util/local_database/cldr2qtimezone.py
+++ b/util/local_database/cldr2qtimezone.py
@@ -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()