From 6acb7fd61d223a87b788cdd461fa559b4197d7b7 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 23 Mar 2015 13:46:04 +0400 Subject: Fix time offset for several time zones They are in UTC-03:00, not in UTC+03:00 (just a C&P typo). Change-Id: Ib342b65967404b8756c62953258b17421b9245af Reviewed-by: Lars Knoll --- src/corelib/tools/qtimezoneprivate_data_p.h | 12 ++++++------ util/local_database/cldr2qtimezone.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index 2847cc20ce..92e6a04480 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -106,7 +106,7 @@ struct QUtcData { // GENERATED PART STARTS HERE /* - This part of the file was generated on 2014-01-12 from the + This part of the file was generated on 2015-03-23 from the Common Locale Data Repository supplemental/windowsZones.xml file $Revision: 9178 $ $Date: 2013-08-08 13:59:22 -0500 (Thu, 08 Aug 2013) $ @@ -462,13 +462,13 @@ static const QWindowsData windowsDataTable[] = { { 3, 48, 2064, 10800 }, // Arab Standard Time { 4, 67, 4133, 14400 }, // Arabian Standard Time { 5, 89, 2018, 10800 }, // Arabic Standard Time - { 6, 110, 6918, 10800 }, // Argentina Standard Time + { 6, 110, 6918,-10800 }, // Argentina Standard Time { 7, 134, 6939,-14400 }, // Atlantic Standard Time { 8, 157, 3925, 34200 }, // AUS Central Standard Time { 9, 183, 6955, 36000 }, // AUS Eastern Standard Time { 10, 209, 3915, 14400 }, // Azerbaijan Standard Time { 11, 234, 5057, -3600 }, // Azores Standard Time - { 12, 255, 5264, 10800 }, // Bahia Standard Time + { 12, 255, 5264,-10800 }, // Bahia Standard Time { 13, 275, 5253, 21600 }, // Bangladesh Standard Time { 14, 300, 6972,-21600 }, // Canada Central Standard Time { 15, 329, 4472, -3600 }, // Cape Verde Standard Time @@ -495,7 +495,7 @@ static const QWindowsData windowsDataTable[] = { { 36, 875, 7137, 7200 }, // FLE Standard Time { 37, 893, 2380, 14400 }, // Georgian Standard Time { 38, 916, 6374, 0 }, // GMT Standard Time - { 39, 934, 1847, 10800 }, // Greenland Standard Time + { 39, 934, 1847,-10800 }, // Greenland Standard Time { 40, 958, 4172, 0 }, // Greenwich Standard Time { 41, 982, 1023, 7200 }, // GTB Standard Time { 42, 1000, 2142,-36000 }, // Hawaiian Standard Time @@ -508,7 +508,7 @@ static const QWindowsData windowsDataTable[] = { { 49, 1150, 7149, 43200 }, // Magadan Standard Time { 50, 1172, 6459, 14400 }, // Mauritius Standard Time { 51, 1196, 4924, 7200 }, // Middle East Standard Time - { 52, 1222, 1121, 10800 }, // Montevideo Standard Time + { 52, 1222, 1121,-10800 }, // Montevideo Standard Time { 53, 1247, 5643, 0 }, // Morocco Standard Time { 54, 1269, 7162,-25200 }, // Mountain Standard Time (Mexico) { 55, 1301, 7180,-25200 }, // Mountain Standard Time @@ -527,7 +527,7 @@ static const QWindowsData windowsDataTable[] = { { 68, 1627, 3455,-14400 }, // Paraguay Standard Time { 69, 1650, 6612, 3600 }, // Romance Standard Time { 70, 1672, 7212, 14400 }, // Russian Standard Time - { 71, 1694, 3858, 10800 }, // SA Eastern Standard Time + { 71, 1694, 3858,-10800 }, // SA Eastern Standard Time { 72, 1719, 244,-18000 }, // SA Pacific Standard Time { 73, 1744, 1040,-14400 }, // SA Western Standard Time { 74, 1769, 2649, 46800 }, // Samoa Standard Time diff --git a/util/local_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py index 4bf4c83bb9..cf369c77ad 100755 --- a/util/local_database/cldr2qtimezone.py +++ b/util/local_database/cldr2qtimezone.py @@ -96,13 +96,13 @@ windowsIdList = { 3 : [ u'Arab Standard Time', 10800 ], 4 : [ u'Arabian Standard Time', 14400 ], 5 : [ u'Arabic Standard Time', 10800 ], - 6 : [ u'Argentina Standard Time', 10800 ], + 6 : [ u'Argentina Standard Time', -10800 ], 7 : [ u'Atlantic Standard Time', -14400 ], 8 : [ u'AUS Central Standard Time', 34200 ], 9 : [ u'AUS Eastern Standard Time', 36000 ], 10 : [ u'Azerbaijan Standard Time', 14400 ], 11 : [ u'Azores Standard Time', -3600 ], - 12 : [ u'Bahia Standard Time', 10800 ], + 12 : [ u'Bahia Standard Time', -10800 ], 13 : [ u'Bangladesh Standard Time', 21600 ], 14 : [ u'Canada Central Standard Time', -21600 ], 15 : [ u'Cape Verde Standard Time', -3600 ], @@ -129,7 +129,7 @@ windowsIdList = { 36 : [ u'FLE Standard Time', 7200 ], 37 : [ u'Georgian Standard Time', 14400 ], 38 : [ u'GMT Standard Time', 0 ], - 39 : [ u'Greenland Standard Time', 10800 ], + 39 : [ u'Greenland Standard Time', -10800 ], 40 : [ u'Greenwich Standard Time', 0 ], 41 : [ u'GTB Standard Time', 7200 ], 42 : [ u'Hawaiian Standard Time', -36000 ], @@ -142,7 +142,7 @@ windowsIdList = { 49 : [ u'Magadan Standard Time', 43200 ], 50 : [ u'Mauritius Standard Time', 14400 ], 51 : [ u'Middle East Standard Time', 7200 ], - 52 : [ u'Montevideo Standard Time', 10800 ], + 52 : [ u'Montevideo Standard Time', -10800 ], 53 : [ u'Morocco Standard Time', 0 ], 54 : [ u'Mountain Standard Time (Mexico)', -25200 ], 55 : [ u'Mountain Standard Time', -25200 ], @@ -161,7 +161,7 @@ windowsIdList = { 68 : [ u'Paraguay Standard Time', -14400 ], 69 : [ u'Romance Standard Time', 3600 ], 70 : [ u'Russian Standard Time', 14400 ], - 71 : [ u'SA Eastern Standard Time', 10800 ], + 71 : [ u'SA Eastern Standard Time', -10800 ], 72 : [ u'SA Pacific Standard Time', -18000 ], 73 : [ u'SA Western Standard Time', -14400 ], 74 : [ u'Samoa Standard Time', 46800 ], -- cgit v1.2.3