Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Georgetown TimeZone is now mapped to "America/Guyana" instead of "Ame…
…rica/Argentina/San_Juan" [#1821 status:resolved]
  • Loading branch information
gbuesing committed Jan 27, 2010
1 parent aef76d1 commit 1cda85d
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
2 changes: 2 additions & 0 deletions 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]

Expand Down
6 changes: 3 additions & 3 deletions activesupport/lib/active_support/values/time_zone.rb
Expand Up @@ -55,7 +55,7 @@ class TimeZone
"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",
Expand Down Expand Up @@ -323,9 +323,9 @@ def tzinfo
[-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",
Expand Down
@@ -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

0 comments on commit 1cda85d

Please sign in to comment.