Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #5838 from IamNaN/patch-1

Incorporating Pacific Island zone changes circa Dec 31 2011
  • Loading branch information...
commit 63c00ba558e8c5fe02da98b2d06cf97448c99155 2 parents 8196a8d + 1d08ce5
Andrew White pixeltrix authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 activesupport/lib/active_support/values/time_zone.rb
6 activesupport/lib/active_support/values/time_zone.rb
View
@@ -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'
Please sign in to comment.
Something went wrong with that request. Please try again.