Merge pull request #22348 from kv109/22233_without_deprecation

Fix wrong timezone mapping for Switzerland (no deprecation warn) [22233]

Merge pull request #22348 from kv109/22233_without_deprecation
Fix wrong timezone mapping for Switzerland (no deprecation warn) [22233]
58cea7f2 · Andrew White · c084e719 · 7de7f21e · 58cea7f2
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

activesupport/lib/active_support/values/time_zone.rb activesupport/lib/active_support/values/time_zone.rb +2 -1

未找到文件。
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -86,7 +86,8 @@ class TimeZone
      "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",