From 0b53b86d470da1933ef85ba0891c397901702fe3 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 4 May 2014 15:51:05 +0000 Subject: [PATCH] add comment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/time.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/time.rb b/lib/time.rb index f080718dff..387df1f298 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -178,8 +178,12 @@ class Time if zone_utc?(zone) t.utc elsif offset ||= zone_offset(zone) + # Prefer the local (real) timezone over the fixed offset (artificial) + # timezone. t.localtime if t.utc_offset != offset + # Use the fixed offset timezone only if the local timezone cannot + # represent the given offset. t.localtime(offset) end else