Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc1aa3b3

Browse files
committed
Update our mapping of Windows time zone names some more.
Per discussion, let's just follow CLDR's default zone mappingsfaithfully. There are two changes here that are clear improvements:* Mapping "Greenwich Standard Time" to Atlantic/Reykjavik is actuallya better fit than using London, because Iceland hasn't observed DSTsince 1968, so this is more nearly what people might expect.* Since the "Samoa" zone is specified to be UTC+13:00, we must mapit to Pacific/Apia not Pacific/Samoa; the latter refers to AmericanSamoa which is now on the other side of the date line.The rest of these changes look like they're choosing the most populousIANA zone as representative. Whatever the details, we're just goingto say "if you don't like this mapping, complain to CLDR".Discussion:https://postgr.es/m/3266414.1633045628@sss.pgh.pa.us
1 parente752727 commitc1aa3b3

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎src/bin/initdb/findtimezone.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -741,8 +741,8 @@ static const struct
741741
* additions have been made by comparing to the CLDR project's
742742
* windowsZones.xml file.
743743
*
744-
* The zones have been matched to IANA timezones based on CLDR's mapping,
745-
*with a few manual exceptions.
744+
* The zones have been matched to IANA timezones based on CLDR's mapping
745+
*for "territory 001".
746746
*/
747747
{
748748
/* (UTC+04:30) Kabul */
@@ -869,11 +869,10 @@ static const struct
869869
"Cen. Australia Standard Time","Cen. Australia Daylight Time",
870870
"Australia/Adelaide"
871871
},
872-
/* Central America (other than Mexico) generally does not observe DST */
873872
{
874873
/* (UTC-06:00) Central America */
875874
"Central America Standard Time","Central America Daylight Time",
876-
"CST6"
875+
"America/Guatemala"
877876
},
878877
{
879878
/* (UTC+06:00) Astana */
@@ -888,7 +887,7 @@ static const struct
888887
{
889888
/* (UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague */
890889
"Central Europe Standard Time","Central Europe Daylight Time",
891-
"Europe/Belgrade"
890+
"Europe/Budapest"
892891
},
893892
{
894893
/* (UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb */
@@ -898,7 +897,7 @@ static const struct
898897
{
899898
/* (UTC+11:00) Solomon Is., New Caledonia */
900899
"Central Pacific Standard Time","Central Pacific Daylight Time",
901-
"Pacific/Noumea"
900+
"Pacific/Guadalcanal"
902901
},
903902
{
904903
/* (UTC-06:00) Central Time (US & Canada) */
@@ -988,7 +987,7 @@ static const struct
988987
{
989988
/* (UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius */
990989
"FLE Standard Time","FLE Daylight Time",
991-
"Europe/Helsinki"
990+
"Europe/Kiev"
992991
},
993992
{
994993
/* (UTC+04:00) Tbilisi */
@@ -1010,16 +1009,17 @@ static const struct
10101009
* Windows uses this zone name in various places that lie near the
10111010
* prime meridian, but are not in the UK. However, most people
10121011
* probably think that "Greenwich" means UK civil time, or maybe even
1013-
* straight-up UTC. Hence, map to Europe/London.
1012+
* straight-up UTC. Atlantic/Reykjavik is a decent match for that
1013+
* interpretation because Iceland hasn't observed DST since 1968.
10141014
*/
10151015
/* (UTC+00:00) Monrovia, Reykjavik */
10161016
"Greenwich Standard Time","Greenwich Daylight Time",
1017-
"Europe/London"
1017+
"Atlantic/Reykjavik"
10181018
},
10191019
{
10201020
/* (UTC+02:00) Athens, Bucharest */
10211021
"GTB Standard Time","GTB Daylight Time",
1022-
"Europe/Athens"
1022+
"Europe/Bucharest"
10231023
},
10241024
{
10251025
/* (UTC-05:00) Haiti */
@@ -1244,7 +1244,7 @@ static const struct
12441244
{
12451245
/* (UTC+01:00) Brussels, Copenhagen, Madrid, Paris */
12461246
"Romance Standard Time","Romance Daylight Time",
1247-
"Europe/Brussels"
1247+
"Europe/Paris"
12481248
},
12491249
{
12501250
/* (UTC+04:00) Izhevsk, Samara */
@@ -1349,7 +1349,7 @@ static const struct
13491349
{
13501350
/* (UTC+13:00) Samoa */
13511351
"Samoa Standard Time","Samoa Daylight Time",
1352-
"Pacific/Samoa"
1352+
"Pacific/Apia"
13531353
},
13541354
{
13551355
/* (UTC+00:00) Sao Tome */
@@ -1519,7 +1519,7 @@ static const struct
15191519
{
15201520
/* (UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */
15211521
"W. Europe Standard Time","W. Europe Daylight Time",
1522-
"CET"
1522+
"Europe/Berlin"
15231523
},
15241524
{
15251525
/* (UTC+07:00) Hovd */
@@ -1544,7 +1544,7 @@ static const struct
15441544
{
15451545
/* (UTC+10:00) Guam, Port Moresby */
15461546
"West Pacific Standard Time","West Pacific Daylight Time",
1547-
"Pacific/Guam"
1547+
"Pacific/Port_Moresby"
15481548
},
15491549
{
15501550
/* (UTC+09:00) Yakutsk */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp