diff options
| author | Phil Ross <phil.ross@gmail.com> | 2008-11-12 13:42:56 +0000 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-11-12 20:30:00 -0600 |
| commit | 02df503d3b4db7a3e7fabe1403c388a059f905b8 (patch) | |
| tree | 500ee16399bcbd837c0edea6615d2bf527b5bdd7 /activesupport | |
| parent | 44a3009ff068bf080de6764a8c884fbf0ceb920e (diff) | |
| download | rails-02df503d3b4db7a3e7fabe1403c388a059f905b8.tar.gz rails-02df503d3b4db7a3e7fabe1403c388a059f905b8.tar.bz2 rails-02df503d3b4db7a3e7fabe1403c388a059f905b8.zip | |
TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index e77affc315..12b300d3ae 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *2.2.1 [RC2 or 2.2 final]* +* TimeZone: Caracas GMT offset changed to -4:30 [#1361 state:resolved] [Phil Ross] + * Added render :js for people who want to render inline JavaScript replies without using RJS [DHH] * Fixed the option merging in Array#to_xml #1126 [Rudolf Gavlas] diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 4991f71683..335d75d218 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -304,7 +304,8 @@ module ActiveSupport "Mexico City", "Monterrey", "Central America" ], [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota", "Lima", "Quito" ], - [-14_400, "Atlantic Time (Canada)", "Caracas", "La Paz", "Santiago" ], + [-16_200, "Caracas" ], + [-14_400, "Atlantic Time (Canada)", "La Paz", "Santiago" ], [-12_600, "Newfoundland" ], [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ], [ -7_200, "Mid-Atlantic" ], |