Permalink
Browse files

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
  • Loading branch information...
1 parent 2e20a7d commit 642e1af6f13877873a51f695bf0953f9f06aec79 @steveklabnik steveklabnik committed Nov 2, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −0 activesupport/CHANGELOG.md
  2. +1 −1 activesupport/lib/active_support/values/time_zone.rb
@@ -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`
@@ -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",

2 comments on commit 642e1af

Contributor

frodsan replied Nov 2, 2012

Should this be backported?

Owner

rafaelfranca replied Nov 2, 2012

I would not, maybe someone can rely on this behavior.

Please sign in to comment.