diff options
| author | Kacper Walanus <kacper@walanus.com> | 2015-11-15 22:34:07 +0100 |
|---|---|---|
| committer | Kacper Walanus <kacper@walanus.com> | 2015-11-15 22:34:07 +0100 |
| commit | 7de7f21e1528a9d299ae22089a371da2505a6c0c (patch) | |
| tree | ce9bacaa34b3ae386777d4b05768353ef316c1c4 /activesupport | |
| parent | e38e0c61e9d73b3531a02c6dd44c9694f64f2c0a (diff) | |
| download | rails-7de7f21e1528a9d299ae22089a371da2505a6c0c.tar.gz rails-7de7f21e1528a9d299ae22089a371da2505a6c0c.tar.bz2 rails-7de7f21e1528a9d299ae22089a371da2505a6c0c.zip | |
Fix wrong timezone mapping for Switzerland [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", |