[Calendar] Replace Godthab timezone (#65)

Co-authored-by: Ren Xie Liu <[email protected]>
ProtonMail · Jul 28, 2022 · 0b93c0b · 0b93c0b
1 parent 5cde481
commit 0b93c0b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/lib/timezonedata/exchangezones.php b/lib/timezonedata/exchangezones.php
@@ -71,7 +71,7 @@
  'Mid-Atlantic' => 'America/Noronha',
  'Brasilia' => 'America/Sao_Paulo', // Best guess
  'Buenos Aires' => 'America/Argentina/Buenos_Aires',
- 'Greenland' => 'America/Godthab',
+ 'Greenland' => 'Atlantic/Stanley',
  'Newfoundland' => 'America/St_Johns',
  'Atlantic Time (Canada)' => 'America/Halifax',
  'Caracas, La Paz' => 'America/Caracas',

diff --git a/lib/timezonedata/extrazones.php b/lib/timezonedata/extrazones.php
@@ -75,7 +75,7 @@
  'Goose Bay' => 'America/Goose_Bay',
  'Greenland Central' => 'America/Scoresbysund',
  'Greenland Eastern' => 'America/Scoresbysund',
- 'Greenland Western' => 'America/Godthab',
+ 'Greenland Western' => 'Atlantic/Stanley',
  'Guam' => 'Pacific/Guam',
  'Gulf' => 'Asia/Dubai',
  'Guyana' => 'America/Guyana',
@@ -201,4 +201,5 @@
  'Asia/Kashgar' => 'Asia/Urumqi',
  'Pacific/Johnston' => 'Pacific/Honolulu',
  'EDT' => 'America/Manaus',
+ 'America/Godthab' => 'Atlantic/Stanley',
 ];
diff --git a/lib/timezonedata/lotuszones.php b/lib/timezonedata/lotuszones.php
@@ -34,7 +34,7 @@
  'Newfoundland' => 'America/St_Johns',
  'Argentina' => 'America/Argentina/Buenos_Aires',
  'E. South America' => 'America/Belem',
- 'Greenland' => 'America/Godthab',
+ 'Greenland' => 'Atlantic/Stanley',
  'Montevideo' => 'America/Montevideo',
  'SA Eastern' => 'America/Belem',
  // 'Mid-Atlantic' => 'Etc/GMT-2', // conflict with windows timezones.

diff --git a/lib/timezonedata/windowszones.php b/lib/timezonedata/windowszones.php
@@ -60,7 +60,7 @@
  'GMT Standard Time' => 'Europe/London',
  'GTB Standard Time' => 'Europe/Bucharest',
  'Georgian Standard Time' => 'Asia/Tbilisi',
- 'Greenland Standard Time' => 'America/Godthab',
+ 'Greenland Standard Time' => 'Atlantic/Stanley',
  'Greenwich Standard Time' => 'Atlantic/Reykjavik',
  'Haiti Standard Time' => 'America/Port-au-Prince',
  'Hawaiian Standard Time' => 'Pacific/Honolulu',

diff --git a/tests/VObject/microsoft-timezones-confluence.csv b/tests/VObject/microsoft-timezones-confluence.csv
@@ -184,11 +184,11 @@ gilbert islands,Pacific/Tarawa,Pacific/Tarawa,FALSE
 gmt,Europe/London,Europe/London,FALSE
 gmt standard time,Europe/London,Europe/London,FALSE
 goose bay,America/Goose_Bay,America/Goose_Bay,FALSE
-greenland,America/Godthab,America/Godthab,FALSE
+greenland,Atlantic/Stanley,Atlantic/Stanley,FALSE
 greenland central,America/Scoresbysund,America/Scoresbysund,FALSE
 greenland eastern,America/Scoresbysund,America/Scoresbysund,FALSE
-greenland standard time,America/Godthab,America/Godthab,FALSE
-greenland western,America/Godthab,America/Godthab,FALSE
+greenland standard time,Atlantic/Stanley,Atlantic/Stanley,FALSE
+greenland western,Atlantic/Stanley,Atlantic/Stanley,FALSE
 greenwich,Atlantic/Reykjavik,Atlantic/Reykjavik,FALSE
 "greenwich mean time; dublin, edinburgh, london",Europe/London,Europe/London,FALSE
 "greenwich mean time: dublin, edinburgh, lisbon, london",Europe/Lisbon,Europe/Lisbon,FALSE