Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6c5f916

Browse files
committed
Update Windows timezone name list to include currently-known zones.
Thanks to Juan José Santamaría Flecha. Discussion: https://postgr.es/m/5752.1587740484@sss.pgh.pa.us
1 parent bd8c5ce commit 6c5f916

File tree

2 files changed

+68
-23
lines changed

2 files changed

+68
-23
lines changed

src/bin/initdb/findtimezone.c

Lines changed: 67 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static const struct
736736
/*
737737
* This list was built from the contents of the registry at
738738
* HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
739-
* Zones on Windows 10 and Windows 7.
739+
* Zones on Windows 7, Windows 10, and Windows Server 2019.
740740
*
741741
* The zones have been matched to IANA timezones by looking at the cities
742742
* listed in the win32 display name (in the comment here) in most cases.
@@ -938,7 +938,7 @@ static const struct
938938
"Australia/Brisbane"
939939
},
940940
{
941-
/* (UTC+02:00) E. Europe */
941+
/* (UTC+02:00) Chisinau */
942942
"E. Europe Standard Time", "E. Europe Daylight Time",
943943
"Europe/Bucharest"
944944
},
@@ -988,7 +988,7 @@ static const struct
988988
"Asia/Tbilisi"
989989
},
990990
{
991-
/* (UTC) Dublin, Edinburgh, Lisbon, London */
991+
/* (UTC+00:00) Dublin, Edinburgh, Lisbon, London */
992992
"GMT Standard Time", "GMT Daylight Time",
993993
"Europe/London"
994994
},
@@ -998,7 +998,7 @@ static const struct
998998
"America/Godthab"
999999
},
10001000
{
1001-
/* (UTC) Monrovia, Reykjavik */
1001+
/* (UTC+00:00) Monrovia, Reykjavik */
10021002
"Greenwich Standard Time", "Greenwich Daylight Time",
10031003
"Africa/Casablanca"
10041004
},
@@ -1063,10 +1063,15 @@ static const struct
10631063
"Australia/Lord_Howe"
10641064
},
10651065
{
1066-
/* (UTC+10:00) Magadan */
1066+
/* (UTC+11:00) Magadan */
10671067
"Magadan Standard Time", "Magadan Daylight Time",
10681068
"Asia/Magadan"
10691069
},
1070+
{
1071+
/* (UTC-03:00) Punta Arenas */
1072+
"Magallanes Standard Time", "Magallanes Daylight Time",
1073+
"America/Punta_Arenas"
1074+
},
10701075
{
10711076
/* (UTC-09:30) Marquesas Islands */
10721077
"Marquesas Standard Time", "Marquesas Daylight Time",
@@ -1103,7 +1108,7 @@ static const struct
11031108
"America/Montevideo"
11041109
},
11051110
{
1106-
/* (UTC) Casablanca */
1111+
/* (UTC+01:00) Casablanca */
11071112
"Morocco Standard Time", "Morocco Daylight Time",
11081113
"Africa/Casablanca"
11091114
},
@@ -1128,7 +1133,7 @@ static const struct
11281133
"Asia/Novosibirsk"
11291134
},
11301135
{
1131-
/* (UTC+01:00) Windhoek */
1136+
/* (UTC+02:00) Windhoek */
11321137
"Namibia Standard Time", "Namibia Daylight Time",
11331138
"Africa/Windhoek"
11341139
},
@@ -1163,12 +1168,22 @@ static const struct
11631168
"Asia/Krasnoyarsk"
11641169
},
11651170
{
1166-
/* (UTC+08:30) Pyongyang */
1171+
/* (UTC+09:00) Pyongyang */
11671172
"North Korea Standard Time", "North Korea Daylight Time",
11681173
"Asia/Pyongyang"
11691174
},
11701175
{
1171-
/* (UTC-03:00) Santiago */
1176+
/* (UTC+07:00) Novosibirsk */
1177+
"Novosibirsk Standard Time", "Novosibirsk Daylight Time",
1178+
"Asia/Novosibirsk"
1179+
},
1180+
{
1181+
/* (UTC+06:00) Omsk */
1182+
"Omsk Standard Time", "Omsk Daylight Time",
1183+
"Asia/Omsk"
1184+
},
1185+
{
1186+
/* (UTC-04:00) Santiago */
11721187
"Pacific SA Standard Time", "Pacific SA Daylight Time",
11731188
"America/Santiago"
11741189
},
@@ -1192,28 +1207,33 @@ static const struct
11921207
"Paraguay Standard Time", "Paraguay Daylight Time",
11931208
"America/Asuncion"
11941209
},
1210+
{
1211+
/* (UTC+05:00) Qyzylorda */
1212+
"Qyzylorda Standard Time", "Qyzylorda Daylight Time",
1213+
"Asia/Qyzylorda"
1214+
},
11951215
{
11961216
/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */
11971217
"Romance Standard Time", "Romance Daylight Time",
11981218
"Europe/Brussels"
11991219
},
12001220
{
1201-
/* (UTC+02:00) Kaliningrad (RTZ 1) */
1221+
/* (UTC+02:00) Kaliningrad */
12021222
"Russia TZ 1 Standard Time", "Russia TZ 1 Daylight Time",
12031223
"Europe/Kaliningrad"
12041224
},
12051225
{
1206-
/* (UTC+03:00) Moscow, St. Petersburg, Volgograd (RTZ 2) */
1226+
/* (UTC+03:00) Moscow, St. Petersburg */
12071227
"Russia TZ 2 Standard Time", "Russia TZ 2 Daylight Time",
12081228
"Europe/Moscow"
12091229
},
12101230
{
1211-
/* (UTC+04:00) Izhevsk, Samara (RTZ 3) */
1231+
/* (UTC+04:00) Izhevsk, Samara */
12121232
"Russia TZ 3 Standard Time", "Russia TZ 3 Daylight Time",
12131233
"Europe/Samara"
12141234
},
12151235
{
1216-
/* (UTC+05:00) Ekaterinburg (RTZ 4) */
1236+
/* (UTC+05:00) Ekaterinburg */
12171237
"Russia TZ 4 Standard Time", "Russia TZ 4 Daylight Time",
12181238
"Asia/Yekaterinburg"
12191239
},
@@ -1223,32 +1243,32 @@ static const struct
12231243
"Asia/Novosibirsk"
12241244
},
12251245
{
1226-
/* (UTC+07:00) Krasnoyarsk (RTZ 6) */
1246+
/* (UTC+07:00) Krasnoyarsk */
12271247
"Russia TZ 6 Standard Time", "Russia TZ 6 Daylight Time",
12281248
"Asia/Krasnoyarsk"
12291249
},
12301250
{
1231-
/* (UTC+08:00) Irkutsk (RTZ 7) */
1251+
/* (UTC+08:00) Irkutsk */
12321252
"Russia TZ 7 Standard Time", "Russia TZ 7 Daylight Time",
12331253
"Asia/Irkutsk"
12341254
},
12351255
{
1236-
/* (UTC+09:00) Yakutsk (RTZ 8) */
1256+
/* (UTC+09:00) Yakutsk */
12371257
"Russia TZ 8 Standard Time", "Russia TZ 8 Daylight Time",
12381258
"Asia/Yakutsk"
12391259
},
12401260
{
1241-
/* (UTC+10:00) Vladivostok, Magadan (RTZ 9) */
1261+
/* (UTC+10:00) Vladivostok */
12421262
"Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time",
12431263
"Asia/Vladivostok"
12441264
},
12451265
{
1246-
/* (UTC+11:00) Chokurdakh (RTZ 10) */
1266+
/* (UTC+11:00) Chokurdakh */
12471267
"Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time",
12481268
"Asia/Magadan"
12491269
},
12501270
{
1251-
/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky (RTZ 11) */
1271+
/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky */
12521272
"Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time",
12531273
"Asia/Anadyr"
12541274
},
@@ -1282,6 +1302,16 @@ static const struct
12821302
"Samoa Standard Time", "Samoa Daylight Time",
12831303
"Pacific/Samoa"
12841304
},
1305+
{
1306+
/* (UTC+00:00) Sao Tome */
1307+
"Sao Tome Standard Time", "Sao Tome Daylight Time",
1308+
"Africa/Sao_Tome"
1309+
},
1310+
{
1311+
/* (UTC+04:00) Saratov */
1312+
"Saratov Standard Time", "Saratov Daylight Time",
1313+
"Europe/Saratov"
1314+
},
12851315
{
12861316
/* (UTC+07:00) Bangkok, Hanoi, Jakarta */
12871317
"SE Asia Standard Time", "SE Asia Daylight Time",
@@ -1307,6 +1337,11 @@ static const struct
13071337
"Sri Lanka Standard Time", "Sri Lanka Daylight Time",
13081338
"Asia/Colombo"
13091339
},
1340+
{
1341+
/* (UTC+02:00) Khartoum */
1342+
"Sudan Standard Time", "Sudan Daylight Time",
1343+
"Africa/Khartoum"
1344+
},
13101345
{
13111346
/* (UTC+02:00) Damascus */
13121347
"Syria Standard Time", "Syria Daylight Time",
@@ -1348,12 +1383,12 @@ static const struct
13481383
"Asia/Chita"
13491384
},
13501385
{
1351-
/* (UTC+02:00) Istanbul */
1386+
/* (UTC+03:00) Istanbul */
13521387
"Turkey Standard Time", "Turkey Daylight Time",
13531388
"Europe/Istanbul"
13541389
},
13551390
{
1356-
/* (UTC-04:00) Turks and Caicos */
1391+
/* (UTC-05:00) Turks and Caicos */
13571392
"Turks and Caicos Standard Time", "Turks and Caicos Daylight Time",
13581393
"America/Grand_Turk"
13591394
},
@@ -1382,6 +1417,11 @@ static const struct
13821417
"UTC+12", "UTC+12",
13831418
"Etc/GMT+12"
13841419
},
1420+
{
1421+
/* (UTC+13:00) Coordinated Universal Time+13 */
1422+
"UTC+13", "UTC+13",
1423+
"Etc/GMT+13"
1424+
},
13851425
{
13861426
/* (UTC-02:00) Coordinated Universal Time-02 */
13871427
"UTC-02", "UTC-02",
@@ -1403,7 +1443,7 @@ static const struct
14031443
"Etc/GMT-11"
14041444
},
14051445
{
1406-
/* (UTC-04:30) Caracas */
1446+
/* (UTC-04:00) Caracas */
14071447
"Venezuela Standard Time", "Venezuela Daylight Time",
14081448
"America/Caracas",
14091449
},
@@ -1412,6 +1452,11 @@ static const struct
14121452
"Vladivostok Standard Time", "Vladivostok Daylight Time",
14131453
"Asia/Vladivostok"
14141454
},
1455+
{
1456+
/* (UTC+04:00) Volgograd */
1457+
"Volgograd Standard Time", "Volgograd Daylight Time",
1458+
"Europe/Volgograd"
1459+
},
14151460
{
14161461
/* (UTC+08:00) Perth */
14171462
"W. Australia Standard Time", "W. Australia Daylight Time",

src/tools/win32tzlist.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
for my $z (@add)
125125
{
126126
print
127-
"\t{\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\t\t\t\t\t\t\t/* $z->{display} */\n";
127+
"\t{\n\t\t/* $z->{display} */\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\n";
128128
}
129129
}
130130

0 commit comments

Comments
 (0)