github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Edinburgh TimeZone references "Europe/London" instead of "Europe/Dublin" [#3310 state:resolved]

Browse Source
This commit is contained in:
Phil Ross
2009-10-01 22:09:12 +01:00
committed by Geoff Buesing
parent 057f0d3c16
commit 9b67b7ba2f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activesupport/CHANGELOG
View File

@@ -1,5 +1,7 @@
*Edge*
* Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 [Phil Ross]
* Update bundled TZInfo to v0.3.15 [Geoff Buesing]
* JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic. [Jeremy Kemper]

2
activesupport/lib/active_support/values/time_zone.rb
View File

@@ -63,7 +63,7 @@ module ActiveSupport
"Azores" => "Atlantic/Azores",
"Cape Verde Is." => "Atlantic/Cape_Verde",
"Dublin" => "Europe/Dublin",
"Edinburgh" => "Europe/Dublin",
"Edinburgh" => "Europe/London",
"Lisbon" => "Europe/Lisbon",
"London" => "Europe/London",
"Casablanca" => "Africa/Casablanca",