diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-01 18:12:47 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-01 18:12:47 -0700 |
| commit | e34d856b8db970d7be09b3edbf6bd95150592bd6 (patch) | |
| tree | 65eaa7bf69dbc8e25cb7662b09a7eb3643225f42 /activesupport | |
| parent | 2e20a7d9f7555ec50ba6b364ba5a5861c5f9bc95 (diff) | |
| parent | 642e1af6f13877873a51f695bf0953f9f06aec79 (diff) | |
| download | rails-e34d856b8db970d7be09b3edbf6bd95150592bd6.tar.gz rails-e34d856b8db970d7be09b3edbf6bd95150592bd6.tar.bz2 rails-e34d856b8db970d7be09b3edbf6bd95150592bd6.zip | |
Merge pull request #8097 from steveklabnik/issue_8095
Fixed mapping of Solomon Islands.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 1c1edc9048..6534c0af85 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 231d61da96..0207f53238 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -167,7 +167,7 @@ module ActiveSupport "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", |