diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2010-01-26 20:18:17 -0600 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2010-01-26 20:18:17 -0600 |
| commit | 1cda85d08a68888744bd230bccd75bf268587028 (patch) | |
| tree | 48a444326a863a161d253c5a6d78adb4d300294a /activesupport | |
| parent | aef76d1e7120a16e0cace1ca89c327c70cbaddf3 (diff) | |
| download | rails-1cda85d08a68888744bd230bccd75bf268587028.tar.gz rails-1cda85d08a68888744bd230bccd75bf268587028.tar.bz2 rails-1cda85d08a68888744bd230bccd75bf268587028.zip | |
Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" [#1821 status:resolved]
Diffstat (limited to 'activesupport')
3 files changed, 29 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 87ec6f2a2c..c3f531235c 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" #1821 [Geoff Buesing, Reuben Sivan] + * Changed the default ActiveSupport.use_standard_json_time_format from false to true and ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH] diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 245d3ce051..4db3dd1705 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -55,7 +55,7 @@ module ActiveSupport "Newfoundland" => "America/St_Johns", "Brasilia" => "America/Sao_Paulo", "Buenos Aires" => "America/Argentina/Buenos_Aires", - "Georgetown" => "America/Argentina/San_Juan", + "Georgetown" => "America/Guyana", "Greenland" => "America/Godthab", "Mid-Atlantic" => "Atlantic/South_Georgia", "Azores" => "Atlantic/Azores", @@ -323,9 +323,9 @@ module ActiveSupport [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota", "Lima", "Quito" ], [-16_200, "Caracas" ], - [-14_400, "Atlantic Time (Canada)", "La Paz", "Santiago" ], + [-14_400, "Atlantic Time (Canada)", "Georgetown", "La Paz", "Santiago" ], [-12_600, "Newfoundland" ], - [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ], + [-10_800, "Brasilia", "Buenos Aires", "Greenland" ], [ -7_200, "Mid-Atlantic" ], [ -3_600, "Azores", "Cape Verde Is." ], [ 0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca", diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guyana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guyana.rb new file mode 100644 index 0000000000..fccca4ceb4 --- /dev/null +++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guyana.rb @@ -0,0 +1,24 @@ +require 'tzinfo/timezone_definition' + +module TZInfo + module Definitions + module America + module Guyana + include TimezoneDefinition + + timezone 'America/Guyana' do |tz| + tz.offset :o0, -13960, 0, :LMT + tz.offset :o1, -13500, 0, :GBGT + tz.offset :o2, -13500, 0, :GYT + tz.offset :o3, -10800, 0, :GYT + tz.offset :o4, -14400, 0, :GYT + + tz.transition 1915, 3, :o1, 5228404549, 2160 + tz.transition 1966, 5, :o2, 78056693, 32 + tz.transition 1975, 7, :o3, 176010300 + tz.transition 1991, 1, :o4, 662698800 + end + end + end + end +end |