c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix when setting time zone

Browse Source
This commit is contained in:
Lee Lawlor 2014-04-17 17:52:24 -04:00
parent 860ba6f393
commit 34ff4d7dc4
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/application_controller.rb
View File

@ -38,7 +38,7 @@ class ApplicationController < ActionController::Base
I18n.locale = @locale I18n.locale = @locale
# sets timezone for current user, all DateTime outputs will be automatically formatted # sets timezone for current user, all DateTime outputs will be automatically formatted
Time.zone = current_user.time_zone if current_user Time.zone = current_user.present? ? current_user.time_zone : 'UTC'
# allows use of daily params # allows use of daily params
params[:timescale] = '1440' if params[:timescale] == 'daily' params[:timescale] = '1440' if params[:timescale] == 'daily'
@ -323,26 +323,21 @@ class ApplicationController < ActionController::Base
# use the offset to find an appropriate timezone # use the offset to find an appropriate timezone
def set_timezone_from_offset(offset) def set_timezone_from_offset(offset)
offset = offset.to_i offset = offset.to_i
# keep track of whether a match was found # keep track of the currently matched time zone
found = false current_zone = nil
# loop through each timezone # loop through each timezone
ActiveSupport::TimeZone.zones_map.each do |z| ActiveSupport::TimeZone.zones_map.each do |z|
# set time zone current_zone = z[0]
Time.zone = z[0] # get time string in time zone without daylight savings time
timestring = Time.zone.now.to_s timestring = Time.parse('2000-01-01').in_time_zone(current_zone).to_s
# if time zone matches the offset, leave it as the current timezone # if time zone matches the offset, leave current_zone alone
if (timestring.slice(-5..-3).to_i == offset and timestring.slice(-2..-1).to_i == 0) break if (timestring.slice(-5..-3).to_i == offset && timestring.slice(-2..-1).to_i == 0)
found = true
break
end
end end
# if no time zone found, set to utc # if no time zone found, set to utc
Time.zone = 'UTC' if !found return current_zone.present? ? current_zone : 'UTC'
return Time.zone
end end
def help def help