conversion/timezoneconverter.cpp

[Christian Mollekopf]

 conversion/timezoneconverter.cpp |   59 +++++++++++++++++++++++++++------------
 1 file changed, 41 insertions(+), 18 deletions(-)

New commits:
commit 6212554c7b34f8c151e09ae867958639aa77da31
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Thu Dec 20 14:59:50 2012 +0100

    Completed the timezone lookup table with sofias help.

diff --git a/conversion/timezoneconverter.cpp b/conversion/timezoneconverter.cpp
index 57c9b70..693b143 100644
--- a/conversion/timezoneconverter.cpp
+++ b/conversion/timezoneconverter.cpp
@@ -123,10 +123,47 @@ static const struct WindowsTimezone {
     {"GMT Standard Time", "Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London", {"Europe/London"}},
     {"Greenland Standard Time", "Greenland", {"America/Godthab"}},
     {"Greenwich Standard Time", "Casablanca, Monrovia", {"Atlantic/Reykjavik"}},
-    {"", "", {""}},
-    
-    {"W. Europe Standard Time", "Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna", {"Europe/Berlin", "Europe/Amsterdam"}},
-    {"W. Central Africa Standard Time", "West Central Africa", {"Africa/Lagos"}}
+    {"GTB Standard Time", "Athens, Bucharest, Istanbul", {"Europe/Bucharest"}},
+    {"Hawaiian Standard Time", "Hawaii", {"Pacific/Honolulu"}},
+    {"India Standard Time", "Chennai, Kolkata, Mumbai, New Delhi", {"Asia/Calcutta"}},
+    {"Iran Standard Time", "Tehran", {"Asia/Tehran"}},
+    {"Israel Standard Time", "Jerusalem", {"Asia/Jerusalem"}},
+    {"Korea Standard Time", "Seoul", {"Asia/Seoul"}},
+    {"Mountain Standard Time", "Mountain Time", {"America/Phoenix"}},
+    {"Mountain Standard Time (Mexico)", "Chihuahua, La Paz, Mazatlan", {"America/Chihuahua"}},
+    {"Myanmar Standard Time", "Yangon (Rangoon)", {"Asia/Rangoon"}},
+    {"N. Central Asia Standard Time", "Almaty, Novosibirsk", {"Asia/Novosibirsk"}},
+    {"Namibia Standard Time", " Windhoek", {"Africa/Windhoek"}},
+    {"Nepal Standard Time", "Kathmandu", {"Asia/Katmandu"}},
+    {"New Zealand Standard Time", "Auckland, Wellington", {"Pacific/Auckland"}},
+    {"Newfoundland Standard Time", "Newfoundland and Labrador", {"America/St_Johns"}},
+    {"North Asia East Standard Time", "Irkutsk, Ulaanbaatar", {"Asia/Irkutsk"}},
+    {"North Asia Standard Time", "Krasnoyarsk", {"Asia/Krasnoyarsk"}},
+    {"Pacific SA Standard Time", "Santiago", {"America/Santiago"}},
+    {"Pacific Standard Time", "Pacific Time (US and Canada); Tijuana", {"America/Los_Angeles"}},
+    {"Romance Standard Time", "Brussels, Copenhagen, Madrid, Paris", {"Europe/Paris"}},
+    {"Russian Standard Time", "Moscow, St. Petersburg, Volgograd", {"Europe/Moscow"}},
+    {"SA Eastern Standard Time", "Buenos Aires, Georgetown", {"America/Cayenne"}},
+    {"SA Pacific Standard Time", "Bogota, Lima, Quito", {"America/Bogota"}},
+    {"SA Western Standard Time", "Caracas, La Paz", {"America/La_Paz"}},
+    {"Samoa Standard Time", "Midway Island, Samoa", {"Pacific/Apia"}},
+    {"SE Asia Standard Time", "Bangkok, Hanoi, Jakarta", {"Asia/Bangkok"}},
+    {"Singapore Standard Time", "Kuala Lumpur, Singapore", {"Asia/Singapore"}},
+    {"South Africa Standard Time", "Harare, Pretoria", {"Africa/Johannesburg"}},
+    {"Sri Lanka Standard Time", "Sri Jayawardenepura", {"Asia/Colombo"}},
+    {"Taipei Standard Time", "Taipei", {"Asia/Taipei"}},
+    {"Tasmania Standard Time", "Hobart", {"Australia/Hobart"}},
+    {"Tokyo Standard Time", "Osaka, Sapporo, Tokyo", {"Asia/Tokyo"}},
+    {"Tonga Standard Time", "Nuku'alofa", {"Pacific/Tongatapu"}},
+    {"US Eastern Standard Time", "Indiana (East)", {"America/Indianapolis"}},
+    {"US Mountain Standard Time", "Arizona", {"America/Phoenix"}},
+    {"Vladivostok Standard Time", "Vladivostok", {"Asia/Vladivostok"}},
+    {"W. Australia Standard Time", "Perth", {"Australia/Perth"}},
+    {"W. Central Africa Standard Time", "West Central Africa", {"Africa/Lagos"}},
+    {"W. Europe Standard Time", "Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna", {"Europe/Berlin"}},
+    {"West Asia Standard Time", "Islamabad, Karachi, Tashkent", {"Asia/Tashkent"}},
+    {"West Pacific Standard Time", "Guam, Port Moresby", {"Pacific/Port_Moresby"}},
+    {"Yakutsk Standard Time", "Yakutsk", {"Asia/Yakutsk"}}
 };
 static const int numWindowsTimezones = sizeof windowsTimezones / sizeof *windowsTimezones;
 
@@ -142,19 +179,5 @@ QString TimezoneConverter::fromHardcodedList(const QString& tz)
             return QString::fromLatin1(windowsTimezone.olson[0]);
         }
     }
-    
-
-//     if (tz.contains(QLatin1String("Mid-Atlantic"))) {
-//         return QLatin1String();
-//     }
-    if (tz.contains(QLatin1String("Mountain Time"))) {
-        return QLatin1String("America/Denver");
-    }
-    if (tz.contains(QLatin1String("Newfoundland and Labrador"))) {
-        return QLatin1String("America/St_Johns");
-    }
-    if (tz.contains(QLatin1String("Pacific Time"))) {
-        return QLatin1String("America/Los_Angeles");
-    }
     return QString();
 }