diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-01-13 18:53:56 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-01-13 18:53:56 +0000 |
| commit | 275111f699e0682712b12c00bd4c53bdd1e30c1f (patch) | |
| tree | 0533ef21b7277753122f98263486f93b08bd6098 /activesupport | |
| parent | 3f14d6a7277c470c5ec07fd267076193c8547daf (diff) | |
| parent | f996dcf7ef7eee64336b8eef53758050561e6f48 (diff) | |
| download | rails-275111f699e0682712b12c00bd4c53bdd1e30c1f.tar.gz rails-275111f699e0682712b12c00bd4c53bdd1e30c1f.tar.bz2 rails-275111f699e0682712b12c00bd4c53bdd1e30c1f.zip | |
Merge pull request #18489 from Envek/ru_timezones
Add missing time zone definitions for Russian Federation
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index f60689b2b5..f6c236bc35 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +* Add missing time zone definitions for Russian Federation and sync them + with `zone.tab` file from tzdata version 2014j (latest). + + *Andrey Novikov* + * Add `SecureRandom.base58` for generation of random base58 strings. *Matthew Draper*, *Guillermo Iguaran* 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", |