diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2008-01-25 18:23:22 +0000 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2008-01-25 18:23:22 +0000 |
| commit | 4b2ac708b7666510d522fc706936d3c2ea5cbb80 (patch) | |
| tree | d288b810dfd797f7c22d5c5964f3804aa78b517e /activesupport/lib/active_support/values | |
| parent | a7adca3d3b53df69cf45756f0459e501ee44d469 (diff) | |
| download | rails-4b2ac708b7666510d522fc706936d3c2ea5cbb80.tar.gz rails-4b2ac708b7666510d522fc706936d3c2ea5cbb80.tar.bz2 rails-4b2ac708b7666510d522fc706936d3c2ea5cbb80.zip | |
Adding UTC zone to TimeZone; TimeWithZone no longer has to fake UTC zone with nil
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8720 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/values')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 259b49a50a..d277130c00 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -40,6 +40,7 @@ class TimeZone "London" => "Europe/London", "Casablanca" => "Africa/Casablanca", "Monrovia" => "Africa/Monrovia", + "UTC" => "UTC", "Belgrade" => "Europe/Belgrade", "Bratislava" => "Europe/Bratislava", "Budapest" => "Europe/Budapest", @@ -259,7 +260,7 @@ class TimeZone [ -7_200, "Mid-Atlantic" ], [ -3_600, "Azores", "Cape Verde Is." ], [ 0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca", - "Monrovia" ], + "Monrovia", "UTC" ], [ 3_600, "Belgrade", "Bratislava", "Budapest", "Ljubljana", "Prague", "Sarajevo", "Skopje", "Warsaw", "Zagreb", "Brussels", "Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin", |