diff options
Diffstat (limited to 'util/local_database/cldr2qtimezone.py')
| -rw-r--r-- | util/local_database/cldr2qtimezone.py | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/util/local_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py index 6c0195e984..502ab92fd5 100644 --- a/util/local_database/cldr2qtimezone.py +++ b/util/local_database/cldr2qtimezone.py @@ -1,32 +1,27 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2015 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in ## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## @@ -158,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 ], @@ -195,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): @@ -246,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(): @@ -281,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 = {} @@ -337,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() |