diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-24 12:34:19 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-24 12:34:19 +0000 |
| commit | 58cea7f2dc7426c3f7445adfb8925880ec1b3644 (patch) | |
| tree | 2b466cff7ac596d5d5b3d9ec36787bc0502b9fb7 /activesupport | |
| parent | c084e719b7747ca6390ab49909dcb453cba461b6 (diff) | |
| parent | 7de7f21e1528a9d299ae22089a371da2505a6c0c (diff) | |
| download | rails-58cea7f2dc7426c3f7445adfb8925880ec1b3644.tar.gz rails-58cea7f2dc7426c3f7445adfb8925880ec1b3644.tar.bz2 rails-58cea7f2dc7426c3f7445adfb8925880ec1b3644.zip | |
Merge pull request #22348 from kv109/22233_without_deprecation
Fix wrong timezone mapping for Switzerland (no deprecation warn) [22233]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 6404f65612..7ca3592520 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -86,7 +86,8 @@ module ActiveSupport "Paris" => "Europe/Paris", "Amsterdam" => "Europe/Amsterdam", "Berlin" => "Europe/Berlin", - "Bern" => "Europe/Berlin", + "Bern" => "Europe/Zurich", + "Zurich" => "Europe/Zurich", "Rome" => "Europe/Rome", "Stockholm" => "Europe/Stockholm", "Vienna" => "Europe/Vienna", |