diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-04-30 05:49:03 -0700 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-04-30 05:49:03 -0700 |
| commit | 63c00ba558e8c5fe02da98b2d06cf97448c99155 (patch) | |
| tree | da201b04c9f2c73187e971fa3e93e6662f857fbd /activesupport/lib/active_support | |
| parent | 8196a8dd83547735d65a75ccde6054929e68368a (diff) | |
| parent | 1d08ce5f56e45fdee41bb16b2d8d4464bc69bf22 (diff) | |
| download | rails-63c00ba558e8c5fe02da98b2d06cf97448c99155.tar.gz rails-63c00ba558e8c5fe02da98b2d06cf97448c99155.tar.bz2 rails-63c00ba558e8c5fe02da98b2d06cf97448c99155.zip | |
Merge pull request #5838 from IamNaN/patch-1
Incorporating Pacific Island zone changes circa Dec 31 2011
Diffstat (limited to 'activesupport/lib/active_support')
| -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' |