Permalink
Browse files

Merge pull request #8097 from steveklabnik/issue_8095

Fixed mapping of Solomon Islands.
  • Loading branch information...
2 parents 2e20a7d + 642e1af commit e34d856b8db970d7be09b3edbf6bd95150592bd6 @rafaelfranca rafaelfranca 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
View
2 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`
View
2 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",

0 comments on commit e34d856

Please sign in to comment.