Permalink
Browse files

Correcting some confusion. Pago Pago is part of American Samoa, not S…

…amoa.

Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
switching from UTC-11 to UTC+13. American Samoa did not make the change and
remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
documentation about the dateline change is in austalasia at IANA.

(cherry picked from commit 1d08ce5)
  • Loading branch information...
1 parent 2b2983d commit 5fe88b11f11bb3b30bc23c57b36be4f027d915ba @IamNaN IamNaN committed with pixeltrix Apr 13, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 activesupport/lib/active_support/values/time_zone.rb
View
6 activesupport/lib/active_support/values/time_zone.rb
@@ -28,7 +28,7 @@ class TimeZone
MAPPING = {
"International Date Line West" => "Pacific/Midway",
"Midway Island" => "Pacific/Midway",
- "Samoa" => "Pacific/Pago_Pago",
+ "American Samoa" => "Pacific/Pago_Pago",
"Hawaii" => "Pacific/Honolulu",
"Alaska" => "America/Juneau",
"Pacific Time (US & Canada)" => "America/Los_Angeles",
@@ -167,7 +167,9 @@ class TimeZone
"Marshall Is." => "Pacific/Majuro",
"Auckland" => "Pacific/Auckland",
"Wellington" => "Pacific/Auckland",
- "Nuku'alofa" => "Pacific/Tongatapu"
+ "Nuku'alofa" => "Pacific/Tongatapu",
+ "Tokelau Is." => "Pacific/Fakaofo",
+ "Samoa" => "Pacific/Apia"
}.each { |name, zone| name.freeze; zone.freeze }
MAPPING.freeze

0 comments on commit 5fe88b1

Please sign in to comment.