From 6ca789bf005caadd4200b6bf788521dfe1d40287 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 30 Sep 2007 22:56:37 +0000 Subject: Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 (closes #9735) [bermi] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7700 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/CHANGELOG | 2 ++ activesupport/lib/active_support/values/time_zone.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index b0a3e6aaa6..ffeeadfa00 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *2.0.0 [Preview Release]* (September 29th, 2007) +* Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 #9735 [bermi] + * Fixed JSON encoding to use quoted keys according to the JSON standard #8762 [choonkat/chuyeow] * Alias Object#send to send! for Ruby 1.9 forward compatibility. [Jeremy Kemper] diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index ab9e2cfde8..71e8528ae1 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -98,8 +98,8 @@ class TimeZone [-36_000, "Hawaii" ], [-32_400, "Alaska" ], [-28_800, "Pacific Time (US & Canada)", "Tijuana" ], - [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "La Paz", - "Mazatlan", "Arizona" ], + [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan", + "Arizona" ], [-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara", "Mexico City", "Monterrey", "Central America" ], [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota", -- cgit v1.2.3