Merge pull request #8097 from steveklabnik/issue_8095

Fixed mapping of Solomon Islands.
rails · Nov 2, 2012 · e34d856 · e34d856
2 parents 2e20a7d + 642e1af
commit e34d856
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Fixed timezone mapping of the Solomon Islands. *Steve Klabnik*
+
 *   Make callstack attribute optional in
     ActiveSupport::Deprecation::Reporting methods `warn` and `deprecation_warning`
 

diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
@@ -167,7 +167,7 @@ class TimeZone
       "Guam"                         => "Pacific/Guam",
       "Port Moresby"                 => "Pacific/Port_Moresby",
       "Magadan"                      => "Asia/Magadan",
-      "Solomon Is."                  => "Asia/Magadan",
+      "Solomon Is."                  => "Pacific/Guadalcanal",
       "New Caledonia"                => "Pacific/Noumea",
       "Fiji"                         => "Pacific/Fiji",
       "Kamchatka"                    => "Asia/Kamchatka",