From 642e1af6f13877873a51f695bf0953f9f06aec79 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Thu, 1 Nov 2012 17:58:17 -0700 Subject: [PATCH] Fixed timezone mapping of Solomon Islands. Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html --- activesupport/CHANGELOG.md | 2 ++ activesupport/lib/active_support/values/time_zone.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 1c1edc904828e..6534c0af85b9e 100644 --- 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 index 231d61da96a46..0207f53238594 100644 --- 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",