From 2cf719d559696b801d8a8ea325d028bb3541ad69 Mon Sep 17 00:00:00 2001 From: Phil Ross Date: Tue, 25 Mar 2014 22:23:32 +0000 Subject: [PATCH] Update to tzdata version 2014b. http://mm.icann.org/pipermail/tz-announce/2014-March/000019.html --- data/SOURCE | 2 +- data/africa | 5 +- data/antarctica | 41 +++-- data/australasia | 21 ++- data/europe | 6 +- data/zone.tab | 3 +- .../data/definitions/Antarctica/Troll.rb | 144 ++++++++++++++++++ .../data/definitions/Europe/Simferopol.rb | 104 +------------ lib/tzinfo/data/indexes/countries.rb | 3 +- lib/tzinfo/data/indexes/timezones.rb | 1 + lib/tzinfo/data/version.rb | 4 +- tzinfo-data.gemspec | 2 +- 12 files changed, 211 insertions(+), 125 deletions(-) create mode 100644 lib/tzinfo/data/definitions/Antarctica/Troll.rb diff --git a/data/SOURCE b/data/SOURCE index 6c149595..301b1d1d 100644 --- a/data/SOURCE +++ b/data/SOURCE @@ -1,2 +1,2 @@ The files in this directory were obtained from the IANA Time Zone Database -http://www.iana.org/time-zones, version 2014a. +http://www.iana.org/time-zones, version 2014b. diff --git a/data/africa b/data/africa index 029e5c22..fbf0b65a 100644 --- a/data/africa +++ b/data/africa @@ -868,7 +868,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou # Another source (specifying the time for start and end in the decree): # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -# From Paul Eggert (2013-10-03): +# From Sebastien Willemijns (2014-03-18): +# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp + +# From Paul Eggert (2014-03-19): # To estimate what the Moroccan government will do in future years, # transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: diff --git a/data/antarctica b/data/antarctica index 5333b7b3..8f8e408d 100644 --- a/data/antarctica +++ b/data/antarctica @@ -230,24 +230,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 29 # year-round base # Scott Base, Ross Island, since 1957-01. # See Pacific/Auckland. -# -# These rules for New Zealand are stolen from the 'australasia' file. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D -Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D -Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D -Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D -Rule NZAQ 1975 only - Feb 23 2:00s 0 S -Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S -Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S -Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D -Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S # Norway - territories # Bouvet (never inhabited) # # claims # Peter I Island (never inhabited) +# +# year-round base +# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12 +# +# From Paul-Inge Flakstad (2014-03-10): +# I recently had a long dialog about this with the developer of timegenie.com. +# In the absence of specific dates, he decided to choose some likely ones: +# GMT +1 - From March 1 to the last Sunday in March +# GMT +2 - From the last Sunday in March until the last Sunday in October +# GMT +1 - From the last Sunday in October until November 7 +# GMT +0 - From November 7 until March 1 +# The dates for switching to and from UTC+0 will probably not be absolutely +# correct, but they should be quite close to the actual dates. +# +# From Paul Eggert (2014-03-21): +# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# suggested by Bengt-Inge Larsson comment them out for now, and approximate +# with only UTC and CEST. Uncomment them when 2014b is more prevalent. +# +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET +Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST +#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET +#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC +# Remove the following line when uncommenting the above '#Rule' lines. +Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Troll 0 - zzz 2005 Feb 12 + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 diff --git a/data/australasia b/data/australasia index f7fa628c..a61c184f 100644 --- a/data/australasia +++ b/data/australasia @@ -763,14 +763,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind. +# Details are uncertain. We have no data for Johnston after 1970, so +# treat it like Hawaii for now. +# # In his memoirs of June 6th to October 4, 1945 # (2005), Herbert C. Bach writes, # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM # Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and # confirms that Johnston kept the same time as Honolulu in summer 1945. -# We have no better information, so for now, assume this has been true -# indefinitely into the past. +# +# From Lyle McElhaney (2014-03-11): +# [W]hen JI was being used for that [atomic bomb] testing, the time being used +# was not Hawaiian time but rather the same time being used on the ships, +# which had a GMT offset of -11 hours. This apparently applied to at least the +# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last +# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin, +# "The United States High-Altitude Test Experience: A Review Emphasizing the +# Impact on the Environment", Los Alamos LA-6405, Oct 1976 +# . +# See the table on page 4 where he lists GMT and local times for the tests; a +# footnote for the JI tests reads that local time is "JI time = Hawaii Time +# Minus One Hour". # # See 'northamerica' for Pacific/Johnston. diff --git a/data/europe b/data/europe index 553735e5..f9a33921 100644 --- a/data/europe +++ b/data/europe @@ -2963,7 +2963,11 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880 # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT +# From Alexander Krivenyshev (2014-03-17): +# time change at 2:00 (2am) on March 30, 2014 +# http://vz.ru/news/2014/3/17/677464.html + 2:00 EU EE%sT 2014 Mar 30 2:00 + 4:00 - MSK # Vatican City # See Europe/Rome. diff --git a/data/zone.tab b/data/zone.tab index fa4df5f6..923d6ac5 100644 --- a/data/zone.tab +++ b/data/zone.tab @@ -51,6 +51,7 @@ AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) @@ -343,6 +344,7 @@ RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia +RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk @@ -398,7 +400,6 @@ TZ -0648+03917 Africa/Dar_es_Salaam UA +5026+03031 Europe/Kiev most locations UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk -UA +4457+03406 Europe/Simferopol central Crimea UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands diff --git a/lib/tzinfo/data/definitions/Antarctica/Troll.rb b/lib/tzinfo/data/definitions/Antarctica/Troll.rb new file mode 100644 index 00000000..e41ce58f --- /dev/null +++ b/lib/tzinfo/data/definitions/Antarctica/Troll.rb @@ -0,0 +1,144 @@ +# encoding: UTF-8 + +# This file contains data derived from the IANA Time Zone Database +# (http://www.iana.org/time-zones). + +module TZInfo + module Data + module Definitions + module Antarctica + module Troll + include TimezoneDefinition + + timezone 'Antarctica/Troll' do |tz| + tz.offset :o0, 0, 0, :zzz + tz.offset :o1, 0, 0, :UTC + tz.offset :o2, 0, 7200, :CEST + + tz.transition 2005, 2, :o1, 1108166400 + tz.transition 2005, 3, :o2, 1111885200 + tz.transition 2005, 10, :o1, 1130634000 + tz.transition 2006, 3, :o2, 1143334800 + tz.transition 2006, 10, :o1, 1162083600 + tz.transition 2007, 3, :o2, 1174784400 + tz.transition 2007, 10, :o1, 1193533200 + tz.transition 2008, 3, :o2, 1206838800 + tz.transition 2008, 10, :o1, 1224982800 + tz.transition 2009, 3, :o2, 1238288400 + tz.transition 2009, 10, :o1, 1256432400 + tz.transition 2010, 3, :o2, 1269738000 + tz.transition 2010, 10, :o1, 1288486800 + tz.transition 2011, 3, :o2, 1301187600 + tz.transition 2011, 10, :o1, 1319936400 + tz.transition 2012, 3, :o2, 1332637200 + tz.transition 2012, 10, :o1, 1351386000 + tz.transition 2013, 3, :o2, 1364691600 + tz.transition 2013, 10, :o1, 1382835600 + tz.transition 2014, 3, :o2, 1396141200 + tz.transition 2014, 10, :o1, 1414285200 + tz.transition 2015, 3, :o2, 1427590800 + tz.transition 2015, 10, :o1, 1445734800 + tz.transition 2016, 3, :o2, 1459040400 + tz.transition 2016, 10, :o1, 1477789200 + tz.transition 2017, 3, :o2, 1490490000 + tz.transition 2017, 10, :o1, 1509238800 + tz.transition 2018, 3, :o2, 1521939600 + tz.transition 2018, 10, :o1, 1540688400 + tz.transition 2019, 3, :o2, 1553994000 + tz.transition 2019, 10, :o1, 1572138000 + tz.transition 2020, 3, :o2, 1585443600 + tz.transition 2020, 10, :o1, 1603587600 + tz.transition 2021, 3, :o2, 1616893200 + tz.transition 2021, 10, :o1, 1635642000 + tz.transition 2022, 3, :o2, 1648342800 + tz.transition 2022, 10, :o1, 1667091600 + tz.transition 2023, 3, :o2, 1679792400 + tz.transition 2023, 10, :o1, 1698541200 + tz.transition 2024, 3, :o2, 1711846800 + tz.transition 2024, 10, :o1, 1729990800 + tz.transition 2025, 3, :o2, 1743296400 + tz.transition 2025, 10, :o1, 1761440400 + tz.transition 2026, 3, :o2, 1774746000 + tz.transition 2026, 10, :o1, 1792890000 + tz.transition 2027, 3, :o2, 1806195600 + tz.transition 2027, 10, :o1, 1824944400 + tz.transition 2028, 3, :o2, 1837645200 + tz.transition 2028, 10, :o1, 1856394000 + tz.transition 2029, 3, :o2, 1869094800 + tz.transition 2029, 10, :o1, 1887843600 + tz.transition 2030, 3, :o2, 1901149200 + tz.transition 2030, 10, :o1, 1919293200 + tz.transition 2031, 3, :o2, 1932598800 + tz.transition 2031, 10, :o1, 1950742800 + tz.transition 2032, 3, :o2, 1964048400 + tz.transition 2032, 10, :o1, 1982797200 + tz.transition 2033, 3, :o2, 1995498000 + tz.transition 2033, 10, :o1, 2014246800 + tz.transition 2034, 3, :o2, 2026947600 + tz.transition 2034, 10, :o1, 2045696400 + tz.transition 2035, 3, :o2, 2058397200 + tz.transition 2035, 10, :o1, 2077146000 + tz.transition 2036, 3, :o2, 2090451600 + tz.transition 2036, 10, :o1, 2108595600 + tz.transition 2037, 3, :o2, 2121901200 + tz.transition 2037, 10, :o1, 2140045200 + tz.transition 2038, 3, :o2, 2153350800, 59172253, 24 + tz.transition 2038, 10, :o1, 2172099600, 59177461, 24 + tz.transition 2039, 3, :o2, 2184800400, 59180989, 24 + tz.transition 2039, 10, :o1, 2203549200, 59186197, 24 + tz.transition 2040, 3, :o2, 2216250000, 59189725, 24 + tz.transition 2040, 10, :o1, 2234998800, 59194933, 24 + tz.transition 2041, 3, :o2, 2248304400, 59198629, 24 + tz.transition 2041, 10, :o1, 2266448400, 59203669, 24 + tz.transition 2042, 3, :o2, 2279754000, 59207365, 24 + tz.transition 2042, 10, :o1, 2297898000, 59212405, 24 + tz.transition 2043, 3, :o2, 2311203600, 59216101, 24 + tz.transition 2043, 10, :o1, 2329347600, 59221141, 24 + tz.transition 2044, 3, :o2, 2342653200, 59224837, 24 + tz.transition 2044, 10, :o1, 2361402000, 59230045, 24 + tz.transition 2045, 3, :o2, 2374102800, 59233573, 24 + tz.transition 2045, 10, :o1, 2392851600, 59238781, 24 + tz.transition 2046, 3, :o2, 2405552400, 59242309, 24 + tz.transition 2046, 10, :o1, 2424301200, 59247517, 24 + tz.transition 2047, 3, :o2, 2437606800, 59251213, 24 + tz.transition 2047, 10, :o1, 2455750800, 59256253, 24 + tz.transition 2048, 3, :o2, 2469056400, 59259949, 24 + tz.transition 2048, 10, :o1, 2487200400, 59264989, 24 + tz.transition 2049, 3, :o2, 2500506000, 59268685, 24 + tz.transition 2049, 10, :o1, 2519254800, 59273893, 24 + tz.transition 2050, 3, :o2, 2531955600, 59277421, 24 + tz.transition 2050, 10, :o1, 2550704400, 59282629, 24 + tz.transition 2051, 3, :o2, 2563405200, 59286157, 24 + tz.transition 2051, 10, :o1, 2582154000, 59291365, 24 + tz.transition 2052, 3, :o2, 2595459600, 59295061, 24 + tz.transition 2052, 10, :o1, 2613603600, 59300101, 24 + tz.transition 2053, 3, :o2, 2626909200, 59303797, 24 + tz.transition 2053, 10, :o1, 2645053200, 59308837, 24 + tz.transition 2054, 3, :o2, 2658358800, 59312533, 24 + tz.transition 2054, 10, :o1, 2676502800, 59317573, 24 + tz.transition 2055, 3, :o2, 2689808400, 59321269, 24 + tz.transition 2055, 10, :o1, 2708557200, 59326477, 24 + tz.transition 2056, 3, :o2, 2721258000, 59330005, 24 + tz.transition 2056, 10, :o1, 2740006800, 59335213, 24 + tz.transition 2057, 3, :o2, 2752707600, 59338741, 24 + tz.transition 2057, 10, :o1, 2771456400, 59343949, 24 + tz.transition 2058, 3, :o2, 2784762000, 59347645, 24 + tz.transition 2058, 10, :o1, 2802906000, 59352685, 24 + tz.transition 2059, 3, :o2, 2816211600, 59356381, 24 + tz.transition 2059, 10, :o1, 2834355600, 59361421, 24 + tz.transition 2060, 3, :o2, 2847661200, 59365117, 24 + tz.transition 2060, 10, :o1, 2866410000, 59370325, 24 + tz.transition 2061, 3, :o2, 2879110800, 59373853, 24 + tz.transition 2061, 10, :o1, 2897859600, 59379061, 24 + tz.transition 2062, 3, :o2, 2910560400, 59382589, 24 + tz.transition 2062, 10, :o1, 2929309200, 59387797, 24 + tz.transition 2063, 3, :o2, 2942010000, 59391325, 24 + tz.transition 2063, 10, :o1, 2960758800, 59396533, 24 + tz.transition 2064, 3, :o2, 2974064400, 59400229, 24 + tz.transition 2064, 10, :o1, 2992208400, 59405269, 24 + end + end + end + end + end +end diff --git a/lib/tzinfo/data/definitions/Europe/Simferopol.rb b/lib/tzinfo/data/definitions/Europe/Simferopol.rb index 9791464f..9dd59f63 100644 --- a/lib/tzinfo/data/definitions/Europe/Simferopol.rb +++ b/lib/tzinfo/data/definitions/Europe/Simferopol.rb @@ -19,6 +19,7 @@ module Simferopol tz.offset :o5, 3600, 0, :CET tz.offset :o6, 10800, 3600, :MSD tz.offset :o7, 7200, 3600, :EEST + tz.offset :o8, 14400, 0, :MSK tz.transition 1879, 12, :o1, -2840148984, 8667775459, 3600 tz.transition 1924, 5, :o2, -1441160160, 436303333, 180 @@ -93,108 +94,7 @@ module Simferopol tz.transition 2012, 10, :o2, 1351386000 tz.transition 2013, 3, :o7, 1364691600 tz.transition 2013, 10, :o2, 1382835600 - tz.transition 2014, 3, :o7, 1396141200 - tz.transition 2014, 10, :o2, 1414285200 - tz.transition 2015, 3, :o7, 1427590800 - tz.transition 2015, 10, :o2, 1445734800 - tz.transition 2016, 3, :o7, 1459040400 - tz.transition 2016, 10, :o2, 1477789200 - tz.transition 2017, 3, :o7, 1490490000 - tz.transition 2017, 10, :o2, 1509238800 - tz.transition 2018, 3, :o7, 1521939600 - tz.transition 2018, 10, :o2, 1540688400 - tz.transition 2019, 3, :o7, 1553994000 - tz.transition 2019, 10, :o2, 1572138000 - tz.transition 2020, 3, :o7, 1585443600 - tz.transition 2020, 10, :o2, 1603587600 - tz.transition 2021, 3, :o7, 1616893200 - tz.transition 2021, 10, :o2, 1635642000 - tz.transition 2022, 3, :o7, 1648342800 - tz.transition 2022, 10, :o2, 1667091600 - tz.transition 2023, 3, :o7, 1679792400 - tz.transition 2023, 10, :o2, 1698541200 - tz.transition 2024, 3, :o7, 1711846800 - tz.transition 2024, 10, :o2, 1729990800 - tz.transition 2025, 3, :o7, 1743296400 - tz.transition 2025, 10, :o2, 1761440400 - tz.transition 2026, 3, :o7, 1774746000 - tz.transition 2026, 10, :o2, 1792890000 - tz.transition 2027, 3, :o7, 1806195600 - tz.transition 2027, 10, :o2, 1824944400 - tz.transition 2028, 3, :o7, 1837645200 - tz.transition 2028, 10, :o2, 1856394000 - tz.transition 2029, 3, :o7, 1869094800 - tz.transition 2029, 10, :o2, 1887843600 - tz.transition 2030, 3, :o7, 1901149200 - tz.transition 2030, 10, :o2, 1919293200 - tz.transition 2031, 3, :o7, 1932598800 - tz.transition 2031, 10, :o2, 1950742800 - tz.transition 2032, 3, :o7, 1964048400 - tz.transition 2032, 10, :o2, 1982797200 - tz.transition 2033, 3, :o7, 1995498000 - tz.transition 2033, 10, :o2, 2014246800 - tz.transition 2034, 3, :o7, 2026947600 - tz.transition 2034, 10, :o2, 2045696400 - tz.transition 2035, 3, :o7, 2058397200 - tz.transition 2035, 10, :o2, 2077146000 - tz.transition 2036, 3, :o7, 2090451600 - tz.transition 2036, 10, :o2, 2108595600 - tz.transition 2037, 3, :o7, 2121901200 - tz.transition 2037, 10, :o2, 2140045200 - tz.transition 2038, 3, :o7, 2153350800, 59172253, 24 - tz.transition 2038, 10, :o2, 2172099600, 59177461, 24 - tz.transition 2039, 3, :o7, 2184800400, 59180989, 24 - tz.transition 2039, 10, :o2, 2203549200, 59186197, 24 - tz.transition 2040, 3, :o7, 2216250000, 59189725, 24 - tz.transition 2040, 10, :o2, 2234998800, 59194933, 24 - tz.transition 2041, 3, :o7, 2248304400, 59198629, 24 - tz.transition 2041, 10, :o2, 2266448400, 59203669, 24 - tz.transition 2042, 3, :o7, 2279754000, 59207365, 24 - tz.transition 2042, 10, :o2, 2297898000, 59212405, 24 - tz.transition 2043, 3, :o7, 2311203600, 59216101, 24 - tz.transition 2043, 10, :o2, 2329347600, 59221141, 24 - tz.transition 2044, 3, :o7, 2342653200, 59224837, 24 - tz.transition 2044, 10, :o2, 2361402000, 59230045, 24 - tz.transition 2045, 3, :o7, 2374102800, 59233573, 24 - tz.transition 2045, 10, :o2, 2392851600, 59238781, 24 - tz.transition 2046, 3, :o7, 2405552400, 59242309, 24 - tz.transition 2046, 10, :o2, 2424301200, 59247517, 24 - tz.transition 2047, 3, :o7, 2437606800, 59251213, 24 - tz.transition 2047, 10, :o2, 2455750800, 59256253, 24 - tz.transition 2048, 3, :o7, 2469056400, 59259949, 24 - tz.transition 2048, 10, :o2, 2487200400, 59264989, 24 - tz.transition 2049, 3, :o7, 2500506000, 59268685, 24 - tz.transition 2049, 10, :o2, 2519254800, 59273893, 24 - tz.transition 2050, 3, :o7, 2531955600, 59277421, 24 - tz.transition 2050, 10, :o2, 2550704400, 59282629, 24 - tz.transition 2051, 3, :o7, 2563405200, 59286157, 24 - tz.transition 2051, 10, :o2, 2582154000, 59291365, 24 - tz.transition 2052, 3, :o7, 2595459600, 59295061, 24 - tz.transition 2052, 10, :o2, 2613603600, 59300101, 24 - tz.transition 2053, 3, :o7, 2626909200, 59303797, 24 - tz.transition 2053, 10, :o2, 2645053200, 59308837, 24 - tz.transition 2054, 3, :o7, 2658358800, 59312533, 24 - tz.transition 2054, 10, :o2, 2676502800, 59317573, 24 - tz.transition 2055, 3, :o7, 2689808400, 59321269, 24 - tz.transition 2055, 10, :o2, 2708557200, 59326477, 24 - tz.transition 2056, 3, :o7, 2721258000, 59330005, 24 - tz.transition 2056, 10, :o2, 2740006800, 59335213, 24 - tz.transition 2057, 3, :o7, 2752707600, 59338741, 24 - tz.transition 2057, 10, :o2, 2771456400, 59343949, 24 - tz.transition 2058, 3, :o7, 2784762000, 59347645, 24 - tz.transition 2058, 10, :o2, 2802906000, 59352685, 24 - tz.transition 2059, 3, :o7, 2816211600, 59356381, 24 - tz.transition 2059, 10, :o2, 2834355600, 59361421, 24 - tz.transition 2060, 3, :o7, 2847661200, 59365117, 24 - tz.transition 2060, 10, :o2, 2866410000, 59370325, 24 - tz.transition 2061, 3, :o7, 2879110800, 59373853, 24 - tz.transition 2061, 10, :o2, 2897859600, 59379061, 24 - tz.transition 2062, 3, :o7, 2910560400, 59382589, 24 - tz.transition 2062, 10, :o2, 2929309200, 59387797, 24 - tz.transition 2063, 3, :o7, 2942010000, 59391325, 24 - tz.transition 2063, 10, :o2, 2960758800, 59396533, 24 - tz.transition 2064, 3, :o7, 2974064400, 59400229, 24 - tz.transition 2064, 10, :o2, 2992208400, 59405269, 24 + tz.transition 2014, 3, :o8, 1396137600 end end end diff --git a/lib/tzinfo/data/indexes/countries.rb b/lib/tzinfo/data/indexes/countries.rb index 9f5906ee..31c983c7 100644 --- a/lib/tzinfo/data/indexes/countries.rb +++ b/lib/tzinfo/data/indexes/countries.rb @@ -43,6 +43,7 @@ module Countries c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, Lake Vostok' c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Station, Terre Adelie' c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I' + c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll Station, Queen Maud Land' end country 'AR', 'Argentina' do |c| c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)' @@ -697,6 +698,7 @@ module Countries c.timezone 'Europe/Moscow', 223, 4, 451, 12, 'Moscow+00 - west Russia' c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'Moscow+00 - Caspian Sea' c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'Moscow+00 - Samara, Udmurtia' + c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Moscow+00 - Crimea' c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'Moscow+02 - Urals' c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'Moscow+03 - west Siberia' c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'Moscow+03 - Novosibirsk' @@ -830,7 +832,6 @@ module Countries c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'most locations' c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia' c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye, E Lugansk / Zaporizhia, E Luhansk' - c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'central Crimea' end country 'UG', 'Uganda' do |c| c.timezone 'Africa/Kampala', 19, 60, 389, 12 diff --git a/lib/tzinfo/data/indexes/timezones.rb b/lib/tzinfo/data/indexes/timezones.rb index fb72c830..df189fd1 100644 --- a/lib/tzinfo/data/indexes/timezones.rb +++ b/lib/tzinfo/data/indexes/timezones.rb @@ -237,6 +237,7 @@ module Timezones timezone 'Antarctica/Rothera' linked_timezone 'Antarctica/South_Pole' timezone 'Antarctica/Syowa' + timezone 'Antarctica/Troll' timezone 'Antarctica/Vostok' linked_timezone 'Arctic/Longyearbyen' timezone 'Asia/Aden' diff --git a/lib/tzinfo/data/version.rb b/lib/tzinfo/data/version.rb index 06def322..99cbd6b1 100644 --- a/lib/tzinfo/data/version.rb +++ b/lib/tzinfo/data/version.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2012-2013 Philip Ross +# Copyright (c) 2012-2014 Philip Ross # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -31,7 +31,7 @@ module Version # The version of the {IANA Time Zone Database}[http://www.iana.org/time-zones] # used to generate this version of TZInfo::Data. - TZDATA = '2014a' + TZDATA = '2014b' end end end diff --git a/tzinfo-data.gemspec b/tzinfo-data.gemspec index 4f2650ae..1d8810f0 100644 --- a/tzinfo-data.gemspec +++ b/tzinfo-data.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'tzinfo-data' - s.version = '1.2014.1' + s.version = '1.2014.2' s.summary = 'Timezone Data for TZInfo' s.description = 'TZInfo::Data contains data from the IANA Time Zone database packaged as Ruby modules for use with TZInfo.' s.author = 'Philip Ross'