mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
utc_offset is no longer required on TimeZone and if it's not supplied we delegate to TZInfo
This commit is contained in:
parent
997e22c275
commit
90e3343ae5
1 changed files with 18 additions and 61 deletions
|
@ -194,7 +194,7 @@ module ActiveSupport
|
|||
# offset is the number of seconds that this time zone is offset from UTC
|
||||
# (GMT). Seconds were chosen as the offset unit because that is the unit that
|
||||
# Ruby uses to represent time zone offsets (see Time#utc_offset).
|
||||
def initialize(name, utc_offset, tzinfo = nil)
|
||||
def initialize(name, utc_offset = nil, tzinfo = nil)
|
||||
@name = name
|
||||
@utc_offset = utc_offset
|
||||
@tzinfo = tzinfo
|
||||
|
@ -202,9 +202,13 @@ module ActiveSupport
|
|||
end
|
||||
|
||||
def utc_offset
|
||||
if @utc_offset
|
||||
@utc_offset
|
||||
else
|
||||
@current_period ||= tzinfo.current_period
|
||||
@current_period.utc_offset
|
||||
end
|
||||
end
|
||||
|
||||
# Returns the offset of this time zone as a formatted string, of the
|
||||
# format "+HH:MM".
|
||||
|
@ -305,72 +309,25 @@ module ActiveSupport
|
|||
tzinfo.period_for_local(time, dst)
|
||||
end
|
||||
|
||||
# TODO: Preload instead of lazy load for thread safety
|
||||
def tzinfo
|
||||
@tzinfo ||= find_tzinfo
|
||||
end
|
||||
|
||||
# TODO: Preload instead of lazy load for thread safety
|
||||
def find_tzinfo
|
||||
require 'tzinfo' unless defined?(::TZInfo)
|
||||
@tzinfo ||= ::TZInfo::Timezone.get(MAPPING[name])
|
||||
::TZInfo::Timezone.get(MAPPING[name])
|
||||
end
|
||||
|
||||
unless const_defined?(:ZONES)
|
||||
ZONES = []
|
||||
ZONES_MAP = {}
|
||||
[[-39_600, "International Date Line West", "Midway Island", "Samoa" ],
|
||||
[-36_000, "Hawaii" ],
|
||||
[-32_400, "Alaska" ],
|
||||
[-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
|
||||
[-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
|
||||
"Arizona" ],
|
||||
[-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",
|
||||
"Mexico City", "Monterrey", "Central America" ],
|
||||
[-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",
|
||||
"Lima", "Quito" ],
|
||||
[-16_200, "Caracas" ],
|
||||
[-14_400, "Atlantic Time (Canada)", "Georgetown", "La Paz", "Santiago" ],
|
||||
[-12_600, "Newfoundland" ],
|
||||
[-10_800, "Brasilia", "Buenos Aires", "Greenland" ],
|
||||
[ -7_200, "Mid-Atlantic" ],
|
||||
[ -3_600, "Azores", "Cape Verde Is." ],
|
||||
[ 0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca",
|
||||
"Monrovia", "UTC" ],
|
||||
[ 3_600, "Belgrade", "Bratislava", "Budapest", "Ljubljana", "Prague",
|
||||
"Sarajevo", "Skopje", "Warsaw", "Zagreb", "Brussels",
|
||||
"Copenhagen", "Madrid", "Paris", "Amsterdam", "Berlin",
|
||||
"Bern", "Rome", "Stockholm", "Vienna",
|
||||
"West Central Africa" ],
|
||||
[ 7_200, "Bucharest", "Cairo", "Helsinki", "Kyiv", "Riga", "Sofia",
|
||||
"Tallinn", "Vilnius", "Athens", "Istanbul", "Minsk",
|
||||
"Jerusalem", "Harare", "Pretoria" ],
|
||||
[ 10_800, "Moscow", "St. Petersburg", "Volgograd", "Kuwait", "Riyadh",
|
||||
"Nairobi", "Baghdad" ],
|
||||
[ 12_600, "Tehran" ],
|
||||
[ 14_400, "Abu Dhabi", "Muscat", "Baku", "Tbilisi", "Yerevan" ],
|
||||
[ 16_200, "Kabul" ],
|
||||
[ 18_000, "Ekaterinburg", "Islamabad", "Karachi", "Tashkent" ],
|
||||
[ 19_800, "Chennai", "Kolkata", "Mumbai", "New Delhi", "Sri Jayawardenepura" ],
|
||||
[ 20_700, "Kathmandu" ],
|
||||
[ 21_600, "Astana", "Dhaka", "Almaty",
|
||||
"Novosibirsk" ],
|
||||
[ 23_400, "Rangoon" ],
|
||||
[ 25_200, "Bangkok", "Hanoi", "Jakarta", "Krasnoyarsk" ],
|
||||
[ 28_800, "Beijing", "Chongqing", "Hong Kong", "Urumqi",
|
||||
"Kuala Lumpur", "Singapore", "Taipei", "Perth", "Irkutsk",
|
||||
"Ulaan Bataar" ],
|
||||
[ 32_400, "Seoul", "Osaka", "Sapporo", "Tokyo", "Yakutsk" ],
|
||||
[ 34_200, "Darwin", "Adelaide" ],
|
||||
[ 36_000, "Canberra", "Melbourne", "Sydney", "Brisbane", "Hobart",
|
||||
"Vladivostok", "Guam", "Port Moresby" ],
|
||||
[ 39_600, "Magadan", "Solomon Is.", "New Caledonia" ],
|
||||
[ 43_200, "Fiji", "Kamchatka", "Marshall Is.", "Auckland",
|
||||
"Wellington" ],
|
||||
[ 46_800, "Nuku'alofa" ]].
|
||||
each do |offset, *places|
|
||||
places.each do |place|
|
||||
MAPPING.each_key do |place|
|
||||
place.freeze
|
||||
zone = new(place, offset)
|
||||
zone = new(place)
|
||||
ZONES << zone
|
||||
ZONES_MAP[place] = zone
|
||||
end
|
||||
end
|
||||
ZONES.sort!
|
||||
ZONES.freeze
|
||||
ZONES_MAP.freeze
|
||||
|
|
Loading…
Reference in a new issue