Skip to content

Commit 40d4bc5

Browse files
tglsfdctglsfdc
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 4985b3b commit 40d4bc5

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
@@ -735,7 +735,7 @@ static const struct
735735
/*
736736
* This list was built from the contents of the registry at
737737
* HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time
738-
* Zones on Windows 10 and Windows 7.
738+
* Zones on Windows 7, Windows 10, and Windows Server 2019.
739739
*
740740
* The zones have been matched to IANA timezones by looking at the cities
741741
* listed in the win32 display name (in the comment here) in most cases.
@@ -937,7 +937,7 @@ static const struct
937937
"Australia/Brisbane"
938938
},
939939
{
940-
/* (UTC+02:00) E. Europe */
940+
/* (UTC+02:00) Chisinau */
941941
"E. Europe Standard Time", "E. Europe Daylight Time",
942942
"Europe/Bucharest"
943943
},
@@ -987,7 +987,7 @@ static const struct
987987
"Asia/Tbilisi"
988988
},
989989
{
990-
/* (UTC) Dublin, Edinburgh, Lisbon, London */
990+
/* (UTC+00:00) Dublin, Edinburgh, Lisbon, London */
991991
"GMT Standard Time", "GMT Daylight Time",
992992
"Europe/London"
993993
},
@@ -997,7 +997,7 @@ static const struct
997997
"America/Godthab"
998998
},
999999
{
1000-
/* (UTC) Monrovia, Reykjavik */
1000+
/* (UTC+00:00) Monrovia, Reykjavik */
10011001
"Greenwich Standard Time", "Greenwich Daylight Time",
10021002
"Africa/Casablanca"
10031003
},
@@ -1062,10 +1062,15 @@ static const struct
10621062
"Australia/Lord_Howe"
10631063
},
10641064
{
1065-
/* (UTC+10:00) Magadan */
1065+
/* (UTC+11:00) Magadan */
10661066
"Magadan Standard Time", "Magadan Daylight Time",
10671067
"Asia/Magadan"
10681068
},
1069+
{
1070+
/* (UTC-03:00) Punta Arenas */
1071+
"Magallanes Standard Time", "Magallanes Daylight Time",
1072+
"America/Punta_Arenas"
1073+
},
10691074
{
10701075
/* (UTC-09:30) Marquesas Islands */
10711076
"Marquesas Standard Time", "Marquesas Daylight Time",
@@ -1102,7 +1107,7 @@ static const struct
11021107
"America/Montevideo"
11031108
},
11041109
{
1105-
/* (UTC) Casablanca */
1110+
/* (UTC+01:00) Casablanca */
11061111
"Morocco Standard Time", "Morocco Daylight Time",
11071112
"Africa/Casablanca"
11081113
},
@@ -1127,7 +1132,7 @@ static const struct
11271132
"Asia/Novosibirsk"
11281133
},
11291134
{
1130-
/* (UTC+01:00) Windhoek */
1135+
/* (UTC+02:00) Windhoek */
11311136
"Namibia Standard Time", "Namibia Daylight Time",
11321137
"Africa/Windhoek"
11331138
},
@@ -1162,12 +1167,22 @@ static const struct
11621167
"Asia/Krasnoyarsk"
11631168
},
11641169
{
1165-
/* (UTC+08:30) Pyongyang */
1170+
/* (UTC+09:00) Pyongyang */
11661171
"North Korea Standard Time", "North Korea Daylight Time",
11671172
"Asia/Pyongyang"
11681173
},
11691174
{
1170-
/* (UTC-03:00) Santiago */
1175+
/* (UTC+07:00) Novosibirsk */
1176+
"Novosibirsk Standard Time", "Novosibirsk Daylight Time",
1177+
"Asia/Novosibirsk"
1178+
},
1179+
{
1180+
/* (UTC+06:00) Omsk */
1181+
"Omsk Standard Time", "Omsk Daylight Time",
1182+
"Asia/Omsk"
1183+
},
1184+
{
1185+
/* (UTC-04:00) Santiago */
11711186
"Pacific SA Standard Time", "Pacific SA Daylight Time",
11721187
"America/Santiago"
11731188
},
@@ -1191,28 +1206,33 @@ static const struct
11911206
"Paraguay Standard Time", "Paraguay Daylight Time",
11921207
"America/Asuncion"
11931208
},
1209+
{
1210+
/* (UTC+05:00) Qyzylorda */
1211+
"Qyzylorda Standard Time", "Qyzylorda Daylight Time",
1212+
"Asia/Qyzylorda"
1213+
},
11941214
{
11951215
/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */
11961216
"Romance Standard Time", "Romance Daylight Time",
11971217
"Europe/Brussels"
11981218
},
11991219
{
1200-
/* (UTC+02:00) Kaliningrad (RTZ 1) */
1220+
/* (UTC+02:00) Kaliningrad */
12011221
"Russia TZ 1 Standard Time", "Russia TZ 1 Daylight Time",
12021222
"Europe/Kaliningrad"
12031223
},
12041224
{
1205-
/* (UTC+03:00) Moscow, St. Petersburg, Volgograd (RTZ 2) */
1225+
/* (UTC+03:00) Moscow, St. Petersburg */
12061226
"Russia TZ 2 Standard Time", "Russia TZ 2 Daylight Time",
12071227
"Europe/Moscow"
12081228
},
12091229
{
1210-
/* (UTC+04:00) Izhevsk, Samara (RTZ 3) */
1230+
/* (UTC+04:00) Izhevsk, Samara */
12111231
"Russia TZ 3 Standard Time", "Russia TZ 3 Daylight Time",
12121232
"Europe/Samara"
12131233
},
12141234
{
1215-
/* (UTC+05:00) Ekaterinburg (RTZ 4) */
1235+
/* (UTC+05:00) Ekaterinburg */
12161236
"Russia TZ 4 Standard Time", "Russia TZ 4 Daylight Time",
12171237
"Asia/Yekaterinburg"
12181238
},
@@ -1222,32 +1242,32 @@ static const struct
12221242
"Asia/Novosibirsk"
12231243
},
12241244
{
1225-
/* (UTC+07:00) Krasnoyarsk (RTZ 6) */
1245+
/* (UTC+07:00) Krasnoyarsk */
12261246
"Russia TZ 6 Standard Time", "Russia TZ 6 Daylight Time",
12271247
"Asia/Krasnoyarsk"
12281248
},
12291249
{
1230-
/* (UTC+08:00) Irkutsk (RTZ 7) */
1250+
/* (UTC+08:00) Irkutsk */
12311251
"Russia TZ 7 Standard Time", "Russia TZ 7 Daylight Time",
12321252
"Asia/Irkutsk"
12331253
},
12341254
{
1235-
/* (UTC+09:00) Yakutsk (RTZ 8) */
1255+
/* (UTC+09:00) Yakutsk */
12361256
"Russia TZ 8 Standard Time", "Russia TZ 8 Daylight Time",
12371257
"Asia/Yakutsk"
12381258
},
12391259
{
1240-
/* (UTC+10:00) Vladivostok, Magadan (RTZ 9) */
1260+
/* (UTC+10:00) Vladivostok */
12411261
"Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time",
12421262
"Asia/Vladivostok"
12431263
},
12441264
{
1245-
/* (UTC+11:00) Chokurdakh (RTZ 10) */
1265+
/* (UTC+11:00) Chokurdakh */
12461266
"Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time",
12471267
"Asia/Magadan"
12481268
},
12491269
{
1250-
/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky (RTZ 11) */
1270+
/* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky */
12511271
"Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time",
12521272
"Asia/Anadyr"
12531273
},
@@ -1281,6 +1301,16 @@ static const struct
12811301
"Samoa Standard Time", "Samoa Daylight Time",
12821302
"Pacific/Samoa"
12831303
},
1304+
{
1305+
/* (UTC+00:00) Sao Tome */
1306+
"Sao Tome Standard Time", "Sao Tome Daylight Time",
1307+
"Africa/Sao_Tome"
1308+
},
1309+
{
1310+
/* (UTC+04:00) Saratov */
1311+
"Saratov Standard Time", "Saratov Daylight Time",
1312+
"Europe/Saratov"
1313+
},
12841314
{
12851315
/* (UTC+07:00) Bangkok, Hanoi, Jakarta */
12861316
"SE Asia Standard Time", "SE Asia Daylight Time",
@@ -1306,6 +1336,11 @@ static const struct
13061336
"Sri Lanka Standard Time", "Sri Lanka Daylight Time",
13071337
"Asia/Colombo"
13081338
},
1339+
{
1340+
/* (UTC+02:00) Khartoum */
1341+
"Sudan Standard Time", "Sudan Daylight Time",
1342+
"Africa/Khartoum"
1343+
},
13091344
{
13101345
/* (UTC+02:00) Damascus */
13111346
"Syria Standard Time", "Syria Daylight Time",
@@ -1347,12 +1382,12 @@ static const struct
13471382
"Asia/Chita"
13481383
},
13491384
{
1350-
/* (UTC+02:00) Istanbul */
1385+
/* (UTC+03:00) Istanbul */
13511386
"Turkey Standard Time", "Turkey Daylight Time",
13521387
"Europe/Istanbul"
13531388
},
13541389
{
1355-
/* (UTC-04:00) Turks and Caicos */
1390+
/* (UTC-05:00) Turks and Caicos */
13561391
"Turks and Caicos Standard Time", "Turks and Caicos Daylight Time",
13571392
"America/Grand_Turk"
13581393
},
@@ -1381,6 +1416,11 @@ static const struct
13811416
"UTC+12", "UTC+12",
13821417
"Etc/GMT+12"
13831418
},
1419+
{
1420+
/* (UTC+13:00) Coordinated Universal Time+13 */
1421+
"UTC+13", "UTC+13",
1422+
"Etc/GMT+13"
1423+
},
13841424
{
13851425
/* (UTC-02:00) Coordinated Universal Time-02 */
13861426
"UTC-02", "UTC-02",
@@ -1402,7 +1442,7 @@ static const struct
14021442
"Etc/GMT-11"
14031443
},
14041444
{
1405-
/* (UTC-04:30) Caracas */
1445+
/* (UTC-04:00) Caracas */
14061446
"Venezuela Standard Time", "Venezuela Daylight Time",
14071447
"America/Caracas",
14081448
},
@@ -1411,6 +1451,11 @@ static const struct
14111451
"Vladivostok Standard Time", "Vladivostok Daylight Time",
14121452
"Asia/Vladivostok"
14131453
},
1454+
{
1455+
/* (UTC+04:00) Volgograd */
1456+
"Volgograd Standard Time", "Volgograd Daylight Time",
1457+
"Europe/Volgograd"
1458+
},
14141459
{
14151460
/* (UTC+08:00) Perth */
14161461
"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
@@ -121,7 +121,7 @@
121121
for my $z (@add)
122122
{
123123
print
124-
"\t{\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\t\t\t\t\t\t\t/* $z->{display} */\n";
124+
"\t{\n\t\t/* $z->{display} */\n\t\t\"$z->{std}\", \"$z->{dlt}\",\n\t\t\"FIXME\"\n\t},\n";
125125
}
126126
}
127127

0 commit comments

Comments
 (0)