summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander2010-04-09 11:46:06 +0000
committerMagnus Hagander2010-04-09 11:46:06 +0000
commit6279192f4f99591199cca48a9d6579ca37218da8 (patch)
tree0ea756776a5b22adc1760ad458b527cad6c73d8d
parent6efb081e10236187ac3877df13977631b7309a9b (diff)
Update list of Windows timezones we try to match localized names against
to one that's up to date with Windows 2003R2.
-rw-r--r--src/timezone/pgtz.c68
1 files changed, 64 insertions, 4 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index c11bb85322..478e891c2b 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.69 2010/04/08 11:25:58 mha Exp $
+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.70 2010/04/09 11:46:06 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -640,7 +640,7 @@ static const struct
/*
* This list was built from the contents of the registry at
* HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
- * Zones on Windows XP Professional SP2
+ * Zones on Windows 2003 R2.
*
* The zones have been matched to zic timezones by looking at the cities
* listed in the win32 display name (in the comment here) in most cases.
@@ -666,6 +666,10 @@ static const struct
"Asia/Baghdad"
}, /* (GMT+03:00) Baghdad */
{
+ "Argentina Standard Time", "Argentina Daylight Time",
+ "America/Buenos_Aires"
+ }, /* (GMT-03:00) Buenos Aires */
+ {
"Armenian Standard Time", "Armenian Daylight Time",
"Asia/Yerevan"
}, /* (GMT+04:00) Yerevan */
@@ -682,10 +686,18 @@ static const struct
"Australia/Canberra"
}, /* (GMT+10:00) Canberra, Melbourne, Sydney */
{
+ "Azerbaijan Standard Time", "Azerbaijan Daylight Time",
+ "Asia/Baku"
+ }, /* (GMT+04:00) Baku */
+ {
"Azores Standard Time", "Azores Daylight Time",
"Atlantic/Azores"
}, /* (GMT-01:00) Azores */
{
+ "Bangladesh Standard Time", "Bangladesh Daylight Time",
+ "Asia/Dhaka",
+ }, /* (GMT+06:00) Dhaka */
+ {
"Canada Central Standard Time", "Canada Central Daylight Time",
"Canada/Saskatchewan"
}, /* (GMT-06:00) Saskatchewan */
@@ -710,6 +722,10 @@ static const struct
"Asia/Dhaka"
}, /* (GMT+06:00) Astana, Dhaka */
{
+ "Central Brazilian Standard Time", "Central Brazilian Daylight Time",
+ "America/Cuiaba",
+ }, /* (GMT-04:00) Cuiaba */
+ {
"Central Europe Standard Time", "Central Europe Daylight Time",
"Europe/Belgrade"
}, /* (GMT+01:00) Belgrade, Bratislava, Budapest,
@@ -822,10 +838,18 @@ static const struct
"Asia/Amman"
}, /* (GMT+02:00) Amman */
{
+ "Kamchatka Standard Time", "Kamchatka Daylight Time",
+ "Asia/Kamchatka",
+ }, /* (GMT+12:00) Petropavlovsk-Kamchatsky */
+ {
"Korea Standard Time", "Korea Daylight Time",
"Asia/Seoul"
}, /* (GMT+09:00) Seoul */
{
+ "Mauritius Standard Time", "Mauritius Daylight Time",
+ "Indian/Mauritius",
+ }, /* (GMT+04:00) Port Louis */
+ {
"Mexico Standard Time", "Mexico Daylight Time",
"America/Mexico_City"
}, /* (GMT-06:00) Guadalajara, Mexico City,
@@ -847,6 +871,10 @@ static const struct
"America/Montevideo"
}, /* (GMT-03:00) Montevideo */
{
+ "Morocco Standard Time", "Morocco Daylight Time",
+ "Africa/Casablanca",
+ }, /* (GMT) Casablanca */
+ {
"Mountain Standard Time", "Mountain Daylight Time",
"US/Mountain"
}, /* (GMT-07:00) Mountain Time (US & Canada) */
@@ -901,6 +929,14 @@ static const struct
"America/Tijuana"
}, /* (GMT-08:00) Tijuana, Baja California */
{
+ "Pakistan Standard Time", "Pakistan Daylight Time",
+ "Asia/Karachi",
+ }, /* (GMT+05:00) Islamabad, Karachi */
+ {
+ "Paraguay Standard Time", "Paraguay Daylight Time",
+ "America/Asuncion",
+ }, /* (GMT-04:00) Asuncion */
+ {
"Romance Standard Time", "Romance Daylight Time",
"Europe/Brussels"
}, /* (GMT+01:00) Brussels, Copenhagen, Madrid,
@@ -959,6 +995,10 @@ static const struct
"Pacific/Tongatapu"
}, /* (GMT+13:00) Nuku'alofa */
{
+ "Ulaanbaatar Standard Time", "Ulaanbaatar Daylight Time",
+ "Asia/Ulaanbaatar",
+ }, /* (GMT+08:00) Ulaanbaatar */
+ {
"US Eastern Standard Time", "US Eastern Daylight Time",
"US/Eastern"
}, /* (GMT-05:00) Indiana (East) */
@@ -967,6 +1007,26 @@ static const struct
"US/Arizona"
}, /* (GMT-07:00) Arizona */
{
+ "Coordinated Universal Time", "Coordinated Universal Time",
+ "UTC"
+ }, /* (GMT) Coordinated Universal Time */
+ {
+ "UTC+12", "UTC+12",
+ "Etc/GMT+12"
+ }, /* (GMT+12:00) Coordinated Universal Time+12 */
+ {
+ "UTC-02", "UTC-02",
+ "Etc/GMT-02"
+ }, /* (GMT-02:00) Coordinated Universal Time-02 */
+ {
+ "UTC-11", "UTC-11",
+ "Etc/GMT-11"
+ }, /* (GMT-11:00) Coordinated Universal Time-11 */
+ {
+ "Venezuela Standard Time", "Venezuela Daylight Time",
+ "America/Caracas",
+ }, /* (GMT-04:30) Caracas */
+ {
"Vladivostok Standard Time", "Vladivostok Daylight Time",
"Asia/Vladivostok"
}, /* (GMT+10:00) Vladivostok */
@@ -975,10 +1035,10 @@ static const struct
"Australia/Perth"
}, /* (GMT+08:00) Perth */
#ifdef NOT_USED
- /* Could not find a match for this one. Excluded for now. */
+ /* Could not find a match for this one (just a guess). Excluded for now. */
{
"W. Central Africa Standard Time", "W. Central Africa Daylight Time",
- ""
+ "WAT"
}, /* (GMT+01:00) West Central Africa */
#endif
{