diff options
| author | Dave Gerton <dgerton@gmail.com> | 2012-04-13 13:02:40 -1000 |
|---|---|---|
| committer | Dave Gerton <dgerton@gmail.com> | 2012-04-13 13:02:40 -1000 |
| commit | 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22 (patch) | |
| tree | fb1e7825ecd2296e75d51c2c79fa50e56fb4d51b /activesupport | |
| parent | 789bade1b585a13f349f46ca4040fa7466507f46 (diff) | |
| download | rails-1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22.tar.gz rails-1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22.tar.bz2 rails-1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22.zip | |
Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. 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.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index ce46c46092..0baf9e1914 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -28,7 +28,7 @@ module ActiveSupport 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 @@ module ActiveSupport "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' |