Skip to content
This repository
Browse code

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 authored April 30, 2012
6  activesupport/lib/active_support/values/time_zone.rb
@@ -28,7 +28,7 @@ class TimeZone
28 28
     MAPPING = {
29 29
       "International Date Line West" => "Pacific/Midway",
30 30
       "Midway Island"                => "Pacific/Midway",
31  
-      "Samoa"                        => "Pacific/Pago_Pago",
  31
+      "American Samoa"               => "Pacific/Pago_Pago",
32 32
       "Hawaii"                       => "Pacific/Honolulu",
33 33
       "Alaska"                       => "America/Juneau",
34 34
       "Pacific Time (US & Canada)"   => "America/Los_Angeles",
@@ -167,7 +167,9 @@ class TimeZone
167 167
       "Marshall Is."                 => "Pacific/Majuro",
168 168
       "Auckland"                     => "Pacific/Auckland",
169 169
       "Wellington"                   => "Pacific/Auckland",
170  
-      "Nuku'alofa"                   => "Pacific/Tongatapu"
  170
+      "Nuku'alofa"                   => "Pacific/Tongatapu",
  171
+      "Tokelau Is."                  => "Pacific/Fakaofo",
  172
+      "Samoa"                        => "Pacific/Apia"
171 173
     }
172 174
 
173 175
     UTC_OFFSET_WITH_COLON = '%s%02d:%02d'

0 notes on commit 63c00ba

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