diff options
| author | Dave Gerton <dgerton@gmail.com> | 2012-04-13 13:02:40 -1000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-04-30 13:57:39 +0100 |
| commit | 5fe88b11f11bb3b30bc23c57b36be4f027d915ba (patch) | |
| tree | 1afedea97a5e8ad59cf2c02c76303f433ffcdfe3 /activesupport | |
| parent | 2b2983d76fd11efc219273036a612f47cfaa5bfa (diff) | |
| download | rails-5fe88b11f11bb3b30bc23c57b36be4f027d915ba.tar.gz rails-5fe88b11f11bb3b30bc23c57b36be4f027d915ba.tar.bz2 rails-5fe88b11f11bb3b30bc23c57b36be4f027d915ba.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.
(cherry picked from commit 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22)
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 35f400f9df..c7d8fc2e17 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" }.each { |name, zone| name.freeze; zone.freeze } MAPPING.freeze |