aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2008-01-29 01:23:53 +0000
committerRick Olson <technoweenie@gmail.com>2008-01-29 01:23:53 +0000
commit9623264c0946e334c0811f2b585208476d12aa00 (patch)
treee06b6cfbee767bccbdb013aeb34397baa41d669b /activesupport
parentbd72d06374600cb20bbc85127ab8629dd1b2453c (diff)
downloadrails-9623264c0946e334c0811f2b585208476d12aa00.tar.gz
rails-9623264c0946e334c0811f2b585208476d12aa00.tar.bz2
rails-9623264c0946e334c0811f2b585208476d12aa00.zip
Remove unnofficial 'PST' timezone
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index fce352d3ad..d1dba65f86 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -6,7 +6,6 @@ class TimeZone
"Hawaii" => "Pacific/Honolulu",
"Alaska" => "America/Juneau",
"Pacific Time (US & Canada)" => "America/Los_Angeles",
- 'PST' => "America/Los_Angeles",
"Tijuana" => "America/Tijuana",
"Mountain Time (US & Canada)" => "America/Denver",
"Arizona" => "America/Phoenix",
@@ -248,7 +247,7 @@ class TimeZone
[[-39_600, "International Date Line West", "Midway Island", "Samoa" ],
[-36_000, "Hawaii" ],
[-32_400, "Alaska" ],
- [-28_800, "Pacific Time (US & Canada)", 'PST', "Tijuana" ],
+ [-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
[-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
"Arizona" ],
[-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",