aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAndrey Novikov <envek@envek.name>2015-01-13 18:54:41 +0300
committerAndrey Novikov <envek@envek.name>2015-01-13 20:11:13 +0300
commitf996dcf7ef7eee64336b8eef53758050561e6f48 (patch)
tree427a78da8d156aa73015f5db3fee21a881b04de3 /activesupport/lib
parent233029e90ccd57eefc024ffa2f1b6ff317300a4e (diff)
downloadrails-f996dcf7ef7eee64336b8eef53758050561e6f48.tar.gz
rails-f996dcf7ef7eee64336b8eef53758050561e6f48.tar.bz2
rails-f996dcf7ef7eee64336b8eef53758050561e6f48.zip
Add missing time zone definitions for Russian Federation
Also sync Russian Federation time zones with `zone.tab` file from tzdata version 2014j.
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 17629eabb3..728b53849d 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -111,9 +111,11 @@ module ActiveSupport
"Jerusalem" => "Asia/Jerusalem",
"Harare" => "Africa/Harare",
"Pretoria" => "Africa/Johannesburg",
+ "Kaliningrad" => "Europe/Kaliningrad",
"Moscow" => "Europe/Moscow",
"St. Petersburg" => "Europe/Moscow",
- "Volgograd" => "Europe/Moscow",
+ "Volgograd" => "Europe/Volgograd",
+ "Samara" => "Europe/Samara",
"Kuwait" => "Asia/Kuwait",
"Riyadh" => "Asia/Riyadh",
"Nairobi" => "Africa/Nairobi",
@@ -170,6 +172,7 @@ module ActiveSupport
"Guam" => "Pacific/Guam",
"Port Moresby" => "Pacific/Port_Moresby",
"Magadan" => "Asia/Magadan",
+ "Srednekolymsk" => "Asia/Srednekolymsk",
"Solomon Is." => "Pacific/Guadalcanal",
"New Caledonia" => "Pacific/Noumea",
"Fiji" => "Pacific/Fiji",