tzinfo 0.3.44 → 0.3.45

data/CHANGES

@@ -1,3 +1,9 @@
+== Version 0.3.45 (tzdata v2015g) - 03-Oct-2015
+
+* Updated to tzdata version 2015g
+  (http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html).
+
+
 == Version 0.3.44 (tzdata v2015d) - 24-Apr-2015
 
 * Updated to tzdata version 2015d

data/lib/tzinfo/definitions/Africa/Casablanca.rb

@@ -50,42 +50,40 @@ module TZInfo
           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
@@ -106,11 +104,11 @@ module TZInfo
           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, 29586127, 12
           tz.transition 2038, 10, :o1, 29588731, 12
           tz.transition 2039, 3, :o2, 29590495, 12

data/lib/tzinfo/definitions/Africa/El_Aaiun.rb

@@ -39,42 +39,40 @@ module TZInfo
           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
@@ -95,11 +93,11 @@ module TZInfo
           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, 29586127, 12
           tz.transition 2038, 10, :o2, 29588731, 12
           tz.transition 2039, 3, :o3, 29590495, 12

data/lib/tzinfo/definitions/America/Cayman.rb

@@ -4,7 +4,85 @@ module TZInfo
       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, 52085564483, 21600
+          tz.transition 1912, 2, :o2, 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, 59171923, 24
+          tz.transition 2038, 11, :o2, 9862939, 4
+          tz.transition 2039, 3, :o3, 59180659, 24
+          tz.transition 2039, 11, :o2, 9864395, 4
+          tz.transition 2040, 3, :o3, 59189395, 24
+          tz.transition 2040, 11, :o2, 9865851, 4
+          tz.transition 2041, 3, :o3, 59198131, 24
+          tz.transition 2041, 11, :o2, 9867307, 4
+          tz.transition 2042, 3, :o3, 59206867, 24
+          tz.transition 2042, 11, :o2, 9868763, 4
+          tz.transition 2043, 3, :o3, 59215603, 24
+          tz.transition 2043, 11, :o2, 9870219, 4
+          tz.transition 2044, 3, :o3, 59224507, 24
+          tz.transition 2044, 11, :o2, 9871703, 4
+          tz.transition 2045, 3, :o3, 59233243, 24
+          tz.transition 2045, 11, :o2, 9873159, 4
+          tz.transition 2046, 3, :o3, 59241979, 24
+          tz.transition 2046, 11, :o2, 9874615, 4
+          tz.transition 2047, 3, :o3, 59250715, 24
+          tz.transition 2047, 11, :o2, 9876071, 4
+          tz.transition 2048, 3, :o3, 59259451, 24
+          tz.transition 2048, 11, :o2, 9877527, 4
+          tz.transition 2049, 3, :o3, 59268355, 24
+          tz.transition 2049, 11, :o2, 9879011, 4
+          tz.transition 2050, 3, :o3, 59277091, 24
+          tz.transition 2050, 11, :o2, 9880467, 4
+        end
       end
     end
   end

data/lib/tzinfo/definitions/America/Fort_Nelson.rb

@@ -0,0 +1,162 @@
+module TZInfo
+  module Definitions
+    module America
+      module Fort_Nelson
+        include TimezoneDefinition
+        
+        timezone 'America/Fort_Nelson' do |tz|
+          tz.offset :o0, -29447, 0, :LMT
+          tz.offset :o1, -28800, 0, :PST
+          tz.offset :o2, -28800, 3600, :PDT
+          tz.offset :o3, -28800, 3600, :PWT
+          tz.offset :o4, -28800, 3600, :PPT
+          tz.offset :o5, -25200, 0, :MST
+          
+          tz.transition 1884, 1, :o1, 208152879047, 86400
+          tz.transition 1918, 4, :o2, 29060375, 12
+          tz.transition 1918, 10, :o1, 19375151, 8
+          tz.transition 1942, 2, :o3, 29164799, 12
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 9, :o1, 19453831, 8
+          tz.transition 1947, 4, :o2, 29187635, 12
+          tz.transition 1947, 9, :o1, 19459655, 8
+          tz.transition 1948, 4, :o2, 29192003, 12
+          tz.transition 1948, 9, :o1, 19462567, 8
+          tz.transition 1949, 4, :o2, 29196371, 12
+          tz.transition 1949, 9, :o1, 19465479, 8
+          tz.transition 1950, 4, :o2, 29200823, 12
+          tz.transition 1950, 9, :o1, 19468391, 8
+          tz.transition 1951, 4, :o2, 29205191, 12
+          tz.transition 1951, 9, :o1, 19471359, 8
+          tz.transition 1952, 4, :o2, 29209559, 12
+          tz.transition 1952, 9, :o1, 19474271, 8
+          tz.transition 1953, 4, :o2, 29213927, 12
+          tz.transition 1953, 9, :o1, 19477183, 8
+          tz.transition 1954, 4, :o2, 29218295, 12
+          tz.transition 1954, 9, :o1, 19480095, 8
+          tz.transition 1955, 4, :o2, 29222663, 12
+          tz.transition 1955, 9, :o1, 19483007, 8
+          tz.transition 1956, 4, :o2, 29227115, 12
+          tz.transition 1956, 9, :o1, 19485975, 8
+          tz.transition 1957, 4, :o2, 29231483, 12
+          tz.transition 1957, 9, :o1, 19488887, 8
+          tz.transition 1958, 4, :o2, 29235851, 12
+          tz.transition 1958, 9, :o1, 19491799, 8
+          tz.transition 1959, 4, :o2, 29240219, 12
+          tz.transition 1959, 9, :o1, 19494711, 8
+          tz.transition 1960, 4, :o2, 29244587, 12
+          tz.transition 1960, 9, :o1, 19497623, 8
+          tz.transition 1961, 4, :o2, 29249039, 12
+          tz.transition 1961, 9, :o1, 19500535, 8
+          tz.transition 1962, 4, :o2, 29253407, 12
+          tz.transition 1962, 10, :o1, 19503727, 8
+          tz.transition 1963, 4, :o2, 29257775, 12
+          tz.transition 1963, 10, :o1, 19506639, 8
+          tz.transition 1964, 4, :o2, 29262143, 12
+          tz.transition 1964, 10, :o1, 19509551, 8
+          tz.transition 1965, 4, :o2, 29266511, 12
+          tz.transition 1965, 10, :o1, 19512519, 8
+          tz.transition 1966, 4, :o2, 29270879, 12
+          tz.transition 1966, 10, :o1, 19515431, 8
+          tz.transition 1967, 4, :o2, 29275331, 12
+          tz.transition 1967, 10, :o1, 19518343, 8
+          tz.transition 1968, 4, :o2, 29279699, 12
+          tz.transition 1968, 10, :o1, 19521255, 8
+          tz.transition 1969, 4, :o2, 29284067, 12
+          tz.transition 1969, 10, :o1, 19524167, 8
+          tz.transition 1970, 4, :o2, 9972000
+          tz.transition 1970, 10, :o1, 25693200
+          tz.transition 1971, 4, :o2, 41421600
+          tz.transition 1971, 10, :o1, 57747600
+          tz.transition 1972, 4, :o2, 73476000
+          tz.transition 1972, 10, :o1, 89197200
+          tz.transition 1973, 4, :o2, 104925600
+          tz.transition 1973, 10, :o1, 120646800
+          tz.transition 1974, 4, :o2, 136375200
+          tz.transition 1974, 10, :o1, 152096400
+          tz.transition 1975, 4, :o2, 167824800
+          tz.transition 1975, 10, :o1, 183546000
+          tz.transition 1976, 4, :o2, 199274400
+          tz.transition 1976, 10, :o1, 215600400
+          tz.transition 1977, 4, :o2, 230724000
+          tz.transition 1977, 10, :o1, 247050000
+          tz.transition 1978, 4, :o2, 262778400
+          tz.transition 1978, 10, :o1, 278499600
+          tz.transition 1979, 4, :o2, 294228000
+          tz.transition 1979, 10, :o1, 309949200
+          tz.transition 1980, 4, :o2, 325677600
+          tz.transition 1980, 10, :o1, 341398800
+          tz.transition 1981, 4, :o2, 357127200
+          tz.transition 1981, 10, :o1, 372848400
+          tz.transition 1982, 4, :o2, 388576800
+          tz.transition 1982, 10, :o1, 404902800
+          tz.transition 1983, 4, :o2, 420026400
+          tz.transition 1983, 10, :o1, 436352400
+          tz.transition 1984, 4, :o2, 452080800
+          tz.transition 1984, 10, :o1, 467802000
+          tz.transition 1985, 4, :o2, 483530400
+          tz.transition 1985, 10, :o1, 499251600
+          tz.transition 1986, 4, :o2, 514980000
+          tz.transition 1986, 10, :o1, 530701200
+          tz.transition 1987, 4, :o2, 544615200
+          tz.transition 1987, 10, :o1, 562150800
+          tz.transition 1988, 4, :o2, 576064800
+          tz.transition 1988, 10, :o1, 594205200
+          tz.transition 1989, 4, :o2, 607514400
+          tz.transition 1989, 10, :o1, 625654800
+          tz.transition 1990, 4, :o2, 638964000
+          tz.transition 1990, 10, :o1, 657104400
+          tz.transition 1991, 4, :o2, 671018400
+          tz.transition 1991, 10, :o1, 688554000
+          tz.transition 1992, 4, :o2, 702468000
+          tz.transition 1992, 10, :o1, 720003600
+          tz.transition 1993, 4, :o2, 733917600
+          tz.transition 1993, 10, :o1, 752058000
+          tz.transition 1994, 4, :o2, 765367200
+          tz.transition 1994, 10, :o1, 783507600
+          tz.transition 1995, 4, :o2, 796816800
+          tz.transition 1995, 10, :o1, 814957200
+          tz.transition 1996, 4, :o2, 828871200
+          tz.transition 1996, 10, :o1, 846406800
+          tz.transition 1997, 4, :o2, 860320800
+          tz.transition 1997, 10, :o1, 877856400
+          tz.transition 1998, 4, :o2, 891770400
+          tz.transition 1998, 10, :o1, 909306000
+          tz.transition 1999, 4, :o2, 923220000
+          tz.transition 1999, 10, :o1, 941360400
+          tz.transition 2000, 4, :o2, 954669600
+          tz.transition 2000, 10, :o1, 972810000
+          tz.transition 2001, 4, :o2, 986119200
+          tz.transition 2001, 10, :o1, 1004259600
+          tz.transition 2002, 4, :o2, 1018173600
+          tz.transition 2002, 10, :o1, 1035709200
+          tz.transition 2003, 4, :o2, 1049623200
+          tz.transition 2003, 10, :o1, 1067158800
+          tz.transition 2004, 4, :o2, 1081072800
+          tz.transition 2004, 10, :o1, 1099213200
+          tz.transition 2005, 4, :o2, 1112522400
+          tz.transition 2005, 10, :o1, 1130662800
+          tz.transition 2006, 4, :o2, 1143972000
+          tz.transition 2006, 10, :o1, 1162112400
+          tz.transition 2007, 3, :o2, 1173607200
+          tz.transition 2007, 11, :o1, 1194166800
+          tz.transition 2008, 3, :o2, 1205056800
+          tz.transition 2008, 11, :o1, 1225616400
+          tz.transition 2009, 3, :o2, 1236506400
+          tz.transition 2009, 11, :o1, 1257066000
+          tz.transition 2010, 3, :o2, 1268560800
+          tz.transition 2010, 11, :o1, 1289120400
+          tz.transition 2011, 3, :o2, 1300010400
+          tz.transition 2011, 11, :o1, 1320570000
+          tz.transition 2012, 3, :o2, 1331460000
+          tz.transition 2012, 11, :o1, 1352019600
+          tz.transition 2013, 3, :o2, 1362909600
+          tz.transition 2013, 11, :o1, 1383469200
+          tz.transition 2014, 3, :o2, 1394359200
+          tz.transition 2014, 11, :o1, 1414918800
+          tz.transition 2015, 3, :o5, 1425808800
+        end
+      end
+    end
+  end
+end

data/lib/tzinfo/definitions/America/Montevideo.rb

@@ -100,76 +100,6 @@ module TZInfo
           tz.transition 2014, 3, :o5, 1394337600
           tz.transition 2014, 10, :o4, 1412485200
           tz.transition 2015, 3, :o5, 1425787200
-          tz.transition 2015, 10, :o4, 1443934800
-          tz.transition 2016, 3, :o5, 1457841600
-          tz.transition 2016, 10, :o4, 1475384400
-          tz.transition 2017, 3, :o5, 1489291200
-          tz.transition 2017, 10, :o4, 1506834000
-          tz.transition 2018, 3, :o5, 1520740800
-          tz.transition 2018, 10, :o4, 1538888400
-          tz.transition 2019, 3, :o5, 1552190400
-          tz.transition 2019, 10, :o4, 1570338000
-          tz.transition 2020, 3, :o5, 1583640000
-          tz.transition 2020, 10, :o4, 1601787600
-          tz.transition 2021, 3, :o5, 1615694400
-          tz.transition 2021, 10, :o4, 1633237200
-          tz.transition 2022, 3, :o5, 1647144000
-          tz.transition 2022, 10, :o4, 1664686800
-          tz.transition 2023, 3, :o5, 1678593600
-          tz.transition 2023, 10, :o4, 1696136400
-          tz.transition 2024, 3, :o5, 1710043200
-          tz.transition 2024, 10, :o4, 1728190800
-          tz.transition 2025, 3, :o5, 1741492800
-          tz.transition 2025, 10, :o4, 1759640400
-          tz.transition 2026, 3, :o5, 1772942400
-          tz.transition 2026, 10, :o4, 1791090000
-          tz.transition 2027, 3, :o5, 1804996800
-          tz.transition 2027, 10, :o4, 1822539600
-          tz.transition 2028, 3, :o5, 1836446400
-          tz.transition 2028, 10, :o4, 1853989200
-          tz.transition 2029, 3, :o5, 1867896000
-          tz.transition 2029, 10, :o4, 1886043600
-          tz.transition 2030, 3, :o5, 1899345600
-          tz.transition 2030, 10, :o4, 1917493200
-          tz.transition 2031, 3, :o5, 1930795200
-          tz.transition 2031, 10, :o4, 1948942800
-          tz.transition 2032, 3, :o5, 1962849600
-          tz.transition 2032, 10, :o4, 1980392400
-          tz.transition 2033, 3, :o5, 1994299200
-          tz.transition 2033, 10, :o4, 2011842000
-          tz.transition 2034, 3, :o5, 2025748800
-          tz.transition 2034, 10, :o4, 2043291600
-          tz.transition 2035, 3, :o5, 2057198400
-          tz.transition 2035, 10, :o4, 2075346000
-          tz.transition 2036, 3, :o5, 2088648000
-          tz.transition 2036, 10, :o4, 2106795600
-          tz.transition 2037, 3, :o5, 2120097600
-          tz.transition 2037, 10, :o4, 2138245200
-          tz.transition 2038, 3, :o5, 7396490, 3
-          tz.transition 2038, 10, :o4, 59176793, 24
-          tz.transition 2039, 3, :o5, 7397582, 3
-          tz.transition 2039, 10, :o4, 59185529, 24
-          tz.transition 2040, 3, :o5, 7398674, 3
-          tz.transition 2040, 10, :o4, 59194433, 24
-          tz.transition 2041, 3, :o5, 7399766, 3
-          tz.transition 2041, 10, :o4, 59203169, 24
-          tz.transition 2042, 3, :o5, 7400858, 3
-          tz.transition 2042, 10, :o4, 59211905, 24
-          tz.transition 2043, 3, :o5, 7401950, 3
-          tz.transition 2043, 10, :o4, 59220641, 24
-          tz.transition 2044, 3, :o5, 7403063, 3
-          tz.transition 2044, 10, :o4, 59229377, 24
-          tz.transition 2045, 3, :o5, 7404155, 3
-          tz.transition 2045, 10, :o4, 59238113, 24
-          tz.transition 2046, 3, :o5, 7405247, 3
-          tz.transition 2046, 10, :o4, 59247017, 24
-          tz.transition 2047, 3, :o5, 7406339, 3
-          tz.transition 2047, 10, :o4, 59255753, 24
-          tz.transition 2048, 3, :o5, 7407431, 3
-          tz.transition 2048, 10, :o4, 59264489, 24
-          tz.transition 2049, 3, :o5, 7408544, 3
-          tz.transition 2049, 10, :o4, 59273225, 24
-          tz.transition 2050, 3, :o5, 7409636, 3
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Pyongyang.rb

@@ -15,6 +15,7 @@ module TZInfo
           tz.transition 1911, 12, :o2, 116131303, 48
           tz.transition 1937, 9, :o3, 19430457, 8
           tz.transition 1945, 8, :o4, 19453529, 8
+          tz.transition 2015, 8, :o1, 1439564400
         end
       end
     end

data/lib/tzinfo/definitions/Europe/Chisinau.rb

@@ -72,114 +72,114 @@ module TZInfo
           tz.transition 1995, 9, :o3, 811890000
           tz.transition 1996, 3, :o4, 828223200
           tz.transition 1996, 10, :o3, 846363600
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
+          tz.transition 1997, 3, :o4, 859680000
+          tz.transition 1997, 10, :o3, 877824000
+          tz.transition 1998, 3, :o4, 891129600
+          tz.transition 1998, 10, :o3, 909273600
+          tz.transition 1999, 3, :o4, 922579200
+          tz.transition 1999, 10, :o3, 941328000
+          tz.transition 2000, 3, :o4, 954028800
+          tz.transition 2000, 10, :o3, 972777600
+          tz.transition 2001, 3, :o4, 985478400
+          tz.transition 2001, 10, :o3, 1004227200
+          tz.transition 2002, 3, :o4, 1017532800
+          tz.transition 2002, 10, :o3, 1035676800
+          tz.transition 2003, 3, :o4, 1048982400
+          tz.transition 2003, 10, :o3, 1067126400
+          tz.transition 2004, 3, :o4, 1080432000
+          tz.transition 2004, 10, :o3, 1099180800
+          tz.transition 2005, 3, :o4, 1111881600
+          tz.transition 2005, 10, :o3, 1130630400
+          tz.transition 2006, 3, :o4, 1143331200
+          tz.transition 2006, 10, :o3, 1162080000
+          tz.transition 2007, 3, :o4, 1174780800
+          tz.transition 2007, 10, :o3, 1193529600
+          tz.transition 2008, 3, :o4, 1206835200
+          tz.transition 2008, 10, :o3, 1224979200
+          tz.transition 2009, 3, :o4, 1238284800
+          tz.transition 2009, 10, :o3, 1256428800
+          tz.transition 2010, 3, :o4, 1269734400
+          tz.transition 2010, 10, :o3, 1288483200
+          tz.transition 2011, 3, :o4, 1301184000
+          tz.transition 2011, 10, :o3, 1319932800
+          tz.transition 2012, 3, :o4, 1332633600
+          tz.transition 2012, 10, :o3, 1351382400
+          tz.transition 2013, 3, :o4, 1364688000
+          tz.transition 2013, 10, :o3, 1382832000
+          tz.transition 2014, 3, :o4, 1396137600
+          tz.transition 2014, 10, :o3, 1414281600
+          tz.transition 2015, 3, :o4, 1427587200
+          tz.transition 2015, 10, :o3, 1445731200
+          tz.transition 2016, 3, :o4, 1459036800
+          tz.transition 2016, 10, :o3, 1477785600
+          tz.transition 2017, 3, :o4, 1490486400
+          tz.transition 2017, 10, :o3, 1509235200
+          tz.transition 2018, 3, :o4, 1521936000
+          tz.transition 2018, 10, :o3, 1540684800
+          tz.transition 2019, 3, :o4, 1553990400
+          tz.transition 2019, 10, :o3, 1572134400
+          tz.transition 2020, 3, :o4, 1585440000
+          tz.transition 2020, 10, :o3, 1603584000
+          tz.transition 2021, 3, :o4, 1616889600
+          tz.transition 2021, 10, :o3, 1635638400
+          tz.transition 2022, 3, :o4, 1648339200
+          tz.transition 2022, 10, :o3, 1667088000
+          tz.transition 2023, 3, :o4, 1679788800
+          tz.transition 2023, 10, :o3, 1698537600
+          tz.transition 2024, 3, :o4, 1711843200
+          tz.transition 2024, 10, :o3, 1729987200
+          tz.transition 2025, 3, :o4, 1743292800
+          tz.transition 2025, 10, :o3, 1761436800
+          tz.transition 2026, 3, :o4, 1774742400
+          tz.transition 2026, 10, :o3, 1792886400
+          tz.transition 2027, 3, :o4, 1806192000
+          tz.transition 2027, 10, :o3, 1824940800
+          tz.transition 2028, 3, :o4, 1837641600
+          tz.transition 2028, 10, :o3, 1856390400
+          tz.transition 2029, 3, :o4, 1869091200
+          tz.transition 2029, 10, :o3, 1887840000
+          tz.transition 2030, 3, :o4, 1901145600
+          tz.transition 2030, 10, :o3, 1919289600
+          tz.transition 2031, 3, :o4, 1932595200
+          tz.transition 2031, 10, :o3, 1950739200
+          tz.transition 2032, 3, :o4, 1964044800
+          tz.transition 2032, 10, :o3, 1982793600
+          tz.transition 2033, 3, :o4, 1995494400
+          tz.transition 2033, 10, :o3, 2014243200
+          tz.transition 2034, 3, :o4, 2026944000
+          tz.transition 2034, 10, :o3, 2045692800
+          tz.transition 2035, 3, :o4, 2058393600
+          tz.transition 2035, 10, :o3, 2077142400
+          tz.transition 2036, 3, :o4, 2090448000
+          tz.transition 2036, 10, :o3, 2108592000
+          tz.transition 2037, 3, :o4, 2121897600
+          tz.transition 2037, 10, :o3, 2140041600
+          tz.transition 2038, 3, :o4, 4931021, 2
+          tz.transition 2038, 10, :o3, 4931455, 2
+          tz.transition 2039, 3, :o4, 4931749, 2
+          tz.transition 2039, 10, :o3, 4932183, 2
+          tz.transition 2040, 3, :o4, 4932477, 2
+          tz.transition 2040, 10, :o3, 4932911, 2
+          tz.transition 2041, 3, :o4, 4933219, 2
+          tz.transition 2041, 10, :o3, 4933639, 2
+          tz.transition 2042, 3, :o4, 4933947, 2
+          tz.transition 2042, 10, :o3, 4934367, 2
+          tz.transition 2043, 3, :o4, 4934675, 2
+          tz.transition 2043, 10, :o3, 4935095, 2
+          tz.transition 2044, 3, :o4, 4935403, 2
+          tz.transition 2044, 10, :o3, 4935837, 2
+          tz.transition 2045, 3, :o4, 4936131, 2
+          tz.transition 2045, 10, :o3, 4936565, 2
+          tz.transition 2046, 3, :o4, 4936859, 2
+          tz.transition 2046, 10, :o3, 4937293, 2
+          tz.transition 2047, 3, :o4, 4937601, 2
+          tz.transition 2047, 10, :o3, 4938021, 2
+          tz.transition 2048, 3, :o4, 4938329, 2
+          tz.transition 2048, 10, :o3, 4938749, 2
+          tz.transition 2049, 3, :o4, 4939057, 2
+          tz.transition 2049, 10, :o3, 4939491, 2
+          tz.transition 2050, 3, :o4, 4939785, 2
+          tz.transition 2050, 10, :o3, 4940219, 2
         end
       end
     end

data/lib/tzinfo/definitions/Europe/Istanbul.rb

@@ -138,7 +138,7 @@ module TZInfo
           tz.transition 2014, 3, :o3, 1396227600
           tz.transition 2014, 10, :o2, 1414285200
           tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
+          tz.transition 2015, 11, :o2, 1446944400
           tz.transition 2016, 3, :o3, 1459040400
           tz.transition 2016, 10, :o2, 1477789200
           tz.transition 2017, 3, :o3, 1490490000

data/lib/tzinfo/definitions/Pacific/Fiji.rb

@@ -27,9 +27,9 @@ module TZInfo
           tz.transition 2014, 11, :o2, 1414850400
           tz.transition 2015, 1, :o1, 1421503200
           tz.transition 2015, 10, :o2, 1446300000
-          tz.transition 2016, 1, :o1, 1453557600
+          tz.transition 2016, 1, :o1, 1452952800
           tz.transition 2016, 11, :o2, 1478354400
-          tz.transition 2017, 1, :o1, 1485007200
+          tz.transition 2017, 1, :o1, 1484402400
           tz.transition 2017, 11, :o2, 1509804000
           tz.transition 2018, 1, :o1, 1516456800
           tz.transition 2018, 11, :o2, 1541253600
@@ -37,11 +37,11 @@ module TZInfo
           tz.transition 2019, 11, :o2, 1572703200
           tz.transition 2020, 1, :o1, 1579356000
           tz.transition 2020, 10, :o2, 1604152800
-          tz.transition 2021, 1, :o1, 1611410400
+          tz.transition 2021, 1, :o1, 1610805600
           tz.transition 2021, 11, :o2, 1636207200
-          tz.transition 2022, 1, :o1, 1642860000
+          tz.transition 2022, 1, :o1, 1642255200
           tz.transition 2022, 11, :o2, 1667656800
-          tz.transition 2023, 1, :o1, 1674309600
+          tz.transition 2023, 1, :o1, 1673704800
           tz.transition 2023, 11, :o2, 1699106400
           tz.transition 2024, 1, :o1, 1705759200
           tz.transition 2024, 11, :o2, 1730556000
@@ -49,9 +49,9 @@ module TZInfo
           tz.transition 2025, 11, :o2, 1762005600
           tz.transition 2026, 1, :o1, 1768658400
           tz.transition 2026, 10, :o2, 1793455200
-          tz.transition 2027, 1, :o1, 1800712800
+          tz.transition 2027, 1, :o1, 1800108000
           tz.transition 2027, 11, :o2, 1825509600
-          tz.transition 2028, 1, :o1, 1832162400
+          tz.transition 2028, 1, :o1, 1831557600
           tz.transition 2028, 11, :o2, 1856959200
           tz.transition 2029, 1, :o1, 1863612000
           tz.transition 2029, 11, :o2, 1888408800
@@ -61,9 +61,9 @@ module TZInfo
           tz.transition 2031, 11, :o2, 1951308000
           tz.transition 2032, 1, :o1, 1957960800
           tz.transition 2032, 11, :o2, 1983362400
-          tz.transition 2033, 1, :o1, 1990015200
+          tz.transition 2033, 1, :o1, 1989410400
           tz.transition 2033, 11, :o2, 2014812000
-          tz.transition 2034, 1, :o1, 2021464800
+          tz.transition 2034, 1, :o1, 2020860000
           tz.transition 2034, 11, :o2, 2046261600
           tz.transition 2035, 1, :o1, 2052914400
           tz.transition 2035, 11, :o2, 2077711200
@@ -71,11 +71,11 @@ module TZInfo
           tz.transition 2036, 11, :o2, 2109160800
           tz.transition 2037, 1, :o1, 2115813600
           tz.transition 2037, 10, :o2, 2140610400
-          tz.transition 2038, 1, :o1, 29585365, 12
+          tz.transition 2038, 1, :o1, 29585281, 12
           tz.transition 2038, 11, :o2, 29588809, 12
-          tz.transition 2039, 1, :o1, 29589733, 12
+          tz.transition 2039, 1, :o1, 29589649, 12
           tz.transition 2039, 11, :o2, 29593177, 12
-          tz.transition 2040, 1, :o1, 29594101, 12
+          tz.transition 2040, 1, :o1, 29594017, 12
           tz.transition 2040, 11, :o2, 29597545, 12
           tz.transition 2041, 1, :o1, 29598469, 12
           tz.transition 2041, 11, :o2, 29601913, 12
@@ -83,9 +83,9 @@ module TZInfo
           tz.transition 2042, 11, :o2, 29606281, 12
           tz.transition 2043, 1, :o1, 29607205, 12
           tz.transition 2043, 10, :o2, 29610649, 12
-          tz.transition 2044, 1, :o1, 29611657, 12
+          tz.transition 2044, 1, :o1, 29611573, 12
           tz.transition 2044, 11, :o2, 29615101, 12
-          tz.transition 2045, 1, :o1, 29616025, 12
+          tz.transition 2045, 1, :o1, 29615941, 12
           tz.transition 2045, 11, :o2, 29619469, 12
           tz.transition 2046, 1, :o1, 29620393, 12
           tz.transition 2046, 11, :o2, 29623837, 12
@@ -93,9 +93,9 @@ module TZInfo
           tz.transition 2047, 11, :o2, 29628205, 12
           tz.transition 2048, 1, :o1, 29629129, 12
           tz.transition 2048, 10, :o2, 29632573, 12
-          tz.transition 2049, 1, :o1, 29633581, 12
+          tz.transition 2049, 1, :o1, 29633497, 12
           tz.transition 2049, 11, :o2, 29637025, 12
-          tz.transition 2050, 1, :o1, 29637949, 12
+          tz.transition 2050, 1, :o1, 29637865, 12
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Norfolk.rb

@@ -8,9 +8,14 @@ module TZInfo
           tz.offset :o0, 40312, 0, :LMT
           tz.offset :o1, 40320, 0, :NMT
           tz.offset :o2, 41400, 0, :NFT
+          tz.offset :o3, 41400, 3600, :NFST
+          tz.offset :o4, 39600, 0, :NFT
           
           tz.transition 1900, 12, :o1, 26086158361, 10800
           tz.transition 1950, 12, :o2, 73009411, 30
+          tz.transition 1974, 10, :o3, 152029800
+          tz.transition 1975, 3, :o2, 162912600
+          tz.transition 2015, 10, :o4, 1443882600
         end
       end
     end

data/lib/tzinfo/indexes/countries.rb

@@ -77,7 +77,7 @@ module TZInfo
       country 'AW', 'Aruba' do |c|
         c.timezone 'America/Aruba', 25, 2, -2099, 30
       end
-      country 'AX', 'Aaland Islands' do |c|
+      country 'AX', 'Åland Islands' do |c|
         c.timezone 'Europe/Mariehamn', 601, 10, 399, 20
       end
       country 'AZ', 'Azerbaijan' do |c|
@@ -161,8 +161,8 @@ module TZInfo
       end
       country 'CA', 'Canada' do |c|
         c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland Time, including SE Labrador'
-        c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic Time - Nova Scotia (most places), PEI'
-        c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971'
+        c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic Time - Nova Scotia (peninsula), PEI'
+        c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic Time - Nova Scotia (Cape Breton)'
         c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
         c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
         c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
@@ -184,6 +184,7 @@ module TZInfo
         c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain Time - west Northwest Territories'
         c.timezone 'America/Creston', 491, 10, -6991, 60, 'Mountain Standard Time - Creston, British Columbia'
         c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia'
+        c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'Mountain Standard Time - Fort Nelson, British Columbia'
         c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific Time - west British Columbia'
         c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific Time - south Yukon'
         c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific Time - north Yukon'
@@ -204,7 +205,7 @@ module TZInfo
       country 'CH', 'Switzerland' do |c|
         c.timezone 'Europe/Zurich', 2843, 60, 128, 15
       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|
@@ -676,7 +677,7 @@ module TZInfo
       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
       end
       country 'RO', 'Romania' do |c|

data/lib/tzinfo/indexes/timezones.rb

@@ -95,7 +95,7 @@ module TZInfo
       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'
@@ -114,6 +114,7 @@ module TZInfo
       timezone 'America/Eirunepe'
       timezone 'America/El_Salvador'
       linked_timezone 'America/Ensenada'
+      timezone 'America/Fort_Nelson'
       linked_timezone 'America/Fort_Wayne'
       timezone 'America/Fortaleza'
       timezone 'America/Glace_Bay'

data/lib/tzinfo/tzdataparser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2014 Philip Ross
+# Copyright (c) 2005-2015 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
@@ -638,7 +638,7 @@ module TZInfo
           
           if observance.rule_set.count == 0
             std_offset = observance.std_offset
-            start_zone_id = observance.format.expand(std_offset, nil)
+            start_zone_id = observance.format.expand(utc_offset, std_offset, nil)
             
             if use_start
               transitions << TZDataTransition.new(start_time, utc_offset, std_offset, start_zone_id)
@@ -683,23 +683,23 @@ module TZInfo
                   if earliest.at < start_time
                     start_utc_offset = observance.utc_offset
                     start_std_offset = std_offset
-                    start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)                    
+                    start_zone_id = observance.format.expand(start_utc_offset, earliest.rule.save, earliest.rule.letter)
                     next
                   end
                   
                   if start_zone_id.nil? && start_utc_offset + start_std_offset == observance.utc_offset + std_offset
-                    start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
+                    start_zone_id = observance.format.expand(start_utc_offset, earliest.rule.save, earliest.rule.letter)
                   end
                 end
                 
-                zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
+                zone_id = observance.format.expand(observance.utc_offset, earliest.rule.save, earliest.rule.letter)
                 transitions << TZDataTransition.new(earliest.at, observance.utc_offset, earliest.rule.save, zone_id)
               end              
             }
           end
         
           if use_start
-            start_zone_id = observance.format.expand(nil, nil) if start_zone_id.nil? && observance.format.fixed?            
+            start_zone_id = observance.format.expand(nil, nil, nil) if start_zone_id.nil? && observance.format.fixed?
             raise 'Could not determine time zone abbreviation to use just after until time' if start_zone_id.nil?            
             transitions << TZDataTransition.new(start_time, start_utc_offset, start_std_offset, start_zone_id)
           end
@@ -1109,7 +1109,7 @@ module TZInfo
         @type = :alternate
         @standard_abbrev = $1
         @daylight_abbrev = $2
-      elsif spec =~ /%s/
+      elsif spec =~ /%[sz]/
         @type = :subst
         @abbrev = spec
       else
@@ -1118,8 +1118,9 @@ module TZInfo
       end
     end
     
-    # Expands given the current daylight savings offset and Rule string.
-    def expand(std_offset, rule_string)
+    # Expands given the base offset to UTC, the current daylight savings
+    # offset and rule string.
+    def expand(utc_offset, std_offset, rule_string)
       if @type == :alternate
         if std_offset == 0
           @standard_abbrev
@@ -1127,14 +1128,16 @@ module TZInfo
           @daylight_abbrev
         end
       elsif @type == :subst
-        sprintf(@abbrev, rule_string)
+        @abbrev.gsub(/%([sz])/) do
+          $1 == 's' ? rule_string : format_offset(utc_offset + std_offset)
+        end
       else
         @abbrev
       end        
     end
     
-    # True if a string from the rule is required to expand this format.
-    def requires_rule_string?
+    # True if the format requires substitutions (%s or %z).
+    def subst?
       @type == :subst
     end
     
@@ -1142,6 +1145,38 @@ module TZInfo
     def fixed?
       @type == :fixed
     end
+
+    private
+
+      # Formats an offset according to the rules for %z.
+      def format_offset(offset)
+        if offset < 0
+          offset = -offset
+          sign = '-'
+        else
+          sign = '+'
+        end
+
+        offset, seconds = offset.divmod(60)
+        offset, minutes = offset.divmod(60)
+
+        if offset > 99
+          # unsupported
+          '%z'
+        else
+          result = "#{sign}#{offset.to_s.rjust(2, '0')}"
+
+          if minutes != 0 || seconds != 0
+            result << minutes.to_s.rjust(2, '0')
+
+            if seconds != 0
+              result << seconds.to_s.rjust(2, '0')
+            end
+          end
+
+          result
+        end
+      end
   end
   
   # A location (latitude + longitude)

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '0.3.44'
+  s.version = '0.3.45'
   s.author = 'Philip Ross'
   s.email = 'phil.ross@gmail.com'
   s.homepage = 'http://tzinfo.github.io'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: false
   segments: 
   - 0
   - 3
-  - 44
+  - 45
   segments_generated: true
-  version: 0.3.44
+  version: 0.3.45
 platform: ruby
 authors: 
 - Philip Ross
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-04-23 16:00:00 -07:00
+date: 2015-10-02 16:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -393,6 +393,7 @@ files:
 - lib/tzinfo/definitions/America/Kralendijk.rb
 - lib/tzinfo/definitions/America/Santo_Domingo.rb
 - lib/tzinfo/definitions/America/La_Paz.rb
+- lib/tzinfo/definitions/America/Fort_Nelson.rb
 - lib/tzinfo/definitions/America/Whitehorse.rb
 - lib/tzinfo/definitions/America/Manaus.rb
 - lib/tzinfo/definitions/America/Menominee.rb