Skip to content
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.
  • Loading branch information...
1 parent 789bade commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22 @IamNaN committed 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"
}
UTC_OFFSET_WITH_COLON = '%s%02d:%02d'

0 comments on commit 1d08ce5

Please sign in to comment.
Something went wrong with that request. Please try again.