aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/values
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2015-03-09 13:48:55 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2015-03-09 13:48:55 +0000
commit34b27701eee304d1f8bae12c841080e2b6f3b794 (patch)
tree1cc68ec0f0ec75ce11febdace39f3fb0b6fa8b03 /activesupport/lib/active_support/values
parent309ac642cbce58158288d093a8995f4994bb74cd (diff)
downloadrails-34b27701eee304d1f8bae12c841080e2b6f3b794.tar.gz
rails-34b27701eee304d1f8bae12c841080e2b6f3b794.tar.bz2
rails-34b27701eee304d1f8bae12c841080e2b6f3b794.zip
Revert "Take DST into account when locating TimeZone from Numeric."
Reverting this as it's not the implementation that we would like it to be. This is being used inside of ActiveSUpport::TimeZone[] and it's unaware of the context in which to find the timezone period so the timezone found changes depending on whether DST is in effect for the current period. This means that `'2001-01-01'.in_time_zone(-9)` changes from winter/summer even though it's the same date that we're trying to convert. Since finding timezones by numeric offsets is a bit hit and miss we should introduce a new API for finding them which supplies the date context in which we want to search and we should probably also deprecate the finding of timezones via the [] method, though this needs further discussion. This reverts commit 2cc2fa3633edd96773023c6b09d07c7b9d9b841d.
Diffstat (limited to 'activesupport/lib/active_support/values')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index ab6a78052c..da39f0d245 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -239,7 +239,7 @@ module ActiveSupport
end
when Numeric, ActiveSupport::Duration
arg *= 3600 if arg.abs <= 13
- all.find { |z| z.utc_total_offset == arg.to_i }
+ all.find { |z| z.utc_offset == arg.to_i }
else
raise ArgumentError, "invalid argument to TimeZone[]: #{arg.inspect}"
end
@@ -285,12 +285,6 @@ module ActiveSupport
end
end
- # Returns the offset of this time zone from UTC in seconds,
- # taking DST into account.
- def utc_total_offset
- tzinfo.current_period.utc_total_offset if tzinfo
- end
-
# Returns the offset of this time zone as a formatted string, of the
# format "+HH:MM".
def formatted_offset(colon=true, alternate_utc_string = nil)