Skip to content

Commit

Permalink
Update to tzdata version 2014b.
Browse files Browse the repository at this point in the history
  • Loading branch information
philr committed Mar 25, 2014
1 parent 30aeff6 commit 2cf719d
Show file tree
Hide file tree
Showing 12 changed files with 211 additions and 125 deletions.
2 changes: 1 addition & 1 deletion data/SOURCE
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 4 additions & 1 deletion data/africa
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
41 changes: 29 additions & 12 deletions data/antarctica
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 18 additions & 3 deletions data/australasia
Original file line number Diff line number Diff line change
Expand Up @@ -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
# <http://www.315bw.org/Herb_Bach.htm> (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
# <http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf>.
# 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.

Expand Down
6 changes: 5 additions & 1 deletion data/europe
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion data/zone.tab
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
144 changes: 144 additions & 0 deletions lib/tzinfo/data/definitions/Antarctica/Troll.rb
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 2cf719d

Please sign in to comment.