From c4e0cf91a672d5b5100b9a3a2ab7f26ab5a01fa1 Mon Sep 17 00:00:00 2001 From: Phil Ross Date: Sun, 14 Jun 2015 12:36:34 +0100 Subject: [PATCH] Update to tzdata version 2015e. http://mm.icann.org/pipermail/tz-announce/2015-June/000032.html --- data/NEWS | 29 +++++ data/SOURCE | 2 +- data/africa | 88 ++++++++------ data/backzone | 5 - data/iso3166.tab | 11 +- data/northamerica | 13 ++- data/southamerica | 2 +- data/zone1970.tab | 3 +- .../data/definitions/Africa/Casablanca.rb | 44 ++++--- .../data/definitions/Africa/El_Aaiun.rb | 44 ++++--- lib/tzinfo/data/definitions/America/Cayman.rb | 110 +++++++++++++++++- lib/tzinfo/data/indexes/countries.rb | 8 +- lib/tzinfo/data/indexes/timezones.rb | 2 +- lib/tzinfo/data/version.rb | 4 +- 14 files changed, 261 insertions(+), 104 deletions(-) diff --git a/data/NEWS b/data/NEWS index c14df787..7b0e0b54 100644 --- a/data/NEWS +++ b/data/NEWS @@ -1,5 +1,34 @@ News for the tz database + +Release 2015e - 2015-06-13 10:56:02 -0700 + + Changes affecting future time stamps + + Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, + not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.) + + Assume Cayman Islands will observe DST starting next year, using US rules. + Although it isn't guaranteed, it is the most likely. + + Changes affecting data format + + The file 'iso3166.tab' now uses UTF-8, so that its entries can better + spell the names of Åland Islands, Côte d'Ivoire, and Réunion. + + Changes affecting code + + When displaying data, tzselect converts it to the current locale's + encoding if the iconv command works. (Problem reported by random832.) + + tzselect no longer mishandles Dominica, fixing a bug introduced + in Release 2014f. (Problem reported by Owen Leibman.) + + zic -l no longer fails when compiled with -DTZDEFAULT=\"/etc/localtime\". + This fixes a bug introduced in Release 2014f. + (Problem reported by Leonardo Chiquitto.) + + Release 2015d - 2015-04-24 08:09:46 -0700 Changes affecting future time stamps diff --git a/data/SOURCE b/data/SOURCE index 8df33a84..a629db29 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 2015d. +http://www.iana.org/time-zones, version 2015e. diff --git a/data/africa b/data/africa index ea0171a0..5ad47e36 100644 --- a/data/africa +++ b/data/africa @@ -338,9 +338,10 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # time this summer, and carry out studies on the possibility of canceling the # practice altogether in future years." # -# From Paul Eggert (2015-04-20): -# For now, assume DST will be canceled. Any resumption would likely -# use different rules anyway. +# From Paul Eggert (2015-04-24): +# Yesterday the office of Egyptian President El-Sisi announced his +# decision to abandon DST permanently. See Ahram Online 2015-04-24. +# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - @@ -787,20 +788,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # will resume again at 02:00 on Saturday, August 2, 2014.... # http://www.mmsp.gov.ma/fr/actualites.aspx?id=586 -# From Paul Eggert (2014-06-05): -# For now, guess that later spring and fall transitions will use 2014's rules, +# From Milamber (2015-06-08): +# (Google Translation) The hour will thus be delayed 60 minutes +# Sunday, June 14 at 3:00, the ministry said in a statement, adding +# that the time will be advanced again 60 minutes Sunday, July 19, +# 2015 at 2:00. The move comes under 2.12.126 Decree of 26 Jumada I +# 1433 (18 April 2012) and the decision of the Head of Government of +# 16 N. 3-29-15 Chaaban 1435 (4 June 2015). +# Source (french): +# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# +# From Milamber (2015-06-09): +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 +# +# From Michael Deckers (2015-06-09): +# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go +# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch.... +# I think the patch is correct and the quoted text is wrong; the text in +# agrees +# with the patch. + +# From Paul Eggert (2015-06-08): +# For now, guess that later spring and fall transitions will use 2015's rules, # and guess that Morocco will switch to standard time at 03:00 the last -# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after -# Ramadan. To implement this, transition dates for 2015 through 2037 were +# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after +# Ramadan. To implement this, transition dates for 2016 through 2037 were # determined by running the following program under GNU Emacs 24.3, with the # results integrated by hand into the table below. -# (let ((islamic-year 1436)) +# (let ((islamic-year 1437)) +# (require 'cal-islam) # (while (< islamic-year 1460) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) # (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (saturday 6)) -# (while (/= saturday (mod (setq a (1- a)) 7))) -# (while (/= saturday (mod b 7)) +# (sunday 0)) +# (while (/= sunday (mod (setq a (1- a)) 7))) +# (while (/= sunday (mod b 7)) # (setq b (1+ b))) # (setq a (calendar-gregorian-from-absolute a)) # (setq b (calendar-gregorian-from-absolute b)) @@ -844,32 +866,30 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 S Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2013 max - Oct lastSun 3:00 0 - -Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S +Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S Rule Morocco 2014 only - Jun 28 3:00 0 - Rule Morocco 2014 only - Aug 2 2:00 1:00 S -Rule Morocco 2015 only - Jun 13 3:00 0 - -Rule Morocco 2015 only - Jul 18 2:00 1:00 S -Rule Morocco 2016 only - Jun 4 3:00 0 - -Rule Morocco 2016 only - Jul 9 2:00 1:00 S -Rule Morocco 2017 only - May 20 3:00 0 - -Rule Morocco 2017 only - Jul 1 2:00 1:00 S -Rule Morocco 2018 only - May 12 3:00 0 - -Rule Morocco 2018 only - Jun 16 2:00 1:00 S -Rule Morocco 2019 only - May 4 3:00 0 - -Rule Morocco 2019 only - Jun 8 2:00 1:00 S -Rule Morocco 2020 only - Apr 18 3:00 0 - -Rule Morocco 2020 only - May 30 2:00 1:00 S -Rule Morocco 2021 only - Apr 10 3:00 0 - -Rule Morocco 2021 only - May 15 2:00 1:00 S -Rule Morocco 2022 only - Apr 2 3:00 0 - -Rule Morocco 2022 only - May 7 2:00 1:00 S -Rule Morocco 2023 only - Apr 22 2:00 1:00 S -Rule Morocco 2024 only - Apr 13 2:00 1:00 S -Rule Morocco 2025 only - Apr 5 2:00 1:00 S +Rule Morocco 2015 only - Jun 14 3:00 0 - +Rule Morocco 2015 only - Jul 19 2:00 1:00 S +Rule Morocco 2016 only - Jun 5 3:00 0 - +Rule Morocco 2016 only - Jul 10 2:00 1:00 S +Rule Morocco 2017 only - May 21 3:00 0 - +Rule Morocco 2017 only - Jul 2 2:00 1:00 S +Rule Morocco 2018 only - May 13 3:00 0 - +Rule Morocco 2018 only - Jun 17 2:00 1:00 S +Rule Morocco 2019 only - May 5 3:00 0 - +Rule Morocco 2019 only - Jun 9 2:00 1:00 S +Rule Morocco 2020 only - Apr 19 3:00 0 - +Rule Morocco 2020 only - May 24 2:00 1:00 S +Rule Morocco 2021 only - Apr 11 3:00 0 - +Rule Morocco 2021 only - May 16 2:00 1:00 S +Rule Morocco 2022 only - May 8 2:00 1:00 S +Rule Morocco 2023 only - Apr 23 2:00 1:00 S +Rule Morocco 2024 only - Apr 14 2:00 1:00 S +Rule Morocco 2025 only - Apr 6 2:00 1:00 S Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S -Rule Morocco 2035 only - Oct 27 3:00 0 - -Rule Morocco 2036 only - Oct 18 3:00 0 - -Rule Morocco 2037 only - Oct 10 3:00 0 - +Rule Morocco 2036 only - Oct 19 3:00 0 - +Rule Morocco 2037 only - Oct 4 3:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 diff --git a/data/backzone b/data/backzone index 6b392bde..0316708f 100644 --- a/data/backzone +++ b/data/backzone @@ -279,11 +279,6 @@ Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad -4:30 - ANT 1965 # Netherlands Antilles Time -4:00 - AST -# Cayman Is -Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown - -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST - # Canada Zone America/Coral_Harbour -5:32:40 - LMT 1884 -5:00 NT_YK E%sT 1946 diff --git a/data/iso3166.tab b/data/iso3166.tab index 0b0b8426..0548800e 100644 --- a/data/iso3166.tab +++ b/data/iso3166.tab @@ -3,11 +3,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2014-07-18): +# From Paul Eggert (2015-05-02): # This file contains a table of two-letter country codes. Columns are # separated by a single tab. Lines beginning with '#' are comments. -# Although all text currently uses ASCII encoding, this is planned to -# change to UTF-8 soon. The columns of the table are as follows: +# All text uses UTF-8 encoding. The columns of the table are as follows: # # 1. ISO 3166-1 alpha-2 country code, current as of # ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166 @@ -38,7 +37,7 @@ AS Samoa (American) AT Austria AU Australia AW Aruba -AX Aaland Islands +AX Åland Islands AZ Azerbaijan BA Bosnia & Herzegovina BB Barbados @@ -67,7 +66,7 @@ CD Congo (Dem. Rep.) CF Central African Rep. CG Congo (Rep.) CH Switzerland -CI Cote d'Ivoire +CI Côte d'Ivoire CK Cook Islands CL Chile CM Cameroon @@ -211,7 +210,7 @@ PT Portugal PW Palau PY Paraguay QA Qatar -RE Reunion +RE Réunion RO Romania RS Serbia RU Russia diff --git a/data/northamerica b/data/northamerica index c3af9eb3..88423e61 100644 --- a/data/northamerica +++ b/data/northamerica @@ -2661,7 +2661,17 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton -4:00 US A%sT # Cayman Is -# See America/Panama. + +# From Paul Eggert (2015-05-15): +# The Cayman government has decided to introduce DST in 2016, the idea being +# to keep in sync with New York. The legislation hasn't passed but the change +# seems quite likely. See: Meade B. Cayman 27. +# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman + +Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown + -5:07:11 - KMT 1912 Feb # Kingston Mean Time + -5:00 - EST 2016 + -5:00 US E%sT # Costa Rica @@ -3184,7 +3194,6 @@ Zone America/Managua -5:45:08 - LMT 1890 Zone America/Panama -5:18:08 - LMT 1890 -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time -5:00 - EST -Link America/Panama America/Cayman # Puerto Rico # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. diff --git a/data/southamerica b/data/southamerica index be63a88d..6bbc2c8f 100644 --- a/data/southamerica +++ b/data/southamerica @@ -30,7 +30,7 @@ # I suggest the use of _Summer time_ instead of the more cumbersome # _daylight-saving time_. _Summer time_ seems to be in general use # in Europe and South America. -# -- E O Cutler, _New York Times_ (1937-02-14), quoted in +# -- E O Cutler, _New York Times_ (1937-02-14), quoted in # H L Mencken, _The American Language: Supplement I_ (1960), p 466 # # Earlier editions of these tables also used the North American style diff --git a/data/zone1970.tab b/data/zone1970.tab index 5da0200b..2689c001 100644 --- a/data/zone1970.tab +++ b/data/zone1970.tab @@ -206,6 +206,7 @@ KI -0308-17105 Pacific/Enderbury Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul +KY +1918-08123 America/Cayman KZ +4315+07657 Asia/Almaty most locations KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) @@ -259,7 +260,7 @@ NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue NZ,AQ -3652+17446 Pacific/Auckland New Zealand time NZ -4357-17633 Pacific/Chatham Chatham Islands -PA,KY +0858-07932 America/Panama +PA +0858-07932 America/Panama PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands diff --git a/lib/tzinfo/data/definitions/Africa/Casablanca.rb b/lib/tzinfo/data/definitions/Africa/Casablanca.rb index 280d8ff6..3166b013 100644 --- a/lib/tzinfo/data/definitions/Africa/Casablanca.rb +++ b/lib/tzinfo/data/definitions/Africa/Casablanca.rb @@ -56,42 +56,40 @@ module Casablanca tz.transition 2014, 8, :o2, 1406944800 tz.transition 2014, 10, :o1, 1414288800 tz.transition 2015, 3, :o2, 1427594400 - tz.transition 2015, 6, :o1, 1434160800 - tz.transition 2015, 7, :o2, 1437184800 + tz.transition 2015, 6, :o1, 1434247200 + tz.transition 2015, 7, :o2, 1437271200 tz.transition 2015, 10, :o1, 1445738400 tz.transition 2016, 3, :o2, 1459044000 - tz.transition 2016, 6, :o1, 1465005600 - tz.transition 2016, 7, :o2, 1468029600 + tz.transition 2016, 6, :o1, 1465092000 + tz.transition 2016, 7, :o2, 1468116000 tz.transition 2016, 10, :o1, 1477792800 tz.transition 2017, 3, :o2, 1490493600 - tz.transition 2017, 5, :o1, 1495245600 - tz.transition 2017, 7, :o2, 1498874400 + tz.transition 2017, 5, :o1, 1495332000 + tz.transition 2017, 7, :o2, 1498960800 tz.transition 2017, 10, :o1, 1509242400 tz.transition 2018, 3, :o2, 1521943200 - tz.transition 2018, 5, :o1, 1526090400 - tz.transition 2018, 6, :o2, 1529114400 + tz.transition 2018, 5, :o1, 1526176800 + tz.transition 2018, 6, :o2, 1529200800 tz.transition 2018, 10, :o1, 1540692000 tz.transition 2019, 3, :o2, 1553997600 - tz.transition 2019, 5, :o1, 1556935200 - tz.transition 2019, 6, :o2, 1559959200 + tz.transition 2019, 5, :o1, 1557021600 + tz.transition 2019, 6, :o2, 1560045600 tz.transition 2019, 10, :o1, 1572141600 tz.transition 2020, 3, :o2, 1585447200 - tz.transition 2020, 4, :o1, 1587175200 - tz.transition 2020, 5, :o2, 1590804000 + tz.transition 2020, 4, :o1, 1587261600 + tz.transition 2020, 5, :o2, 1590285600 tz.transition 2020, 10, :o1, 1603591200 tz.transition 2021, 3, :o2, 1616896800 - tz.transition 2021, 4, :o1, 1618020000 - tz.transition 2021, 5, :o2, 1621044000 + tz.transition 2021, 4, :o1, 1618106400 + tz.transition 2021, 5, :o2, 1621130400 tz.transition 2021, 10, :o1, 1635645600 - tz.transition 2022, 3, :o2, 1648346400 - tz.transition 2022, 4, :o1, 1648864800 - tz.transition 2022, 5, :o2, 1651888800 + tz.transition 2022, 5, :o2, 1651975200 tz.transition 2022, 10, :o1, 1667095200 - tz.transition 2023, 4, :o2, 1682128800 + tz.transition 2023, 4, :o2, 1682215200 tz.transition 2023, 10, :o1, 1698544800 - tz.transition 2024, 4, :o2, 1712973600 + tz.transition 2024, 4, :o2, 1713060000 tz.transition 2024, 10, :o1, 1729994400 - tz.transition 2025, 4, :o2, 1743818400 + tz.transition 2025, 4, :o2, 1743904800 tz.transition 2025, 10, :o1, 1761444000 tz.transition 2026, 3, :o2, 1774749600 tz.transition 2026, 10, :o1, 1792893600 @@ -112,11 +110,11 @@ module Casablanca tz.transition 2034, 3, :o2, 2026951200 tz.transition 2034, 10, :o1, 2045700000 tz.transition 2035, 3, :o2, 2058400800 - tz.transition 2035, 10, :o1, 2077063200 + tz.transition 2035, 10, :o1, 2077149600 tz.transition 2036, 3, :o2, 2090455200 - tz.transition 2036, 10, :o1, 2107908000 + tz.transition 2036, 10, :o1, 2107994400 tz.transition 2037, 3, :o2, 2121904800 - tz.transition 2037, 10, :o1, 2138752800 + tz.transition 2037, 10, :o1, 2138234400 tz.transition 2038, 3, :o2, 2153354400, 29586127, 12 tz.transition 2038, 10, :o1, 2172103200, 29588731, 12 tz.transition 2039, 3, :o2, 2184804000, 29590495, 12 diff --git a/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb b/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb index 177251a7..e13afaf0 100644 --- a/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb +++ b/lib/tzinfo/data/definitions/Africa/El_Aaiun.rb @@ -45,42 +45,40 @@ module El_Aaiun tz.transition 2014, 8, :o3, 1406944800 tz.transition 2014, 10, :o2, 1414288800 tz.transition 2015, 3, :o3, 1427594400 - tz.transition 2015, 6, :o2, 1434160800 - tz.transition 2015, 7, :o3, 1437184800 + tz.transition 2015, 6, :o2, 1434247200 + tz.transition 2015, 7, :o3, 1437271200 tz.transition 2015, 10, :o2, 1445738400 tz.transition 2016, 3, :o3, 1459044000 - tz.transition 2016, 6, :o2, 1465005600 - tz.transition 2016, 7, :o3, 1468029600 + tz.transition 2016, 6, :o2, 1465092000 + tz.transition 2016, 7, :o3, 1468116000 tz.transition 2016, 10, :o2, 1477792800 tz.transition 2017, 3, :o3, 1490493600 - tz.transition 2017, 5, :o2, 1495245600 - tz.transition 2017, 7, :o3, 1498874400 + tz.transition 2017, 5, :o2, 1495332000 + tz.transition 2017, 7, :o3, 1498960800 tz.transition 2017, 10, :o2, 1509242400 tz.transition 2018, 3, :o3, 1521943200 - tz.transition 2018, 5, :o2, 1526090400 - tz.transition 2018, 6, :o3, 1529114400 + tz.transition 2018, 5, :o2, 1526176800 + tz.transition 2018, 6, :o3, 1529200800 tz.transition 2018, 10, :o2, 1540692000 tz.transition 2019, 3, :o3, 1553997600 - tz.transition 2019, 5, :o2, 1556935200 - tz.transition 2019, 6, :o3, 1559959200 + tz.transition 2019, 5, :o2, 1557021600 + tz.transition 2019, 6, :o3, 1560045600 tz.transition 2019, 10, :o2, 1572141600 tz.transition 2020, 3, :o3, 1585447200 - tz.transition 2020, 4, :o2, 1587175200 - tz.transition 2020, 5, :o3, 1590804000 + tz.transition 2020, 4, :o2, 1587261600 + tz.transition 2020, 5, :o3, 1590285600 tz.transition 2020, 10, :o2, 1603591200 tz.transition 2021, 3, :o3, 1616896800 - tz.transition 2021, 4, :o2, 1618020000 - tz.transition 2021, 5, :o3, 1621044000 + tz.transition 2021, 4, :o2, 1618106400 + tz.transition 2021, 5, :o3, 1621130400 tz.transition 2021, 10, :o2, 1635645600 - tz.transition 2022, 3, :o3, 1648346400 - tz.transition 2022, 4, :o2, 1648864800 - tz.transition 2022, 5, :o3, 1651888800 + tz.transition 2022, 5, :o3, 1651975200 tz.transition 2022, 10, :o2, 1667095200 - tz.transition 2023, 4, :o3, 1682128800 + tz.transition 2023, 4, :o3, 1682215200 tz.transition 2023, 10, :o2, 1698544800 - tz.transition 2024, 4, :o3, 1712973600 + tz.transition 2024, 4, :o3, 1713060000 tz.transition 2024, 10, :o2, 1729994400 - tz.transition 2025, 4, :o3, 1743818400 + tz.transition 2025, 4, :o3, 1743904800 tz.transition 2025, 10, :o2, 1761444000 tz.transition 2026, 3, :o3, 1774749600 tz.transition 2026, 10, :o2, 1792893600 @@ -101,11 +99,11 @@ module El_Aaiun tz.transition 2034, 3, :o3, 2026951200 tz.transition 2034, 10, :o2, 2045700000 tz.transition 2035, 3, :o3, 2058400800 - tz.transition 2035, 10, :o2, 2077063200 + tz.transition 2035, 10, :o2, 2077149600 tz.transition 2036, 3, :o3, 2090455200 - tz.transition 2036, 10, :o2, 2107908000 + tz.transition 2036, 10, :o2, 2107994400 tz.transition 2037, 3, :o3, 2121904800 - tz.transition 2037, 10, :o2, 2138752800 + tz.transition 2037, 10, :o2, 2138234400 tz.transition 2038, 3, :o3, 2153354400, 29586127, 12 tz.transition 2038, 10, :o2, 2172103200, 29588731, 12 tz.transition 2039, 3, :o3, 2184804000, 29590495, 12 diff --git a/lib/tzinfo/data/definitions/America/Cayman.rb b/lib/tzinfo/data/definitions/America/Cayman.rb index 07e82d74..298c3e1b 100644 --- a/lib/tzinfo/data/definitions/America/Cayman.rb +++ b/lib/tzinfo/data/definitions/America/Cayman.rb @@ -10,7 +10,115 @@ module America module Cayman include TimezoneDefinition - linked_timezone 'America/Cayman', 'America/Panama' + timezone 'America/Cayman' do |tz| + tz.offset :o0, -19532, 0, :LMT + tz.offset :o1, -18431, 0, :KMT + tz.offset :o2, -18000, 0, :EST + tz.offset :o3, -18000, 3600, :EDT + + tz.transition 1890, 1, :o1, -2524502068, 52085564483, 21600 + tz.transition 1912, 2, :o2, -1827687169, 209039072831, 86400 + tz.transition 2016, 3, :o3, 1457852400 + tz.transition 2016, 11, :o2, 1478412000 + tz.transition 2017, 3, :o3, 1489302000 + tz.transition 2017, 11, :o2, 1509861600 + tz.transition 2018, 3, :o3, 1520751600 + tz.transition 2018, 11, :o2, 1541311200 + tz.transition 2019, 3, :o3, 1552201200 + tz.transition 2019, 11, :o2, 1572760800 + tz.transition 2020, 3, :o3, 1583650800 + tz.transition 2020, 11, :o2, 1604210400 + tz.transition 2021, 3, :o3, 1615705200 + tz.transition 2021, 11, :o2, 1636264800 + tz.transition 2022, 3, :o3, 1647154800 + tz.transition 2022, 11, :o2, 1667714400 + tz.transition 2023, 3, :o3, 1678604400 + tz.transition 2023, 11, :o2, 1699164000 + tz.transition 2024, 3, :o3, 1710054000 + tz.transition 2024, 11, :o2, 1730613600 + tz.transition 2025, 3, :o3, 1741503600 + tz.transition 2025, 11, :o2, 1762063200 + tz.transition 2026, 3, :o3, 1772953200 + tz.transition 2026, 11, :o2, 1793512800 + tz.transition 2027, 3, :o3, 1805007600 + tz.transition 2027, 11, :o2, 1825567200 + tz.transition 2028, 3, :o3, 1836457200 + tz.transition 2028, 11, :o2, 1857016800 + tz.transition 2029, 3, :o3, 1867906800 + tz.transition 2029, 11, :o2, 1888466400 + tz.transition 2030, 3, :o3, 1899356400 + tz.transition 2030, 11, :o2, 1919916000 + tz.transition 2031, 3, :o3, 1930806000 + tz.transition 2031, 11, :o2, 1951365600 + tz.transition 2032, 3, :o3, 1962860400 + tz.transition 2032, 11, :o2, 1983420000 + tz.transition 2033, 3, :o3, 1994310000 + tz.transition 2033, 11, :o2, 2014869600 + tz.transition 2034, 3, :o3, 2025759600 + tz.transition 2034, 11, :o2, 2046319200 + tz.transition 2035, 3, :o3, 2057209200 + tz.transition 2035, 11, :o2, 2077768800 + tz.transition 2036, 3, :o3, 2088658800 + tz.transition 2036, 11, :o2, 2109218400 + tz.transition 2037, 3, :o3, 2120108400 + tz.transition 2037, 11, :o2, 2140668000 + tz.transition 2038, 3, :o3, 2152162800, 59171923, 24 + tz.transition 2038, 11, :o2, 2172722400, 9862939, 4 + tz.transition 2039, 3, :o3, 2183612400, 59180659, 24 + tz.transition 2039, 11, :o2, 2204172000, 9864395, 4 + tz.transition 2040, 3, :o3, 2215062000, 59189395, 24 + tz.transition 2040, 11, :o2, 2235621600, 9865851, 4 + tz.transition 2041, 3, :o3, 2246511600, 59198131, 24 + tz.transition 2041, 11, :o2, 2267071200, 9867307, 4 + tz.transition 2042, 3, :o3, 2277961200, 59206867, 24 + tz.transition 2042, 11, :o2, 2298520800, 9868763, 4 + tz.transition 2043, 3, :o3, 2309410800, 59215603, 24 + tz.transition 2043, 11, :o2, 2329970400, 9870219, 4 + tz.transition 2044, 3, :o3, 2341465200, 59224507, 24 + tz.transition 2044, 11, :o2, 2362024800, 9871703, 4 + tz.transition 2045, 3, :o3, 2372914800, 59233243, 24 + tz.transition 2045, 11, :o2, 2393474400, 9873159, 4 + tz.transition 2046, 3, :o3, 2404364400, 59241979, 24 + tz.transition 2046, 11, :o2, 2424924000, 9874615, 4 + tz.transition 2047, 3, :o3, 2435814000, 59250715, 24 + tz.transition 2047, 11, :o2, 2456373600, 9876071, 4 + tz.transition 2048, 3, :o3, 2467263600, 59259451, 24 + tz.transition 2048, 11, :o2, 2487823200, 9877527, 4 + tz.transition 2049, 3, :o3, 2499318000, 59268355, 24 + tz.transition 2049, 11, :o2, 2519877600, 9879011, 4 + tz.transition 2050, 3, :o3, 2530767600, 59277091, 24 + tz.transition 2050, 11, :o2, 2551327200, 9880467, 4 + tz.transition 2051, 3, :o3, 2562217200, 59285827, 24 + tz.transition 2051, 11, :o2, 2582776800, 9881923, 4 + tz.transition 2052, 3, :o3, 2593666800, 59294563, 24 + tz.transition 2052, 11, :o2, 2614226400, 9883379, 4 + tz.transition 2053, 3, :o3, 2625116400, 59303299, 24 + tz.transition 2053, 11, :o2, 2645676000, 9884835, 4 + tz.transition 2054, 3, :o3, 2656566000, 59312035, 24 + tz.transition 2054, 11, :o2, 2677125600, 9886291, 4 + tz.transition 2055, 3, :o3, 2688620400, 59320939, 24 + tz.transition 2055, 11, :o2, 2709180000, 9887775, 4 + tz.transition 2056, 3, :o3, 2720070000, 59329675, 24 + tz.transition 2056, 11, :o2, 2740629600, 9889231, 4 + tz.transition 2057, 3, :o3, 2751519600, 59338411, 24 + tz.transition 2057, 11, :o2, 2772079200, 9890687, 4 + tz.transition 2058, 3, :o3, 2782969200, 59347147, 24 + tz.transition 2058, 11, :o2, 2803528800, 9892143, 4 + tz.transition 2059, 3, :o3, 2814418800, 59355883, 24 + tz.transition 2059, 11, :o2, 2834978400, 9893599, 4 + tz.transition 2060, 3, :o3, 2846473200, 59364787, 24 + tz.transition 2060, 11, :o2, 2867032800, 9895083, 4 + tz.transition 2061, 3, :o3, 2877922800, 59373523, 24 + tz.transition 2061, 11, :o2, 2898482400, 9896539, 4 + tz.transition 2062, 3, :o3, 2909372400, 59382259, 24 + tz.transition 2062, 11, :o2, 2929932000, 9897995, 4 + tz.transition 2063, 3, :o3, 2940822000, 59390995, 24 + tz.transition 2063, 11, :o2, 2961381600, 9899451, 4 + tz.transition 2064, 3, :o3, 2972271600, 59399731, 24 + tz.transition 2064, 11, :o2, 2992831200, 9900907, 4 + tz.transition 2065, 3, :o3, 3003721200, 59408467, 24 + tz.transition 2065, 11, :o2, 3024280800, 9902363, 4 + end end end end diff --git a/lib/tzinfo/data/indexes/countries.rb b/lib/tzinfo/data/indexes/countries.rb index f9209246..4f1b9dfd 100644 --- a/lib/tzinfo/data/indexes/countries.rb +++ b/lib/tzinfo/data/indexes/countries.rb @@ -83,7 +83,7 @@ module Countries country 'AW', 'Aruba' do |c| c.timezone 'America/Curacao', 731, 60, -69, 1 end - country 'AX', 'Aaland Islands' do |c| + country 'AX', 'Åland Islands' do |c| c.timezone 'Europe/Helsinki', 361, 6, 749, 30 end country 'AZ', 'Azerbaijan' do |c| @@ -210,7 +210,7 @@ module Countries country 'CH', 'Switzerland' do |c| c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time' end - country 'CI', 'Cote d\'Ivoire' do |c| + country 'CI', 'Côte d\'Ivoire' do |c| c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'CK', 'Cook Islands' do |c| @@ -465,7 +465,7 @@ module Countries c.timezone 'Asia/Riyadh', 739, 30, 2803, 60 end country 'KY', 'Cayman Islands' do |c| - c.timezone 'America/Panama', 269, 30, -1193, 15 + c.timezone 'America/Cayman', 193, 10, -4883, 60 end country 'KZ', 'Kazakhstan' do |c| c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most locations' @@ -682,7 +682,7 @@ module Countries country 'QA', 'Qatar' do |c| c.timezone 'Asia/Qatar', 1517, 60, 773, 15 end - country 'RE', 'Reunion' do |c| + country 'RE', 'Réunion' do |c| c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet Is, Scattered Is' end country 'RO', 'Romania' do |c| diff --git a/lib/tzinfo/data/indexes/timezones.rb b/lib/tzinfo/data/indexes/timezones.rb index 587e7689..b5d0e1a5 100644 --- a/lib/tzinfo/data/indexes/timezones.rb +++ b/lib/tzinfo/data/indexes/timezones.rb @@ -101,7 +101,7 @@ module Timezones timezone 'America/Caracas' linked_timezone 'America/Catamarca' timezone 'America/Cayenne' - linked_timezone 'America/Cayman' + timezone 'America/Cayman' timezone 'America/Chicago' timezone 'America/Chihuahua' linked_timezone 'America/Coral_Harbour' diff --git a/lib/tzinfo/data/version.rb b/lib/tzinfo/data/version.rb index fd83435d..938bed0a 100644 --- a/lib/tzinfo/data/version.rb +++ b/lib/tzinfo/data/version.rb @@ -1,7 +1,7 @@ module TZInfo module Data # TZInfo::Data version number. - VERSION = '1.2015.4' + VERSION = '1.2015.5' # TZInfo::Data version information. module Version @@ -14,7 +14,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 = '2015d' + TZDATA = '2015e' end end end