diff --git a/lib/tzinfo/data/definitions/America/Punta_Arenas.rb b/lib/tzinfo/data/definitions/America/Punta_Arenas.rb index dad1907..f1ad84c 100644 --- a/lib/tzinfo/data/definitions/America/Punta_Arenas.rb +++ b/lib/tzinfo/data/definitions/America/Punta_Arenas.rb @@ -37,6 +37,7 @@ module Punta_Arenas tz.transition 1932, 9, :o3, -1178132400, 58246841, 24 tz.transition 1942, 6, :o2, -870552000, 7291535, 3 tz.transition 1942, 8, :o3, -865278000, 58333745, 24 + tz.transition 1946, 8, :o4, -736632000, 7296185, 3 tz.transition 1947, 4, :o2, -718056000, 7296830, 3 tz.transition 1947, 5, :o3, -713649600, 7296983, 3 tz.transition 1968, 11, :o5, -36619200, 7320491, 3 diff --git a/lib/tzinfo/data/definitions/America/Santiago.rb b/lib/tzinfo/data/definitions/America/Santiago.rb index db8865c..53d41b7 100644 --- a/lib/tzinfo/data/definitions/America/Santiago.rb +++ b/lib/tzinfo/data/definitions/America/Santiago.rb @@ -37,7 +37,7 @@ module Santiago tz.transition 1942, 6, :o2, -870552000, 7291535, 3 tz.transition 1942, 8, :o3, -865278000, 58333745, 24 tz.transition 1946, 7, :o5, -740520000, 7296050, 3 - tz.transition 1946, 9, :o3, -736376400, 19456517, 8 + tz.transition 1946, 8, :o4, -736635600, 19456493, 8 tz.transition 1947, 4, :o2, -718056000, 7296830, 3 tz.transition 1947, 5, :o3, -713649600, 7296983, 3 tz.transition 1968, 11, :o5, -36619200, 7320491, 3 @@ -146,7 +146,7 @@ module Santiago tz.transition 2021, 4, :o3, 1617505200 tz.transition 2021, 9, :o5, 1630814400 tz.transition 2022, 4, :o3, 1648954800 - tz.transition 2022, 9, :o5, 1662264000 + tz.transition 2022, 9, :o5, 1662868800 tz.transition 2023, 4, :o3, 1680404400 tz.transition 2023, 9, :o5, 1693713600 tz.transition 2024, 4, :o3, 1712458800 diff --git a/lib/tzinfo/data/definitions/Antarctica/Vostok.rb b/lib/tzinfo/data/definitions/Antarctica/Vostok.rb index 4fe5bb5..355b9e1 100644 --- a/lib/tzinfo/data/definitions/Antarctica/Vostok.rb +++ b/lib/tzinfo/data/definitions/Antarctica/Vostok.rb @@ -10,12 +10,7 @@ module Antarctica module Vostok include TimezoneDefinition - timezone 'Antarctica/Vostok' do |tz| - tz.offset :o0, 0, 0, :'-00' - tz.offset :o1, 21600, 0, :'+06' - - tz.transition 1957, 12, :o1, -380073600, 4872377, 2 - end + linked_timezone 'Antarctica/Vostok', 'Asia/Urumqi' end end end diff --git a/lib/tzinfo/data/definitions/Arctic/Longyearbyen.rb b/lib/tzinfo/data/definitions/Arctic/Longyearbyen.rb index a405b13..7cd93ee 100644 --- a/lib/tzinfo/data/definitions/Arctic/Longyearbyen.rb +++ b/lib/tzinfo/data/definitions/Arctic/Longyearbyen.rb @@ -10,7 +10,7 @@ module Arctic module Longyearbyen include TimezoneDefinition - linked_timezone 'Arctic/Longyearbyen', 'Europe/Oslo' + linked_timezone 'Arctic/Longyearbyen', 'Europe/Berlin' end end end diff --git a/lib/tzinfo/data/definitions/Asia/Brunei.rb b/lib/tzinfo/data/definitions/Asia/Brunei.rb index 7c5e824..1ce7fa7 100644 --- a/lib/tzinfo/data/definitions/Asia/Brunei.rb +++ b/lib/tzinfo/data/definitions/Asia/Brunei.rb @@ -10,14 +10,7 @@ module Asia module Brunei include TimezoneDefinition - timezone 'Asia/Brunei' do |tz| - tz.offset :o0, 27580, 0, :LMT - tz.offset :o1, 27000, 0, :'+0730' - tz.offset :o2, 28800, 0, :'+08' - - tz.transition 1926, 2, :o1, -1383464380, 10474164781, 4320 - tz.transition 1932, 12, :o2, -1167636600, 38833171, 16 - end + linked_timezone 'Asia/Brunei', 'Asia/Kuching' end end end diff --git a/lib/tzinfo/data/definitions/Asia/Ho_Chi_Minh.rb b/lib/tzinfo/data/definitions/Asia/Ho_Chi_Minh.rb index f3d1c23..bd8745b 100644 --- a/lib/tzinfo/data/definitions/Asia/Ho_Chi_Minh.rb +++ b/lib/tzinfo/data/definitions/Asia/Ho_Chi_Minh.rb @@ -11,13 +11,13 @@ module Ho_Chi_Minh include TimezoneDefinition timezone 'Asia/Ho_Chi_Minh' do |tz| - tz.offset :o0, 25600, 0, :LMT + tz.offset :o0, 25590, 0, :LMT tz.offset :o1, 25590, 0, :PLMT tz.offset :o2, 25200, 0, :'+07' tz.offset :o3, 28800, 0, :'+08' tz.offset :o4, 32400, 0, :'+09' - tz.transition 1906, 6, :o1, -2004073600, 130539179, 54 + tz.transition 1906, 6, :o1, -2004073590, 6962089547, 2880 tz.transition 1911, 4, :o2, -1851577590, 6967172747, 2880 tz.transition 1942, 12, :o3, -852105600, 14584351, 6 tz.transition 1945, 3, :o4, -782643600, 19452233, 8 diff --git a/lib/tzinfo/data/definitions/Asia/Kuala_Lumpur.rb b/lib/tzinfo/data/definitions/Asia/Kuala_Lumpur.rb index aacd5f0..0cb39de 100644 --- a/lib/tzinfo/data/definitions/Asia/Kuala_Lumpur.rb +++ b/lib/tzinfo/data/definitions/Asia/Kuala_Lumpur.rb @@ -10,25 +10,7 @@ module Asia module Kuala_Lumpur include TimezoneDefinition - timezone 'Asia/Kuala_Lumpur' do |tz| - tz.offset :o0, 24406, 0, :LMT - tz.offset :o1, 24925, 0, :SMT - tz.offset :o2, 25200, 0, :'+07' - tz.offset :o3, 25200, 1200, :'+0720' - tz.offset :o4, 26400, 0, :'+0720' - tz.offset :o5, 27000, 0, :'+0730' - tz.offset :o6, 32400, 0, :'+09' - tz.offset :o7, 28800, 0, :'+08' - - tz.transition 1900, 12, :o1, -2177477206, 104344641397, 43200 - tz.transition 1905, 5, :o2, -2038200925, 8353142363, 3456 - tz.transition 1932, 12, :o3, -1167634800, 58249757, 24 - tz.transition 1935, 12, :o4, -1073028000, 87414055, 36 - tz.transition 1941, 8, :o5, -894180000, 87488575, 36 - tz.transition 1942, 2, :o6, -879665400, 38886499, 16 - tz.transition 1945, 9, :o5, -767005200, 19453681, 8 - tz.transition 1981, 12, :o7, 378664200 - end + linked_timezone 'Asia/Kuala_Lumpur', 'Asia/Singapore' end end end diff --git a/lib/tzinfo/data/definitions/Asia/Tehran.rb b/lib/tzinfo/data/definitions/Asia/Tehran.rb index 3351934..ad76730 100644 --- a/lib/tzinfo/data/definitions/Asia/Tehran.rb +++ b/lib/tzinfo/data/definitions/Asia/Tehran.rb @@ -14,180 +14,81 @@ module Tehran tz.offset :o0, 12344, 0, :LMT tz.offset :o1, 12344, 0, :TMT tz.offset :o2, 12600, 0, :'+0330' - tz.offset :o3, 14400, 0, :'+04' - tz.offset :o4, 14400, 3600, :'+05' - tz.offset :o5, 12600, 3600, :'+0430' + tz.offset :o3, 12600, 3600, :'+0430' + tz.offset :o4, 14400, 0, :'+04' + tz.offset :o5, 14400, 3600, :'+05' tz.transition 1915, 12, :o1, -1704165944, 26145324257, 10800 - tz.transition 1945, 12, :o2, -757394744, 26263670657, 10800 - tz.transition 1977, 10, :o3, 247177800 - tz.transition 1978, 3, :o4, 259272000 - tz.transition 1978, 10, :o3, 277758000 + tz.transition 1935, 6, :o2, -1090466744, 26222036657, 10800 + tz.transition 1977, 3, :o3, 227820600 + tz.transition 1977, 10, :o4, 246223800 + tz.transition 1978, 3, :o5, 259617600 + tz.transition 1978, 8, :o4, 271108800 tz.transition 1978, 12, :o2, 283982400 - tz.transition 1979, 3, :o5, 290809800 + tz.transition 1979, 5, :o3, 296598600 tz.transition 1979, 9, :o2, 306531000 - tz.transition 1980, 3, :o5, 322432200 + tz.transition 1980, 3, :o3, 322432200 tz.transition 1980, 9, :o2, 338499000 - tz.transition 1991, 5, :o5, 673216200 + tz.transition 1991, 5, :o3, 673216200 tz.transition 1991, 9, :o2, 685481400 - tz.transition 1992, 3, :o5, 701209800 + tz.transition 1992, 3, :o3, 701209800 tz.transition 1992, 9, :o2, 717103800 - tz.transition 1993, 3, :o5, 732745800 + tz.transition 1993, 3, :o3, 732745800 tz.transition 1993, 9, :o2, 748639800 - tz.transition 1994, 3, :o5, 764281800 + tz.transition 1994, 3, :o3, 764281800 tz.transition 1994, 9, :o2, 780175800 - tz.transition 1995, 3, :o5, 795817800 + tz.transition 1995, 3, :o3, 795817800 tz.transition 1995, 9, :o2, 811711800 - tz.transition 1996, 3, :o5, 827353800 + tz.transition 1996, 3, :o3, 827353800 tz.transition 1996, 9, :o2, 843247800 - tz.transition 1997, 3, :o5, 858976200 + tz.transition 1997, 3, :o3, 858976200 tz.transition 1997, 9, :o2, 874870200 - tz.transition 1998, 3, :o5, 890512200 + tz.transition 1998, 3, :o3, 890512200 tz.transition 1998, 9, :o2, 906406200 - tz.transition 1999, 3, :o5, 922048200 + tz.transition 1999, 3, :o3, 922048200 tz.transition 1999, 9, :o2, 937942200 - tz.transition 2000, 3, :o5, 953584200 + tz.transition 2000, 3, :o3, 953584200 tz.transition 2000, 9, :o2, 969478200 - tz.transition 2001, 3, :o5, 985206600 + tz.transition 2001, 3, :o3, 985206600 tz.transition 2001, 9, :o2, 1001100600 - tz.transition 2002, 3, :o5, 1016742600 + tz.transition 2002, 3, :o3, 1016742600 tz.transition 2002, 9, :o2, 1032636600 - tz.transition 2003, 3, :o5, 1048278600 + tz.transition 2003, 3, :o3, 1048278600 tz.transition 2003, 9, :o2, 1064172600 - tz.transition 2004, 3, :o5, 1079814600 + tz.transition 2004, 3, :o3, 1079814600 tz.transition 2004, 9, :o2, 1095708600 - tz.transition 2005, 3, :o5, 1111437000 + tz.transition 2005, 3, :o3, 1111437000 tz.transition 2005, 9, :o2, 1127331000 - tz.transition 2008, 3, :o5, 1206045000 + tz.transition 2008, 3, :o3, 1206045000 tz.transition 2008, 9, :o2, 1221939000 - tz.transition 2009, 3, :o5, 1237667400 + tz.transition 2009, 3, :o3, 1237667400 tz.transition 2009, 9, :o2, 1253561400 - tz.transition 2010, 3, :o5, 1269203400 + tz.transition 2010, 3, :o3, 1269203400 tz.transition 2010, 9, :o2, 1285097400 - tz.transition 2011, 3, :o5, 1300739400 + tz.transition 2011, 3, :o3, 1300739400 tz.transition 2011, 9, :o2, 1316633400 - tz.transition 2012, 3, :o5, 1332275400 + tz.transition 2012, 3, :o3, 1332275400 tz.transition 2012, 9, :o2, 1348169400 - tz.transition 2013, 3, :o5, 1363897800 + tz.transition 2013, 3, :o3, 1363897800 tz.transition 2013, 9, :o2, 1379791800 - tz.transition 2014, 3, :o5, 1395433800 + tz.transition 2014, 3, :o3, 1395433800 tz.transition 2014, 9, :o2, 1411327800 - tz.transition 2015, 3, :o5, 1426969800 + tz.transition 2015, 3, :o3, 1426969800 tz.transition 2015, 9, :o2, 1442863800 - tz.transition 2016, 3, :o5, 1458505800 + tz.transition 2016, 3, :o3, 1458505800 tz.transition 2016, 9, :o2, 1474399800 - tz.transition 2017, 3, :o5, 1490128200 + tz.transition 2017, 3, :o3, 1490128200 tz.transition 2017, 9, :o2, 1506022200 - tz.transition 2018, 3, :o5, 1521664200 + tz.transition 2018, 3, :o3, 1521664200 tz.transition 2018, 9, :o2, 1537558200 - tz.transition 2019, 3, :o5, 1553200200 + tz.transition 2019, 3, :o3, 1553200200 tz.transition 2019, 9, :o2, 1569094200 - tz.transition 2020, 3, :o5, 1584736200 + tz.transition 2020, 3, :o3, 1584736200 tz.transition 2020, 9, :o2, 1600630200 - tz.transition 2021, 3, :o5, 1616358600 + tz.transition 2021, 3, :o3, 1616358600 tz.transition 2021, 9, :o2, 1632252600 - tz.transition 2022, 3, :o5, 1647894600 + tz.transition 2022, 3, :o3, 1647894600 tz.transition 2022, 9, :o2, 1663788600 - tz.transition 2023, 3, :o5, 1679430600 - tz.transition 2023, 9, :o2, 1695324600 - tz.transition 2024, 3, :o5, 1710966600 - tz.transition 2024, 9, :o2, 1726860600 - tz.transition 2025, 3, :o5, 1742589000 - tz.transition 2025, 9, :o2, 1758483000 - tz.transition 2026, 3, :o5, 1774125000 - tz.transition 2026, 9, :o2, 1790019000 - tz.transition 2027, 3, :o5, 1805661000 - tz.transition 2027, 9, :o2, 1821555000 - tz.transition 2028, 3, :o5, 1837197000 - tz.transition 2028, 9, :o2, 1853091000 - tz.transition 2029, 3, :o5, 1868733000 - tz.transition 2029, 9, :o2, 1884627000 - tz.transition 2030, 3, :o5, 1900355400 - tz.transition 2030, 9, :o2, 1916249400 - tz.transition 2031, 3, :o5, 1931891400 - tz.transition 2031, 9, :o2, 1947785400 - tz.transition 2032, 3, :o5, 1963427400 - tz.transition 2032, 9, :o2, 1979321400 - tz.transition 2033, 3, :o5, 1994963400 - tz.transition 2033, 9, :o2, 2010857400 - tz.transition 2034, 3, :o5, 2026585800 - tz.transition 2034, 9, :o2, 2042479800 - tz.transition 2035, 3, :o5, 2058121800 - tz.transition 2035, 9, :o2, 2074015800 - tz.transition 2036, 3, :o5, 2089657800 - tz.transition 2036, 9, :o2, 2105551800 - tz.transition 2037, 3, :o5, 2121193800 - tz.transition 2037, 9, :o2, 2137087800 - tz.transition 2038, 3, :o5, 2152816200, 118344209, 48 - tz.transition 2038, 9, :o2, 2168710200, 39451013, 16 - tz.transition 2039, 3, :o5, 2184352200, 118361729, 48 - tz.transition 2039, 9, :o2, 2200246200, 39456853, 16 - tz.transition 2040, 3, :o5, 2215888200, 118379249, 48 - tz.transition 2040, 9, :o2, 2231782200, 39462693, 16 - tz.transition 2041, 3, :o5, 2247424200, 118396769, 48 - tz.transition 2041, 9, :o2, 2263318200, 39468533, 16 - tz.transition 2042, 3, :o5, 2279046600, 118414337, 48 - tz.transition 2042, 9, :o2, 2294940600, 39474389, 16 - tz.transition 2043, 3, :o5, 2310582600, 118431857, 48 - tz.transition 2043, 9, :o2, 2326476600, 39480229, 16 - tz.transition 2044, 3, :o5, 2342118600, 118449377, 48 - tz.transition 2044, 9, :o2, 2358012600, 39486069, 16 - tz.transition 2045, 3, :o5, 2373654600, 118466897, 48 - tz.transition 2045, 9, :o2, 2389548600, 39491909, 16 - tz.transition 2046, 3, :o5, 2405277000, 118484465, 48 - tz.transition 2046, 9, :o2, 2421171000, 39497765, 16 - tz.transition 2047, 3, :o5, 2436813000, 118501985, 48 - tz.transition 2047, 9, :o2, 2452707000, 39503605, 16 - tz.transition 2048, 3, :o5, 2468349000, 118519505, 48 - tz.transition 2048, 9, :o2, 2484243000, 39509445, 16 - tz.transition 2049, 3, :o5, 2499885000, 118537025, 48 - tz.transition 2049, 9, :o2, 2515779000, 39515285, 16 - tz.transition 2050, 3, :o5, 2531507400, 118554593, 48 - tz.transition 2050, 9, :o2, 2547401400, 39521141, 16 - tz.transition 2051, 3, :o5, 2563043400, 118572113, 48 - tz.transition 2051, 9, :o2, 2578937400, 39526981, 16 - tz.transition 2052, 3, :o5, 2594579400, 118589633, 48 - tz.transition 2052, 9, :o2, 2610473400, 39532821, 16 - tz.transition 2053, 3, :o5, 2626115400, 118607153, 48 - tz.transition 2053, 9, :o2, 2642009400, 39538661, 16 - tz.transition 2054, 3, :o5, 2657737800, 118624721, 48 - tz.transition 2054, 9, :o2, 2673631800, 39544517, 16 - tz.transition 2055, 3, :o5, 2689273800, 118642241, 48 - tz.transition 2055, 9, :o2, 2705167800, 39550357, 16 - tz.transition 2056, 3, :o5, 2720809800, 118659761, 48 - tz.transition 2056, 9, :o2, 2736703800, 39556197, 16 - tz.transition 2057, 3, :o5, 2752345800, 118677281, 48 - tz.transition 2057, 9, :o2, 2768239800, 39562037, 16 - tz.transition 2058, 3, :o5, 2783968200, 118694849, 48 - tz.transition 2058, 9, :o2, 2799862200, 39567893, 16 - tz.transition 2059, 3, :o5, 2815504200, 118712369, 48 - tz.transition 2059, 9, :o2, 2831398200, 39573733, 16 - tz.transition 2060, 3, :o5, 2847040200, 118729889, 48 - tz.transition 2060, 9, :o2, 2862934200, 39579573, 16 - tz.transition 2061, 3, :o5, 2878576200, 118747409, 48 - tz.transition 2061, 9, :o2, 2894470200, 39585413, 16 - tz.transition 2062, 3, :o5, 2910112200, 118764929, 48 - tz.transition 2062, 9, :o2, 2926006200, 39591253, 16 - tz.transition 2063, 3, :o5, 2941734600, 118782497, 48 - tz.transition 2063, 9, :o2, 2957628600, 39597109, 16 - tz.transition 2064, 3, :o5, 2973270600, 118800017, 48 - tz.transition 2064, 9, :o2, 2989164600, 39602949, 16 - tz.transition 2065, 3, :o5, 3004806600, 118817537, 48 - tz.transition 2065, 9, :o2, 3020700600, 39608789, 16 - tz.transition 2066, 3, :o5, 3036342600, 118835057, 48 - tz.transition 2066, 9, :o2, 3052236600, 39614629, 16 - tz.transition 2067, 3, :o5, 3067965000, 118852625, 48 - tz.transition 2067, 9, :o2, 3083859000, 39620485, 16 - tz.transition 2068, 3, :o5, 3099501000, 118870145, 48 - tz.transition 2068, 9, :o2, 3115395000, 39626325, 16 - tz.transition 2069, 3, :o5, 3131037000, 118887665, 48 - tz.transition 2069, 9, :o2, 3146931000, 39632165, 16 - tz.transition 2070, 3, :o5, 3162573000, 118905185, 48 - tz.transition 2070, 9, :o2, 3178467000, 39638005, 16 - tz.transition 2071, 3, :o5, 3194195400, 118922753, 48 - tz.transition 2071, 9, :o2, 3210089400, 39643861, 16 - tz.transition 2072, 3, :o5, 3225731400, 118940273, 48 - tz.transition 2072, 9, :o2, 3241625400, 39649701, 16 end end end diff --git a/lib/tzinfo/data/definitions/Atlantic/Jan_Mayen.rb b/lib/tzinfo/data/definitions/Atlantic/Jan_Mayen.rb index cf46200..4cc09e3 100644 --- a/lib/tzinfo/data/definitions/Atlantic/Jan_Mayen.rb +++ b/lib/tzinfo/data/definitions/Atlantic/Jan_Mayen.rb @@ -10,7 +10,7 @@ module Atlantic module Jan_Mayen include TimezoneDefinition - linked_timezone 'Atlantic/Jan_Mayen', 'Europe/Oslo' + linked_timezone 'Atlantic/Jan_Mayen', 'Europe/Berlin' end end end diff --git a/lib/tzinfo/data/definitions/Atlantic/Reykjavik.rb b/lib/tzinfo/data/definitions/Atlantic/Reykjavik.rb index 8ee242b..1a16b15 100644 --- a/lib/tzinfo/data/definitions/Atlantic/Reykjavik.rb +++ b/lib/tzinfo/data/definitions/Atlantic/Reykjavik.rb @@ -10,81 +10,7 @@ module Atlantic module Reykjavik include TimezoneDefinition - timezone 'Atlantic/Reykjavik' do |tz| - tz.offset :o0, -5280, 0, :LMT - tz.offset :o1, -3600, 0, :'-01' - tz.offset :o2, -3600, 3600, :'+00' - tz.offset :o3, 0, 0, :GMT - - tz.transition 1908, 1, :o1, -1956609120, 435229481, 180 - tz.transition 1917, 2, :o2, -1668211200, 4842559, 2 - tz.transition 1917, 10, :o1, -1647212400, 58116541, 24 - tz.transition 1918, 2, :o2, -1636675200, 4843289, 2 - tz.transition 1918, 11, :o1, -1613430000, 58125925, 24 - tz.transition 1919, 2, :o2, -1605139200, 4844019, 2 - tz.transition 1919, 11, :o1, -1581894000, 58134685, 24 - tz.transition 1921, 3, :o2, -1539561600, 4845537, 2 - tz.transition 1921, 6, :o1, -1531350000, 58148725, 24 - tz.transition 1939, 4, :o2, -968025600, 4858767, 2 - tz.transition 1939, 10, :o1, -952293600, 29154787, 12 - tz.transition 1940, 2, :o2, -942008400, 19437477, 8 - tz.transition 1940, 11, :o1, -920239200, 29159239, 12 - tz.transition 1941, 3, :o2, -909957600, 29160667, 12 - tz.transition 1941, 11, :o1, -888789600, 29163607, 12 - tz.transition 1942, 3, :o2, -877903200, 29165119, 12 - tz.transition 1942, 10, :o1, -857944800, 29167891, 12 - tz.transition 1943, 3, :o2, -846453600, 29169487, 12 - tz.transition 1943, 10, :o1, -826495200, 29172259, 12 - tz.transition 1944, 3, :o2, -815004000, 29173855, 12 - tz.transition 1944, 10, :o1, -795045600, 29176627, 12 - tz.transition 1945, 3, :o2, -783554400, 29178223, 12 - tz.transition 1945, 10, :o1, -762991200, 29181079, 12 - tz.transition 1946, 3, :o2, -752104800, 29182591, 12 - tz.transition 1946, 10, :o1, -731541600, 29185447, 12 - tz.transition 1947, 4, :o2, -717631200, 29187379, 12 - tz.transition 1947, 10, :o1, -700092000, 29189815, 12 - tz.transition 1948, 4, :o2, -686181600, 29191747, 12 - tz.transition 1948, 10, :o1, -668642400, 29194183, 12 - tz.transition 1949, 4, :o2, -654732000, 29196115, 12 - tz.transition 1949, 10, :o1, -636588000, 29198635, 12 - tz.transition 1950, 4, :o2, -623282400, 29200483, 12 - tz.transition 1950, 10, :o1, -605743200, 29202919, 12 - tz.transition 1951, 4, :o2, -591832800, 29204851, 12 - tz.transition 1951, 10, :o1, -573688800, 29207371, 12 - tz.transition 1952, 4, :o2, -559778400, 29209303, 12 - tz.transition 1952, 10, :o1, -542239200, 29211739, 12 - tz.transition 1953, 4, :o2, -528328800, 29213671, 12 - tz.transition 1953, 10, :o1, -510789600, 29216107, 12 - tz.transition 1954, 4, :o2, -496879200, 29218039, 12 - tz.transition 1954, 10, :o1, -479340000, 29220475, 12 - tz.transition 1955, 4, :o2, -465429600, 29222407, 12 - tz.transition 1955, 10, :o1, -447890400, 29224843, 12 - tz.transition 1956, 4, :o2, -433980000, 29226775, 12 - tz.transition 1956, 10, :o1, -415836000, 29229295, 12 - tz.transition 1957, 4, :o2, -401925600, 29231227, 12 - tz.transition 1957, 10, :o1, -384386400, 29233663, 12 - tz.transition 1958, 4, :o2, -370476000, 29235595, 12 - tz.transition 1958, 10, :o1, -352936800, 29238031, 12 - tz.transition 1959, 4, :o2, -339026400, 29239963, 12 - tz.transition 1959, 10, :o1, -321487200, 29242399, 12 - tz.transition 1960, 4, :o2, -307576800, 29244331, 12 - tz.transition 1960, 10, :o1, -290037600, 29246767, 12 - tz.transition 1961, 4, :o2, -276127200, 29248699, 12 - tz.transition 1961, 10, :o1, -258588000, 29251135, 12 - tz.transition 1962, 4, :o2, -244677600, 29253067, 12 - tz.transition 1962, 10, :o1, -226533600, 29255587, 12 - tz.transition 1963, 4, :o2, -212623200, 29257519, 12 - tz.transition 1963, 10, :o1, -195084000, 29259955, 12 - tz.transition 1964, 4, :o2, -181173600, 29261887, 12 - tz.transition 1964, 10, :o1, -163634400, 29264323, 12 - tz.transition 1965, 4, :o2, -149724000, 29266255, 12 - tz.transition 1965, 10, :o1, -132184800, 29268691, 12 - tz.transition 1966, 4, :o2, -118274400, 29270623, 12 - tz.transition 1966, 10, :o1, -100735200, 29273059, 12 - tz.transition 1967, 4, :o2, -86824800, 29274991, 12 - tz.transition 1967, 10, :o1, -68680800, 29277511, 12 - tz.transition 1968, 4, :o3, -54770400, 29279443, 12 - end + linked_timezone 'Atlantic/Reykjavik', 'Africa/Abidjan' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Amsterdam.rb b/lib/tzinfo/data/definitions/Europe/Amsterdam.rb index c6d9ea1..121eef1 100644 --- a/lib/tzinfo/data/definitions/Europe/Amsterdam.rb +++ b/lib/tzinfo/data/definitions/Europe/Amsterdam.rb @@ -10,266 +10,7 @@ module Europe module Amsterdam include TimezoneDefinition - timezone 'Europe/Amsterdam' do |tz| - tz.offset :o0, 1172, 0, :LMT - tz.offset :o1, 1172, 0, :AMT - tz.offset :o2, 1172, 3600, :NST - tz.offset :o3, 1200, 3600, :'+0120' - tz.offset :o4, 1200, 0, :'+0020' - tz.offset :o5, 3600, 3600, :CEST - tz.offset :o6, 3600, 0, :CET - - tz.transition 1834, 12, :o1, -4260212372, 51651636907, 21600 - tz.transition 1916, 4, :o2, -1693700372, 52293264907, 21600 - tz.transition 1916, 9, :o1, -1680484772, 52296568807, 21600 - tz.transition 1917, 4, :o2, -1663453172, 52300826707, 21600 - tz.transition 1917, 9, :o1, -1650147572, 52304153107, 21600 - tz.transition 1918, 4, :o2, -1633213172, 52308386707, 21600 - tz.transition 1918, 9, :o1, -1617488372, 52312317907, 21600 - tz.transition 1919, 4, :o2, -1601158772, 52316400307, 21600 - tz.transition 1919, 9, :o1, -1586038772, 52320180307, 21600 - tz.transition 1920, 4, :o2, -1569709172, 52324262707, 21600 - tz.transition 1920, 9, :o1, -1554589172, 52328042707, 21600 - tz.transition 1921, 4, :o2, -1538259572, 52332125107, 21600 - tz.transition 1921, 9, :o1, -1523139572, 52335905107, 21600 - tz.transition 1922, 3, :o2, -1507501172, 52339814707, 21600 - tz.transition 1922, 10, :o1, -1490566772, 52344048307, 21600 - tz.transition 1923, 6, :o2, -1470176372, 52349145907, 21600 - tz.transition 1923, 10, :o1, -1459117172, 52351910707, 21600 - tz.transition 1924, 3, :o2, -1443997172, 52355690707, 21600 - tz.transition 1924, 10, :o1, -1427667572, 52359773107, 21600 - tz.transition 1925, 6, :o2, -1406672372, 52365021907, 21600 - tz.transition 1925, 10, :o1, -1396217972, 52367635507, 21600 - tz.transition 1926, 5, :o2, -1376950772, 52372452307, 21600 - tz.transition 1926, 10, :o1, -1364768372, 52375497907, 21600 - tz.transition 1927, 5, :o2, -1345414772, 52380336307, 21600 - tz.transition 1927, 10, :o1, -1333318772, 52383360307, 21600 - tz.transition 1928, 5, :o2, -1313792372, 52388241907, 21600 - tz.transition 1928, 10, :o1, -1301264372, 52391373907, 21600 - tz.transition 1929, 5, :o2, -1282256372, 52396125907, 21600 - tz.transition 1929, 10, :o1, -1269814772, 52399236307, 21600 - tz.transition 1930, 5, :o2, -1250720372, 52404009907, 21600 - tz.transition 1930, 10, :o1, -1238365172, 52407098707, 21600 - tz.transition 1931, 5, :o2, -1219184372, 52411893907, 21600 - tz.transition 1931, 10, :o1, -1206915572, 52414961107, 21600 - tz.transition 1932, 5, :o2, -1186957172, 52419950707, 21600 - tz.transition 1932, 10, :o1, -1175465972, 52422823507, 21600 - tz.transition 1933, 5, :o2, -1156025972, 52427683507, 21600 - tz.transition 1933, 10, :o1, -1143411572, 52430837107, 21600 - tz.transition 1934, 5, :o2, -1124489972, 52435567507, 21600 - tz.transition 1934, 10, :o1, -1111961972, 52438699507, 21600 - tz.transition 1935, 5, :o2, -1092953972, 52443451507, 21600 - tz.transition 1935, 10, :o1, -1080512372, 52446561907, 21600 - tz.transition 1936, 5, :o2, -1061331572, 52451357107, 21600 - tz.transition 1936, 10, :o1, -1049062772, 52454424307, 21600 - tz.transition 1937, 5, :o2, -1029190772, 52459392307, 21600 - tz.transition 1937, 6, :o3, -1025745572, 52460253607, 21600 - tz.transition 1937, 10, :o4, -1017613200, 174874289, 72 - tz.transition 1938, 5, :o3, -998259600, 174890417, 72 - tz.transition 1938, 10, :o4, -986163600, 174900497, 72 - tz.transition 1939, 5, :o3, -966723600, 174916697, 72 - tz.transition 1939, 10, :o4, -954109200, 174927209, 72 - tz.transition 1940, 5, :o5, -935022000, 174943115, 72 - tz.transition 1942, 11, :o6, -857257200, 58335973, 24 - tz.transition 1943, 3, :o5, -844556400, 58339501, 24 - tz.transition 1943, 10, :o6, -828226800, 58344037, 24 - tz.transition 1944, 4, :o5, -812502000, 58348405, 24 - tz.transition 1944, 10, :o6, -796777200, 58352773, 24 - tz.transition 1945, 4, :o5, -781052400, 58357141, 24 - tz.transition 1945, 9, :o6, -766623600, 58361149, 24 - tz.transition 1977, 4, :o5, 228877200 - tz.transition 1977, 9, :o6, 243997200 - tz.transition 1978, 4, :o5, 260326800 - tz.transition 1978, 10, :o6, 276051600 - tz.transition 1979, 4, :o5, 291776400 - tz.transition 1979, 9, :o6, 307501200 - tz.transition 1980, 4, :o5, 323830800 - tz.transition 1980, 9, :o6, 338950800 - tz.transition 1981, 3, :o5, 354675600 - tz.transition 1981, 9, :o6, 370400400 - tz.transition 1982, 3, :o5, 386125200 - tz.transition 1982, 9, :o6, 401850000 - tz.transition 1983, 3, :o5, 417574800 - tz.transition 1983, 9, :o6, 433299600 - tz.transition 1984, 3, :o5, 449024400 - tz.transition 1984, 9, :o6, 465354000 - tz.transition 1985, 3, :o5, 481078800 - tz.transition 1985, 9, :o6, 496803600 - tz.transition 1986, 3, :o5, 512528400 - tz.transition 1986, 9, :o6, 528253200 - tz.transition 1987, 3, :o5, 543978000 - tz.transition 1987, 9, :o6, 559702800 - tz.transition 1988, 3, :o5, 575427600 - tz.transition 1988, 9, :o6, 591152400 - tz.transition 1989, 3, :o5, 606877200 - tz.transition 1989, 9, :o6, 622602000 - tz.transition 1990, 3, :o5, 638326800 - tz.transition 1990, 9, :o6, 654656400 - tz.transition 1991, 3, :o5, 670381200 - tz.transition 1991, 9, :o6, 686106000 - tz.transition 1992, 3, :o5, 701830800 - tz.transition 1992, 9, :o6, 717555600 - tz.transition 1993, 3, :o5, 733280400 - tz.transition 1993, 9, :o6, 749005200 - tz.transition 1994, 3, :o5, 764730000 - tz.transition 1994, 9, :o6, 780454800 - tz.transition 1995, 3, :o5, 796179600 - tz.transition 1995, 9, :o6, 811904400 - tz.transition 1996, 3, :o5, 828234000 - tz.transition 1996, 10, :o6, 846378000 - tz.transition 1997, 3, :o5, 859683600 - tz.transition 1997, 10, :o6, 877827600 - tz.transition 1998, 3, :o5, 891133200 - tz.transition 1998, 10, :o6, 909277200 - tz.transition 1999, 3, :o5, 922582800 - tz.transition 1999, 10, :o6, 941331600 - tz.transition 2000, 3, :o5, 954032400 - tz.transition 2000, 10, :o6, 972781200 - tz.transition 2001, 3, :o5, 985482000 - tz.transition 2001, 10, :o6, 1004230800 - tz.transition 2002, 3, :o5, 1017536400 - tz.transition 2002, 10, :o6, 1035680400 - tz.transition 2003, 3, :o5, 1048986000 - tz.transition 2003, 10, :o6, 1067130000 - tz.transition 2004, 3, :o5, 1080435600 - tz.transition 2004, 10, :o6, 1099184400 - tz.transition 2005, 3, :o5, 1111885200 - tz.transition 2005, 10, :o6, 1130634000 - tz.transition 2006, 3, :o5, 1143334800 - tz.transition 2006, 10, :o6, 1162083600 - tz.transition 2007, 3, :o5, 1174784400 - tz.transition 2007, 10, :o6, 1193533200 - tz.transition 2008, 3, :o5, 1206838800 - tz.transition 2008, 10, :o6, 1224982800 - tz.transition 2009, 3, :o5, 1238288400 - tz.transition 2009, 10, :o6, 1256432400 - tz.transition 2010, 3, :o5, 1269738000 - tz.transition 2010, 10, :o6, 1288486800 - tz.transition 2011, 3, :o5, 1301187600 - tz.transition 2011, 10, :o6, 1319936400 - tz.transition 2012, 3, :o5, 1332637200 - tz.transition 2012, 10, :o6, 1351386000 - tz.transition 2013, 3, :o5, 1364691600 - tz.transition 2013, 10, :o6, 1382835600 - tz.transition 2014, 3, :o5, 1396141200 - tz.transition 2014, 10, :o6, 1414285200 - tz.transition 2015, 3, :o5, 1427590800 - tz.transition 2015, 10, :o6, 1445734800 - tz.transition 2016, 3, :o5, 1459040400 - tz.transition 2016, 10, :o6, 1477789200 - tz.transition 2017, 3, :o5, 1490490000 - tz.transition 2017, 10, :o6, 1509238800 - tz.transition 2018, 3, :o5, 1521939600 - tz.transition 2018, 10, :o6, 1540688400 - tz.transition 2019, 3, :o5, 1553994000 - tz.transition 2019, 10, :o6, 1572138000 - tz.transition 2020, 3, :o5, 1585443600 - tz.transition 2020, 10, :o6, 1603587600 - tz.transition 2021, 3, :o5, 1616893200 - tz.transition 2021, 10, :o6, 1635642000 - tz.transition 2022, 3, :o5, 1648342800 - tz.transition 2022, 10, :o6, 1667091600 - tz.transition 2023, 3, :o5, 1679792400 - tz.transition 2023, 10, :o6, 1698541200 - tz.transition 2024, 3, :o5, 1711846800 - tz.transition 2024, 10, :o6, 1729990800 - tz.transition 2025, 3, :o5, 1743296400 - tz.transition 2025, 10, :o6, 1761440400 - tz.transition 2026, 3, :o5, 1774746000 - tz.transition 2026, 10, :o6, 1792890000 - tz.transition 2027, 3, :o5, 1806195600 - tz.transition 2027, 10, :o6, 1824944400 - tz.transition 2028, 3, :o5, 1837645200 - tz.transition 2028, 10, :o6, 1856394000 - tz.transition 2029, 3, :o5, 1869094800 - tz.transition 2029, 10, :o6, 1887843600 - tz.transition 2030, 3, :o5, 1901149200 - tz.transition 2030, 10, :o6, 1919293200 - tz.transition 2031, 3, :o5, 1932598800 - tz.transition 2031, 10, :o6, 1950742800 - tz.transition 2032, 3, :o5, 1964048400 - tz.transition 2032, 10, :o6, 1982797200 - tz.transition 2033, 3, :o5, 1995498000 - tz.transition 2033, 10, :o6, 2014246800 - tz.transition 2034, 3, :o5, 2026947600 - tz.transition 2034, 10, :o6, 2045696400 - tz.transition 2035, 3, :o5, 2058397200 - tz.transition 2035, 10, :o6, 2077146000 - tz.transition 2036, 3, :o5, 2090451600 - tz.transition 2036, 10, :o6, 2108595600 - tz.transition 2037, 3, :o5, 2121901200 - tz.transition 2037, 10, :o6, 2140045200 - tz.transition 2038, 3, :o5, 2153350800, 59172253, 24 - tz.transition 2038, 10, :o6, 2172099600, 59177461, 24 - tz.transition 2039, 3, :o5, 2184800400, 59180989, 24 - tz.transition 2039, 10, :o6, 2203549200, 59186197, 24 - tz.transition 2040, 3, :o5, 2216250000, 59189725, 24 - tz.transition 2040, 10, :o6, 2234998800, 59194933, 24 - tz.transition 2041, 3, :o5, 2248304400, 59198629, 24 - tz.transition 2041, 10, :o6, 2266448400, 59203669, 24 - tz.transition 2042, 3, :o5, 2279754000, 59207365, 24 - tz.transition 2042, 10, :o6, 2297898000, 59212405, 24 - tz.transition 2043, 3, :o5, 2311203600, 59216101, 24 - tz.transition 2043, 10, :o6, 2329347600, 59221141, 24 - tz.transition 2044, 3, :o5, 2342653200, 59224837, 24 - tz.transition 2044, 10, :o6, 2361402000, 59230045, 24 - tz.transition 2045, 3, :o5, 2374102800, 59233573, 24 - tz.transition 2045, 10, :o6, 2392851600, 59238781, 24 - tz.transition 2046, 3, :o5, 2405552400, 59242309, 24 - tz.transition 2046, 10, :o6, 2424301200, 59247517, 24 - tz.transition 2047, 3, :o5, 2437606800, 59251213, 24 - tz.transition 2047, 10, :o6, 2455750800, 59256253, 24 - tz.transition 2048, 3, :o5, 2469056400, 59259949, 24 - tz.transition 2048, 10, :o6, 2487200400, 59264989, 24 - tz.transition 2049, 3, :o5, 2500506000, 59268685, 24 - tz.transition 2049, 10, :o6, 2519254800, 59273893, 24 - tz.transition 2050, 3, :o5, 2531955600, 59277421, 24 - tz.transition 2050, 10, :o6, 2550704400, 59282629, 24 - tz.transition 2051, 3, :o5, 2563405200, 59286157, 24 - tz.transition 2051, 10, :o6, 2582154000, 59291365, 24 - tz.transition 2052, 3, :o5, 2595459600, 59295061, 24 - tz.transition 2052, 10, :o6, 2613603600, 59300101, 24 - tz.transition 2053, 3, :o5, 2626909200, 59303797, 24 - tz.transition 2053, 10, :o6, 2645053200, 59308837, 24 - tz.transition 2054, 3, :o5, 2658358800, 59312533, 24 - tz.transition 2054, 10, :o6, 2676502800, 59317573, 24 - tz.transition 2055, 3, :o5, 2689808400, 59321269, 24 - tz.transition 2055, 10, :o6, 2708557200, 59326477, 24 - tz.transition 2056, 3, :o5, 2721258000, 59330005, 24 - tz.transition 2056, 10, :o6, 2740006800, 59335213, 24 - tz.transition 2057, 3, :o5, 2752707600, 59338741, 24 - tz.transition 2057, 10, :o6, 2771456400, 59343949, 24 - tz.transition 2058, 3, :o5, 2784762000, 59347645, 24 - tz.transition 2058, 10, :o6, 2802906000, 59352685, 24 - tz.transition 2059, 3, :o5, 2816211600, 59356381, 24 - tz.transition 2059, 10, :o6, 2834355600, 59361421, 24 - tz.transition 2060, 3, :o5, 2847661200, 59365117, 24 - tz.transition 2060, 10, :o6, 2866410000, 59370325, 24 - tz.transition 2061, 3, :o5, 2879110800, 59373853, 24 - tz.transition 2061, 10, :o6, 2897859600, 59379061, 24 - tz.transition 2062, 3, :o5, 2910560400, 59382589, 24 - tz.transition 2062, 10, :o6, 2929309200, 59387797, 24 - tz.transition 2063, 3, :o5, 2942010000, 59391325, 24 - tz.transition 2063, 10, :o6, 2960758800, 59396533, 24 - tz.transition 2064, 3, :o5, 2974064400, 59400229, 24 - tz.transition 2064, 10, :o6, 2992208400, 59405269, 24 - tz.transition 2065, 3, :o5, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o6, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o5, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o6, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o5, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o6, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o5, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o6, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o5, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o6, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o5, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o6, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o5, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o6, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o5, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o6, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Amsterdam', 'Europe/Brussels' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Copenhagen.rb b/lib/tzinfo/data/definitions/Europe/Copenhagen.rb index 47103e4..1886483 100644 --- a/lib/tzinfo/data/definitions/Europe/Copenhagen.rb +++ b/lib/tzinfo/data/definitions/Europe/Copenhagen.rb @@ -10,217 +10,7 @@ module Europe module Copenhagen include TimezoneDefinition - timezone 'Europe/Copenhagen' do |tz| - tz.offset :o0, 3020, 0, :LMT - tz.offset :o1, 3020, 0, :CMT - tz.offset :o2, 3600, 0, :CET - tz.offset :o3, 3600, 3600, :CEST - - tz.transition 1889, 12, :o1, -2524524620, 10417111769, 4320 - tz.transition 1893, 12, :o2, -2398294220, 10423423289, 4320 - tz.transition 1916, 5, :o3, -1692496800, 29051981, 12 - tz.transition 1916, 9, :o2, -1680490800, 19369099, 8 - tz.transition 1940, 5, :o3, -935110800, 58314347, 24 - tz.transition 1942, 11, :o2, -857257200, 58335973, 24 - tz.transition 1943, 3, :o3, -844556400, 58339501, 24 - tz.transition 1943, 10, :o2, -828226800, 58344037, 24 - tz.transition 1944, 4, :o3, -812502000, 58348405, 24 - tz.transition 1944, 10, :o2, -796777200, 58352773, 24 - tz.transition 1945, 4, :o3, -781052400, 58357141, 24 - tz.transition 1945, 8, :o2, -769388400, 58360381, 24 - tz.transition 1946, 5, :o3, -747010800, 58366597, 24 - tz.transition 1946, 9, :o2, -736383600, 58369549, 24 - tz.transition 1947, 5, :o3, -715215600, 58375429, 24 - tz.transition 1947, 8, :o2, -706748400, 58377781, 24 - tz.transition 1948, 5, :o3, -683161200, 58384333, 24 - tz.transition 1948, 8, :o2, -675298800, 58386517, 24 - tz.transition 1980, 4, :o3, 323830800 - tz.transition 1980, 9, :o2, 338950800 - tz.transition 1981, 3, :o3, 354675600 - tz.transition 1981, 9, :o2, 370400400 - tz.transition 1982, 3, :o3, 386125200 - tz.transition 1982, 9, :o2, 401850000 - tz.transition 1983, 3, :o3, 417574800 - tz.transition 1983, 9, :o2, 433299600 - tz.transition 1984, 3, :o3, 449024400 - tz.transition 1984, 9, :o2, 465354000 - tz.transition 1985, 3, :o3, 481078800 - tz.transition 1985, 9, :o2, 496803600 - tz.transition 1986, 3, :o3, 512528400 - tz.transition 1986, 9, :o2, 528253200 - tz.transition 1987, 3, :o3, 543978000 - tz.transition 1987, 9, :o2, 559702800 - tz.transition 1988, 3, :o3, 575427600 - tz.transition 1988, 9, :o2, 591152400 - tz.transition 1989, 3, :o3, 606877200 - tz.transition 1989, 9, :o2, 622602000 - tz.transition 1990, 3, :o3, 638326800 - tz.transition 1990, 9, :o2, 654656400 - tz.transition 1991, 3, :o3, 670381200 - tz.transition 1991, 9, :o2, 686106000 - tz.transition 1992, 3, :o3, 701830800 - tz.transition 1992, 9, :o2, 717555600 - tz.transition 1993, 3, :o3, 733280400 - tz.transition 1993, 9, :o2, 749005200 - tz.transition 1994, 3, :o3, 764730000 - tz.transition 1994, 9, :o2, 780454800 - tz.transition 1995, 3, :o3, 796179600 - tz.transition 1995, 9, :o2, 811904400 - tz.transition 1996, 3, :o3, 828234000 - tz.transition 1996, 10, :o2, 846378000 - tz.transition 1997, 3, :o3, 859683600 - tz.transition 1997, 10, :o2, 877827600 - tz.transition 1998, 3, :o3, 891133200 - tz.transition 1998, 10, :o2, 909277200 - tz.transition 1999, 3, :o3, 922582800 - tz.transition 1999, 10, :o2, 941331600 - tz.transition 2000, 3, :o3, 954032400 - tz.transition 2000, 10, :o2, 972781200 - tz.transition 2001, 3, :o3, 985482000 - tz.transition 2001, 10, :o2, 1004230800 - tz.transition 2002, 3, :o3, 1017536400 - tz.transition 2002, 10, :o2, 1035680400 - tz.transition 2003, 3, :o3, 1048986000 - tz.transition 2003, 10, :o2, 1067130000 - tz.transition 2004, 3, :o3, 1080435600 - tz.transition 2004, 10, :o2, 1099184400 - tz.transition 2005, 3, :o3, 1111885200 - tz.transition 2005, 10, :o2, 1130634000 - tz.transition 2006, 3, :o3, 1143334800 - tz.transition 2006, 10, :o2, 1162083600 - tz.transition 2007, 3, :o3, 1174784400 - tz.transition 2007, 10, :o2, 1193533200 - tz.transition 2008, 3, :o3, 1206838800 - tz.transition 2008, 10, :o2, 1224982800 - tz.transition 2009, 3, :o3, 1238288400 - tz.transition 2009, 10, :o2, 1256432400 - tz.transition 2010, 3, :o3, 1269738000 - tz.transition 2010, 10, :o2, 1288486800 - tz.transition 2011, 3, :o3, 1301187600 - tz.transition 2011, 10, :o2, 1319936400 - tz.transition 2012, 3, :o3, 1332637200 - tz.transition 2012, 10, :o2, 1351386000 - tz.transition 2013, 3, :o3, 1364691600 - tz.transition 2013, 10, :o2, 1382835600 - tz.transition 2014, 3, :o3, 1396141200 - tz.transition 2014, 10, :o2, 1414285200 - tz.transition 2015, 3, :o3, 1427590800 - tz.transition 2015, 10, :o2, 1445734800 - tz.transition 2016, 3, :o3, 1459040400 - tz.transition 2016, 10, :o2, 1477789200 - tz.transition 2017, 3, :o3, 1490490000 - tz.transition 2017, 10, :o2, 1509238800 - tz.transition 2018, 3, :o3, 1521939600 - tz.transition 2018, 10, :o2, 1540688400 - tz.transition 2019, 3, :o3, 1553994000 - tz.transition 2019, 10, :o2, 1572138000 - tz.transition 2020, 3, :o3, 1585443600 - tz.transition 2020, 10, :o2, 1603587600 - tz.transition 2021, 3, :o3, 1616893200 - tz.transition 2021, 10, :o2, 1635642000 - tz.transition 2022, 3, :o3, 1648342800 - tz.transition 2022, 10, :o2, 1667091600 - tz.transition 2023, 3, :o3, 1679792400 - tz.transition 2023, 10, :o2, 1698541200 - tz.transition 2024, 3, :o3, 1711846800 - tz.transition 2024, 10, :o2, 1729990800 - tz.transition 2025, 3, :o3, 1743296400 - tz.transition 2025, 10, :o2, 1761440400 - tz.transition 2026, 3, :o3, 1774746000 - tz.transition 2026, 10, :o2, 1792890000 - tz.transition 2027, 3, :o3, 1806195600 - tz.transition 2027, 10, :o2, 1824944400 - tz.transition 2028, 3, :o3, 1837645200 - tz.transition 2028, 10, :o2, 1856394000 - tz.transition 2029, 3, :o3, 1869094800 - tz.transition 2029, 10, :o2, 1887843600 - tz.transition 2030, 3, :o3, 1901149200 - tz.transition 2030, 10, :o2, 1919293200 - tz.transition 2031, 3, :o3, 1932598800 - tz.transition 2031, 10, :o2, 1950742800 - tz.transition 2032, 3, :o3, 1964048400 - tz.transition 2032, 10, :o2, 1982797200 - tz.transition 2033, 3, :o3, 1995498000 - tz.transition 2033, 10, :o2, 2014246800 - tz.transition 2034, 3, :o3, 2026947600 - tz.transition 2034, 10, :o2, 2045696400 - tz.transition 2035, 3, :o3, 2058397200 - tz.transition 2035, 10, :o2, 2077146000 - tz.transition 2036, 3, :o3, 2090451600 - tz.transition 2036, 10, :o2, 2108595600 - tz.transition 2037, 3, :o3, 2121901200 - tz.transition 2037, 10, :o2, 2140045200 - tz.transition 2038, 3, :o3, 2153350800, 59172253, 24 - tz.transition 2038, 10, :o2, 2172099600, 59177461, 24 - tz.transition 2039, 3, :o3, 2184800400, 59180989, 24 - tz.transition 2039, 10, :o2, 2203549200, 59186197, 24 - tz.transition 2040, 3, :o3, 2216250000, 59189725, 24 - tz.transition 2040, 10, :o2, 2234998800, 59194933, 24 - tz.transition 2041, 3, :o3, 2248304400, 59198629, 24 - tz.transition 2041, 10, :o2, 2266448400, 59203669, 24 - tz.transition 2042, 3, :o3, 2279754000, 59207365, 24 - tz.transition 2042, 10, :o2, 2297898000, 59212405, 24 - tz.transition 2043, 3, :o3, 2311203600, 59216101, 24 - tz.transition 2043, 10, :o2, 2329347600, 59221141, 24 - tz.transition 2044, 3, :o3, 2342653200, 59224837, 24 - tz.transition 2044, 10, :o2, 2361402000, 59230045, 24 - tz.transition 2045, 3, :o3, 2374102800, 59233573, 24 - tz.transition 2045, 10, :o2, 2392851600, 59238781, 24 - tz.transition 2046, 3, :o3, 2405552400, 59242309, 24 - tz.transition 2046, 10, :o2, 2424301200, 59247517, 24 - tz.transition 2047, 3, :o3, 2437606800, 59251213, 24 - tz.transition 2047, 10, :o2, 2455750800, 59256253, 24 - tz.transition 2048, 3, :o3, 2469056400, 59259949, 24 - tz.transition 2048, 10, :o2, 2487200400, 59264989, 24 - tz.transition 2049, 3, :o3, 2500506000, 59268685, 24 - tz.transition 2049, 10, :o2, 2519254800, 59273893, 24 - tz.transition 2050, 3, :o3, 2531955600, 59277421, 24 - tz.transition 2050, 10, :o2, 2550704400, 59282629, 24 - tz.transition 2051, 3, :o3, 2563405200, 59286157, 24 - tz.transition 2051, 10, :o2, 2582154000, 59291365, 24 - tz.transition 2052, 3, :o3, 2595459600, 59295061, 24 - tz.transition 2052, 10, :o2, 2613603600, 59300101, 24 - tz.transition 2053, 3, :o3, 2626909200, 59303797, 24 - tz.transition 2053, 10, :o2, 2645053200, 59308837, 24 - tz.transition 2054, 3, :o3, 2658358800, 59312533, 24 - tz.transition 2054, 10, :o2, 2676502800, 59317573, 24 - tz.transition 2055, 3, :o3, 2689808400, 59321269, 24 - tz.transition 2055, 10, :o2, 2708557200, 59326477, 24 - tz.transition 2056, 3, :o3, 2721258000, 59330005, 24 - tz.transition 2056, 10, :o2, 2740006800, 59335213, 24 - tz.transition 2057, 3, :o3, 2752707600, 59338741, 24 - tz.transition 2057, 10, :o2, 2771456400, 59343949, 24 - tz.transition 2058, 3, :o3, 2784762000, 59347645, 24 - tz.transition 2058, 10, :o2, 2802906000, 59352685, 24 - tz.transition 2059, 3, :o3, 2816211600, 59356381, 24 - tz.transition 2059, 10, :o2, 2834355600, 59361421, 24 - tz.transition 2060, 3, :o3, 2847661200, 59365117, 24 - tz.transition 2060, 10, :o2, 2866410000, 59370325, 24 - tz.transition 2061, 3, :o3, 2879110800, 59373853, 24 - tz.transition 2061, 10, :o2, 2897859600, 59379061, 24 - tz.transition 2062, 3, :o3, 2910560400, 59382589, 24 - tz.transition 2062, 10, :o2, 2929309200, 59387797, 24 - tz.transition 2063, 3, :o3, 2942010000, 59391325, 24 - tz.transition 2063, 10, :o2, 2960758800, 59396533, 24 - tz.transition 2064, 3, :o3, 2974064400, 59400229, 24 - tz.transition 2064, 10, :o2, 2992208400, 59405269, 24 - tz.transition 2065, 3, :o3, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o2, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o3, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o2, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o3, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o2, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o3, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o2, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o3, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o2, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o3, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o2, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o3, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o2, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o3, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o2, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Copenhagen', 'Europe/Berlin' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Dublin.rb b/lib/tzinfo/data/definitions/Europe/Dublin.rb index 57b3e23..2336958 100644 --- a/lib/tzinfo/data/definitions/Europe/Dublin.rb +++ b/lib/tzinfo/data/definitions/Europe/Dublin.rb @@ -11,7 +11,7 @@ module Dublin include TimezoneDefinition timezone 'Europe/Dublin' do |tz| - tz.offset :o0, -1500, 0, :LMT + tz.offset :o0, -1521, 0, :LMT tz.offset :o1, -1521, 0, :DMT tz.offset :o2, -1521, 3600, :IST tz.offset :o3, 0, 0, :GMT @@ -20,7 +20,7 @@ module Dublin tz.offset :o6, 3600, 0, :IST tz.offset :o7, 3600, -3600, :GMT - tz.transition 1880, 8, :o1, -2821649700, 693483701, 288 + tz.transition 1880, 8, :o1, -2821649679, 23116123369, 9600 tz.transition 1916, 5, :o2, -1691962479, 7747214723, 3200 tz.transition 1916, 10, :o3, -1680471279, 7747640323, 3200 tz.transition 1917, 4, :o4, -1664143200, 29055919, 12 diff --git a/lib/tzinfo/data/definitions/Europe/Kiev.rb b/lib/tzinfo/data/definitions/Europe/Kiev.rb index cea0bdc..f890f11 100644 --- a/lib/tzinfo/data/definitions/Europe/Kiev.rb +++ b/lib/tzinfo/data/definitions/Europe/Kiev.rb @@ -10,208 +10,7 @@ module Europe module Kiev include TimezoneDefinition - timezone 'Europe/Kiev' do |tz| - tz.offset :o0, 7324, 0, :LMT - tz.offset :o1, 7324, 0, :KMT - tz.offset :o2, 7200, 0, :EET - tz.offset :o3, 10800, 0, :MSK - tz.offset :o4, 3600, 3600, :CEST - tz.offset :o5, 3600, 0, :CET - tz.offset :o6, 10800, 3600, :MSD - tz.offset :o7, 7200, 3600, :EEST - - tz.transition 1879, 12, :o1, -2840148124, 52006652969, 21600 - tz.transition 1924, 5, :o2, -1441159324, 52356400169, 21600 - tz.transition 1930, 6, :o3, -1247536800, 29113781, 12 - tz.transition 1941, 9, :o4, -892522800, 19442059, 8 - tz.transition 1942, 11, :o5, -857257200, 58335973, 24 - tz.transition 1943, 3, :o4, -844556400, 58339501, 24 - tz.transition 1943, 10, :o5, -828226800, 58344037, 24 - tz.transition 1943, 11, :o3, -825382800, 58344827, 24 - tz.transition 1981, 3, :o6, 354920400 - tz.transition 1981, 9, :o3, 370728000 - tz.transition 1982, 3, :o6, 386456400 - tz.transition 1982, 9, :o3, 402264000 - tz.transition 1983, 3, :o6, 417992400 - tz.transition 1983, 9, :o3, 433800000 - tz.transition 1984, 3, :o6, 449614800 - tz.transition 1984, 9, :o3, 465346800 - tz.transition 1985, 3, :o6, 481071600 - tz.transition 1985, 9, :o3, 496796400 - tz.transition 1986, 3, :o6, 512521200 - tz.transition 1986, 9, :o3, 528246000 - tz.transition 1987, 3, :o6, 543970800 - tz.transition 1987, 9, :o3, 559695600 - tz.transition 1988, 3, :o6, 575420400 - tz.transition 1988, 9, :o3, 591145200 - tz.transition 1989, 3, :o6, 606870000 - tz.transition 1989, 9, :o3, 622594800 - tz.transition 1990, 3, :o6, 638319600 - tz.transition 1990, 6, :o7, 646783200 - tz.transition 1991, 9, :o2, 686102400 - tz.transition 1992, 3, :o7, 701827200 - tz.transition 1992, 9, :o2, 717552000 - tz.transition 1993, 3, :o7, 733276800 - tz.transition 1993, 9, :o2, 749001600 - tz.transition 1994, 3, :o7, 764726400 - tz.transition 1994, 9, :o2, 780451200 - tz.transition 1995, 3, :o7, 796176000 - tz.transition 1995, 9, :o2, 811900800 - tz.transition 1996, 3, :o7, 828230400 - tz.transition 1996, 10, :o2, 846378000 - tz.transition 1997, 3, :o7, 859683600 - tz.transition 1997, 10, :o2, 877827600 - tz.transition 1998, 3, :o7, 891133200 - tz.transition 1998, 10, :o2, 909277200 - tz.transition 1999, 3, :o7, 922582800 - tz.transition 1999, 10, :o2, 941331600 - tz.transition 2000, 3, :o7, 954032400 - tz.transition 2000, 10, :o2, 972781200 - tz.transition 2001, 3, :o7, 985482000 - tz.transition 2001, 10, :o2, 1004230800 - tz.transition 2002, 3, :o7, 1017536400 - tz.transition 2002, 10, :o2, 1035680400 - tz.transition 2003, 3, :o7, 1048986000 - tz.transition 2003, 10, :o2, 1067130000 - tz.transition 2004, 3, :o7, 1080435600 - tz.transition 2004, 10, :o2, 1099184400 - tz.transition 2005, 3, :o7, 1111885200 - tz.transition 2005, 10, :o2, 1130634000 - tz.transition 2006, 3, :o7, 1143334800 - tz.transition 2006, 10, :o2, 1162083600 - tz.transition 2007, 3, :o7, 1174784400 - tz.transition 2007, 10, :o2, 1193533200 - tz.transition 2008, 3, :o7, 1206838800 - tz.transition 2008, 10, :o2, 1224982800 - tz.transition 2009, 3, :o7, 1238288400 - tz.transition 2009, 10, :o2, 1256432400 - tz.transition 2010, 3, :o7, 1269738000 - tz.transition 2010, 10, :o2, 1288486800 - tz.transition 2011, 3, :o7, 1301187600 - tz.transition 2011, 10, :o2, 1319936400 - tz.transition 2012, 3, :o7, 1332637200 - 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 2065, 3, :o7, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o2, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o7, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o2, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o7, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o2, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o7, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o2, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o7, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o2, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o7, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o2, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o7, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o2, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o7, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o2, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Kiev', 'Europe/Kyiv' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Kyiv.rb b/lib/tzinfo/data/definitions/Europe/Kyiv.rb new file mode 100644 index 0000000..75c1c53 --- /dev/null +++ b/lib/tzinfo/data/definitions/Europe/Kyiv.rb @@ -0,0 +1,219 @@ +# encoding: UTF-8 + +# This file contains data derived from the IANA Time Zone Database +# (https://www.iana.org/time-zones). + +module TZInfo + module Data + module Definitions + module Europe + module Kyiv + include TimezoneDefinition + + timezone 'Europe/Kyiv' do |tz| + tz.offset :o0, 7324, 0, :LMT + tz.offset :o1, 7324, 0, :KMT + tz.offset :o2, 7200, 0, :EET + tz.offset :o3, 10800, 0, :MSK + tz.offset :o4, 3600, 3600, :CEST + tz.offset :o5, 3600, 0, :CET + tz.offset :o6, 10800, 3600, :MSD + tz.offset :o7, 7200, 3600, :EEST + + tz.transition 1879, 12, :o1, -2840148124, 52006652969, 21600 + tz.transition 1924, 5, :o2, -1441159324, 52356400169, 21600 + tz.transition 1930, 6, :o3, -1247536800, 29113781, 12 + tz.transition 1941, 9, :o4, -892522800, 19442059, 8 + tz.transition 1942, 11, :o5, -857257200, 58335973, 24 + tz.transition 1943, 3, :o4, -844556400, 58339501, 24 + tz.transition 1943, 10, :o5, -828226800, 58344037, 24 + tz.transition 1943, 11, :o3, -825382800, 58344827, 24 + tz.transition 1981, 3, :o6, 354920400 + tz.transition 1981, 9, :o3, 370728000 + tz.transition 1982, 3, :o6, 386456400 + tz.transition 1982, 9, :o3, 402264000 + tz.transition 1983, 3, :o6, 417992400 + tz.transition 1983, 9, :o3, 433800000 + tz.transition 1984, 3, :o6, 449614800 + tz.transition 1984, 9, :o3, 465346800 + tz.transition 1985, 3, :o6, 481071600 + tz.transition 1985, 9, :o3, 496796400 + tz.transition 1986, 3, :o6, 512521200 + tz.transition 1986, 9, :o3, 528246000 + tz.transition 1987, 3, :o6, 543970800 + tz.transition 1987, 9, :o3, 559695600 + tz.transition 1988, 3, :o6, 575420400 + tz.transition 1988, 9, :o3, 591145200 + tz.transition 1989, 3, :o6, 606870000 + tz.transition 1989, 9, :o3, 622594800 + tz.transition 1990, 3, :o6, 638319600 + tz.transition 1990, 6, :o7, 646783200 + tz.transition 1991, 9, :o2, 686102400 + tz.transition 1992, 3, :o7, 701827200 + tz.transition 1992, 9, :o2, 717552000 + tz.transition 1993, 3, :o7, 733276800 + tz.transition 1993, 9, :o2, 749001600 + tz.transition 1994, 3, :o7, 764726400 + tz.transition 1994, 9, :o2, 780451200 + tz.transition 1995, 3, :o7, 796176000 + tz.transition 1995, 9, :o2, 811900800 + tz.transition 1996, 3, :o7, 828230400 + tz.transition 1996, 10, :o2, 846378000 + tz.transition 1997, 3, :o7, 859683600 + tz.transition 1997, 10, :o2, 877827600 + tz.transition 1998, 3, :o7, 891133200 + tz.transition 1998, 10, :o2, 909277200 + tz.transition 1999, 3, :o7, 922582800 + tz.transition 1999, 10, :o2, 941331600 + tz.transition 2000, 3, :o7, 954032400 + tz.transition 2000, 10, :o2, 972781200 + tz.transition 2001, 3, :o7, 985482000 + tz.transition 2001, 10, :o2, 1004230800 + tz.transition 2002, 3, :o7, 1017536400 + tz.transition 2002, 10, :o2, 1035680400 + tz.transition 2003, 3, :o7, 1048986000 + tz.transition 2003, 10, :o2, 1067130000 + tz.transition 2004, 3, :o7, 1080435600 + tz.transition 2004, 10, :o2, 1099184400 + tz.transition 2005, 3, :o7, 1111885200 + tz.transition 2005, 10, :o2, 1130634000 + tz.transition 2006, 3, :o7, 1143334800 + tz.transition 2006, 10, :o2, 1162083600 + tz.transition 2007, 3, :o7, 1174784400 + tz.transition 2007, 10, :o2, 1193533200 + tz.transition 2008, 3, :o7, 1206838800 + tz.transition 2008, 10, :o2, 1224982800 + tz.transition 2009, 3, :o7, 1238288400 + tz.transition 2009, 10, :o2, 1256432400 + tz.transition 2010, 3, :o7, 1269738000 + tz.transition 2010, 10, :o2, 1288486800 + tz.transition 2011, 3, :o7, 1301187600 + tz.transition 2011, 10, :o2, 1319936400 + tz.transition 2012, 3, :o7, 1332637200 + 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 2065, 3, :o7, 3005514000, 59408965, 24 + tz.transition 2065, 10, :o2, 3023658000, 59414005, 24 + tz.transition 2066, 3, :o7, 3036963600, 59417701, 24 + tz.transition 2066, 10, :o2, 3055712400, 59422909, 24 + tz.transition 2067, 3, :o7, 3068413200, 59426437, 24 + tz.transition 2067, 10, :o2, 3087162000, 59431645, 24 + tz.transition 2068, 3, :o7, 3099862800, 59435173, 24 + tz.transition 2068, 10, :o2, 3118611600, 59440381, 24 + tz.transition 2069, 3, :o7, 3131917200, 59444077, 24 + tz.transition 2069, 10, :o2, 3150061200, 59449117, 24 + tz.transition 2070, 3, :o7, 3163366800, 59452813, 24 + tz.transition 2070, 10, :o2, 3181510800, 59457853, 24 + tz.transition 2071, 3, :o7, 3194816400, 59461549, 24 + tz.transition 2071, 10, :o2, 3212960400, 59466589, 24 + tz.transition 2072, 3, :o7, 3226266000, 59470285, 24 + tz.transition 2072, 10, :o2, 3245014800, 59475493, 24 + end + end + end + end + end +end diff --git a/lib/tzinfo/data/definitions/Europe/Luxembourg.rb b/lib/tzinfo/data/definitions/Europe/Luxembourg.rb index 2f3c9e0..a5c9bd1 100644 --- a/lib/tzinfo/data/definitions/Europe/Luxembourg.rb +++ b/lib/tzinfo/data/definitions/Europe/Luxembourg.rb @@ -10,269 +10,7 @@ module Europe module Luxembourg include TimezoneDefinition - timezone 'Europe/Luxembourg' do |tz| - tz.offset :o0, 1476, 0, :LMT - tz.offset :o1, 3600, 0, :CET - tz.offset :o2, 3600, 3600, :CEST - tz.offset :o3, 0, 0, :WET - tz.offset :o4, 0, 3600, :WEST - tz.offset :o5, 3600, 3600, :WEST - tz.offset :o6, 3600, 0, :WET - - tz.transition 1904, 5, :o1, -2069713476, 5799917959, 2400 - tz.transition 1916, 5, :o2, -1692496800, 29051981, 12 - tz.transition 1916, 9, :o1, -1680483600, 58107299, 24 - tz.transition 1917, 4, :o2, -1662343200, 29056169, 12 - tz.transition 1917, 9, :o1, -1650157200, 58115723, 24 - tz.transition 1918, 4, :o2, -1632006000, 58120765, 24 - tz.transition 1918, 9, :o1, -1618700400, 58124461, 24 - tz.transition 1918, 11, :o3, -1612659600, 58126139, 24 - tz.transition 1919, 3, :o4, -1604278800, 58128467, 24 - tz.transition 1919, 10, :o3, -1585519200, 29066839, 12 - tz.transition 1920, 2, :o4, -1574038800, 58136867, 24 - tz.transition 1920, 10, :o3, -1552258800, 58142917, 24 - tz.transition 1921, 3, :o4, -1539997200, 58146323, 24 - tz.transition 1921, 10, :o3, -1520550000, 58151725, 24 - tz.transition 1922, 3, :o4, -1507510800, 58155347, 24 - tz.transition 1922, 10, :o3, -1490572800, 4846671, 2 - tz.transition 1923, 4, :o4, -1473642000, 58164755, 24 - tz.transition 1923, 10, :o3, -1459119600, 58168789, 24 - tz.transition 1924, 3, :o4, -1444006800, 58172987, 24 - tz.transition 1924, 10, :o3, -1427673600, 4848127, 2 - tz.transition 1925, 4, :o4, -1411866000, 58181915, 24 - tz.transition 1925, 10, :o3, -1396224000, 4848855, 2 - tz.transition 1926, 4, :o4, -1379293200, 58190963, 24 - tz.transition 1926, 10, :o3, -1364774400, 4849583, 2 - tz.transition 1927, 4, :o4, -1348448400, 58199531, 24 - tz.transition 1927, 10, :o3, -1333324800, 4850311, 2 - tz.transition 1928, 4, :o4, -1316394000, 58208435, 24 - tz.transition 1928, 10, :o3, -1301270400, 4851053, 2 - tz.transition 1929, 4, :o4, -1284339600, 58217339, 24 - tz.transition 1929, 10, :o3, -1269813600, 29110687, 12 - tz.transition 1930, 4, :o4, -1253484000, 29112955, 12 - tz.transition 1930, 10, :o3, -1238364000, 29115055, 12 - tz.transition 1931, 4, :o4, -1221429600, 29117407, 12 - tz.transition 1931, 10, :o3, -1206914400, 29119423, 12 - tz.transition 1932, 4, :o4, -1191189600, 29121607, 12 - tz.transition 1932, 10, :o3, -1175464800, 29123791, 12 - tz.transition 1933, 3, :o4, -1160344800, 29125891, 12 - tz.transition 1933, 10, :o3, -1143410400, 29128243, 12 - tz.transition 1934, 4, :o4, -1127685600, 29130427, 12 - tz.transition 1934, 10, :o3, -1111960800, 29132611, 12 - tz.transition 1935, 3, :o4, -1096840800, 29134711, 12 - tz.transition 1935, 10, :o3, -1080511200, 29136979, 12 - tz.transition 1936, 4, :o4, -1063576800, 29139331, 12 - tz.transition 1936, 10, :o3, -1049061600, 29141347, 12 - tz.transition 1937, 4, :o4, -1033336800, 29143531, 12 - tz.transition 1937, 10, :o3, -1017612000, 29145715, 12 - tz.transition 1938, 3, :o4, -1002492000, 29147815, 12 - tz.transition 1938, 10, :o3, -986162400, 29150083, 12 - tz.transition 1939, 4, :o4, -969228000, 29152435, 12 - tz.transition 1939, 11, :o3, -950479200, 29155039, 12 - tz.transition 1940, 2, :o4, -942012000, 29156215, 12 - tz.transition 1940, 5, :o5, -935186400, 29157163, 12 - tz.transition 1942, 11, :o6, -857257200, 58335973, 24 - tz.transition 1943, 3, :o5, -844556400, 58339501, 24 - tz.transition 1943, 10, :o6, -828226800, 58344037, 24 - tz.transition 1944, 4, :o5, -812502000, 58348405, 24 - tz.transition 1944, 9, :o1, -797986800, 58352437, 24 - tz.transition 1945, 4, :o2, -781052400, 58357141, 24 - tz.transition 1945, 9, :o1, -766623600, 58361149, 24 - tz.transition 1946, 5, :o2, -745455600, 58367029, 24 - tz.transition 1946, 10, :o1, -733273200, 58370413, 24 - tz.transition 1977, 4, :o2, 228877200 - tz.transition 1977, 9, :o1, 243997200 - tz.transition 1978, 4, :o2, 260326800 - tz.transition 1978, 10, :o1, 276051600 - tz.transition 1979, 4, :o2, 291776400 - tz.transition 1979, 9, :o1, 307501200 - tz.transition 1980, 4, :o2, 323830800 - tz.transition 1980, 9, :o1, 338950800 - tz.transition 1981, 3, :o2, 354675600 - tz.transition 1981, 9, :o1, 370400400 - tz.transition 1982, 3, :o2, 386125200 - tz.transition 1982, 9, :o1, 401850000 - tz.transition 1983, 3, :o2, 417574800 - tz.transition 1983, 9, :o1, 433299600 - tz.transition 1984, 3, :o2, 449024400 - tz.transition 1984, 9, :o1, 465354000 - tz.transition 1985, 3, :o2, 481078800 - tz.transition 1985, 9, :o1, 496803600 - tz.transition 1986, 3, :o2, 512528400 - tz.transition 1986, 9, :o1, 528253200 - tz.transition 1987, 3, :o2, 543978000 - tz.transition 1987, 9, :o1, 559702800 - tz.transition 1988, 3, :o2, 575427600 - tz.transition 1988, 9, :o1, 591152400 - tz.transition 1989, 3, :o2, 606877200 - tz.transition 1989, 9, :o1, 622602000 - tz.transition 1990, 3, :o2, 638326800 - tz.transition 1990, 9, :o1, 654656400 - tz.transition 1991, 3, :o2, 670381200 - tz.transition 1991, 9, :o1, 686106000 - tz.transition 1992, 3, :o2, 701830800 - tz.transition 1992, 9, :o1, 717555600 - tz.transition 1993, 3, :o2, 733280400 - tz.transition 1993, 9, :o1, 749005200 - tz.transition 1994, 3, :o2, 764730000 - tz.transition 1994, 9, :o1, 780454800 - tz.transition 1995, 3, :o2, 796179600 - tz.transition 1995, 9, :o1, 811904400 - tz.transition 1996, 3, :o2, 828234000 - tz.transition 1996, 10, :o1, 846378000 - tz.transition 1997, 3, :o2, 859683600 - tz.transition 1997, 10, :o1, 877827600 - tz.transition 1998, 3, :o2, 891133200 - tz.transition 1998, 10, :o1, 909277200 - tz.transition 1999, 3, :o2, 922582800 - tz.transition 1999, 10, :o1, 941331600 - tz.transition 2000, 3, :o2, 954032400 - tz.transition 2000, 10, :o1, 972781200 - tz.transition 2001, 3, :o2, 985482000 - tz.transition 2001, 10, :o1, 1004230800 - tz.transition 2002, 3, :o2, 1017536400 - tz.transition 2002, 10, :o1, 1035680400 - tz.transition 2003, 3, :o2, 1048986000 - tz.transition 2003, 10, :o1, 1067130000 - tz.transition 2004, 3, :o2, 1080435600 - tz.transition 2004, 10, :o1, 1099184400 - 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 - tz.transition 2065, 3, :o2, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o1, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o2, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o1, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o2, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o1, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o2, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o1, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o2, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o1, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o2, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o1, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o2, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o1, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o2, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o1, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Luxembourg', 'Europe/Brussels' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Monaco.rb b/lib/tzinfo/data/definitions/Europe/Monaco.rb index 1e9cfb6..55865ae 100644 --- a/lib/tzinfo/data/definitions/Europe/Monaco.rb +++ b/lib/tzinfo/data/definitions/Europe/Monaco.rb @@ -10,271 +10,7 @@ module Europe module Monaco include TimezoneDefinition - timezone 'Europe/Monaco' do |tz| - tz.offset :o0, 1772, 0, :LMT - tz.offset :o1, 561, 0, :PMT - tz.offset :o2, 0, 0, :WET - tz.offset :o3, 0, 3600, :WEST - tz.offset :o4, 0, 7200, :WEMT - tz.offset :o5, 3600, 0, :CET - tz.offset :o6, 3600, 3600, :CEST - - tz.transition 1892, 5, :o1, -2448318572, 52104610357, 21600 - tz.transition 1911, 3, :o2, -1854403761, 69670785413, 28800 - tz.transition 1916, 6, :o3, -1689814800, 58104707, 24 - tz.transition 1916, 10, :o2, -1680397200, 58107323, 24 - tz.transition 1917, 3, :o3, -1665363600, 58111499, 24 - tz.transition 1917, 10, :o2, -1648342800, 58116227, 24 - tz.transition 1918, 3, :o3, -1635123600, 58119899, 24 - tz.transition 1918, 10, :o2, -1616893200, 58124963, 24 - tz.transition 1919, 3, :o3, -1604278800, 58128467, 24 - tz.transition 1919, 10, :o2, -1585443600, 58133699, 24 - tz.transition 1920, 2, :o3, -1574038800, 58136867, 24 - tz.transition 1920, 10, :o2, -1552266000, 58142915, 24 - tz.transition 1921, 3, :o3, -1539997200, 58146323, 24 - tz.transition 1921, 10, :o2, -1520557200, 58151723, 24 - tz.transition 1922, 3, :o3, -1507510800, 58155347, 24 - tz.transition 1922, 10, :o2, -1490576400, 58160051, 24 - tz.transition 1923, 5, :o3, -1470618000, 58165595, 24 - tz.transition 1923, 10, :o2, -1459126800, 58168787, 24 - tz.transition 1924, 3, :o3, -1444006800, 58172987, 24 - tz.transition 1924, 10, :o2, -1427677200, 58177523, 24 - tz.transition 1925, 4, :o3, -1411952400, 58181891, 24 - tz.transition 1925, 10, :o2, -1396227600, 58186259, 24 - tz.transition 1926, 4, :o3, -1379293200, 58190963, 24 - tz.transition 1926, 10, :o2, -1364778000, 58194995, 24 - tz.transition 1927, 4, :o3, -1348448400, 58199531, 24 - tz.transition 1927, 10, :o2, -1333328400, 58203731, 24 - tz.transition 1928, 4, :o3, -1316394000, 58208435, 24 - tz.transition 1928, 10, :o2, -1301274000, 58212635, 24 - tz.transition 1929, 4, :o3, -1284339600, 58217339, 24 - tz.transition 1929, 10, :o2, -1269824400, 58221371, 24 - tz.transition 1930, 4, :o3, -1253494800, 58225907, 24 - tz.transition 1930, 10, :o2, -1238374800, 58230107, 24 - tz.transition 1931, 4, :o3, -1221440400, 58234811, 24 - tz.transition 1931, 10, :o2, -1206925200, 58238843, 24 - tz.transition 1932, 4, :o3, -1191200400, 58243211, 24 - tz.transition 1932, 10, :o2, -1175475600, 58247579, 24 - tz.transition 1933, 3, :o3, -1160355600, 58251779, 24 - tz.transition 1933, 10, :o2, -1143421200, 58256483, 24 - tz.transition 1934, 4, :o3, -1127696400, 58260851, 24 - tz.transition 1934, 10, :o2, -1111971600, 58265219, 24 - tz.transition 1935, 3, :o3, -1096851600, 58269419, 24 - tz.transition 1935, 10, :o2, -1080522000, 58273955, 24 - tz.transition 1936, 4, :o3, -1063587600, 58278659, 24 - tz.transition 1936, 10, :o2, -1049072400, 58282691, 24 - tz.transition 1937, 4, :o3, -1033347600, 58287059, 24 - tz.transition 1937, 10, :o2, -1017622800, 58291427, 24 - tz.transition 1938, 3, :o3, -1002502800, 58295627, 24 - tz.transition 1938, 10, :o2, -986173200, 58300163, 24 - tz.transition 1939, 4, :o3, -969238800, 58304867, 24 - tz.transition 1939, 11, :o2, -950490000, 58310075, 24 - tz.transition 1940, 2, :o3, -942012000, 29156215, 12 - tz.transition 1941, 5, :o4, -904438800, 58322867, 24 - tz.transition 1941, 10, :o3, -891136800, 29163281, 12 - tz.transition 1942, 3, :o4, -877827600, 58330259, 24 - tz.transition 1942, 11, :o3, -857257200, 58335973, 24 - tz.transition 1943, 3, :o4, -844556400, 58339501, 24 - tz.transition 1943, 10, :o3, -828226800, 58344037, 24 - tz.transition 1944, 4, :o4, -812502000, 58348405, 24 - tz.transition 1944, 10, :o3, -796266000, 58352915, 24 - tz.transition 1945, 4, :o4, -781052400, 58357141, 24 - tz.transition 1945, 9, :o5, -766623600, 58361149, 24 - tz.transition 1976, 3, :o6, 196819200 - tz.transition 1976, 9, :o5, 212540400 - tz.transition 1977, 4, :o6, 228877200 - tz.transition 1977, 9, :o5, 243997200 - tz.transition 1978, 4, :o6, 260326800 - tz.transition 1978, 10, :o5, 276051600 - tz.transition 1979, 4, :o6, 291776400 - tz.transition 1979, 9, :o5, 307501200 - tz.transition 1980, 4, :o6, 323830800 - tz.transition 1980, 9, :o5, 338950800 - tz.transition 1981, 3, :o6, 354675600 - tz.transition 1981, 9, :o5, 370400400 - tz.transition 1982, 3, :o6, 386125200 - tz.transition 1982, 9, :o5, 401850000 - tz.transition 1983, 3, :o6, 417574800 - tz.transition 1983, 9, :o5, 433299600 - tz.transition 1984, 3, :o6, 449024400 - tz.transition 1984, 9, :o5, 465354000 - tz.transition 1985, 3, :o6, 481078800 - tz.transition 1985, 9, :o5, 496803600 - tz.transition 1986, 3, :o6, 512528400 - tz.transition 1986, 9, :o5, 528253200 - tz.transition 1987, 3, :o6, 543978000 - tz.transition 1987, 9, :o5, 559702800 - tz.transition 1988, 3, :o6, 575427600 - tz.transition 1988, 9, :o5, 591152400 - tz.transition 1989, 3, :o6, 606877200 - tz.transition 1989, 9, :o5, 622602000 - tz.transition 1990, 3, :o6, 638326800 - tz.transition 1990, 9, :o5, 654656400 - tz.transition 1991, 3, :o6, 670381200 - tz.transition 1991, 9, :o5, 686106000 - tz.transition 1992, 3, :o6, 701830800 - tz.transition 1992, 9, :o5, 717555600 - tz.transition 1993, 3, :o6, 733280400 - tz.transition 1993, 9, :o5, 749005200 - tz.transition 1994, 3, :o6, 764730000 - tz.transition 1994, 9, :o5, 780454800 - tz.transition 1995, 3, :o6, 796179600 - tz.transition 1995, 9, :o5, 811904400 - tz.transition 1996, 3, :o6, 828234000 - tz.transition 1996, 10, :o5, 846378000 - tz.transition 1997, 3, :o6, 859683600 - tz.transition 1997, 10, :o5, 877827600 - tz.transition 1998, 3, :o6, 891133200 - tz.transition 1998, 10, :o5, 909277200 - tz.transition 1999, 3, :o6, 922582800 - tz.transition 1999, 10, :o5, 941331600 - tz.transition 2000, 3, :o6, 954032400 - tz.transition 2000, 10, :o5, 972781200 - tz.transition 2001, 3, :o6, 985482000 - tz.transition 2001, 10, :o5, 1004230800 - tz.transition 2002, 3, :o6, 1017536400 - tz.transition 2002, 10, :o5, 1035680400 - tz.transition 2003, 3, :o6, 1048986000 - tz.transition 2003, 10, :o5, 1067130000 - tz.transition 2004, 3, :o6, 1080435600 - tz.transition 2004, 10, :o5, 1099184400 - tz.transition 2005, 3, :o6, 1111885200 - tz.transition 2005, 10, :o5, 1130634000 - tz.transition 2006, 3, :o6, 1143334800 - tz.transition 2006, 10, :o5, 1162083600 - tz.transition 2007, 3, :o6, 1174784400 - tz.transition 2007, 10, :o5, 1193533200 - tz.transition 2008, 3, :o6, 1206838800 - tz.transition 2008, 10, :o5, 1224982800 - tz.transition 2009, 3, :o6, 1238288400 - tz.transition 2009, 10, :o5, 1256432400 - tz.transition 2010, 3, :o6, 1269738000 - tz.transition 2010, 10, :o5, 1288486800 - tz.transition 2011, 3, :o6, 1301187600 - tz.transition 2011, 10, :o5, 1319936400 - tz.transition 2012, 3, :o6, 1332637200 - tz.transition 2012, 10, :o5, 1351386000 - tz.transition 2013, 3, :o6, 1364691600 - tz.transition 2013, 10, :o5, 1382835600 - tz.transition 2014, 3, :o6, 1396141200 - tz.transition 2014, 10, :o5, 1414285200 - tz.transition 2015, 3, :o6, 1427590800 - tz.transition 2015, 10, :o5, 1445734800 - tz.transition 2016, 3, :o6, 1459040400 - tz.transition 2016, 10, :o5, 1477789200 - tz.transition 2017, 3, :o6, 1490490000 - tz.transition 2017, 10, :o5, 1509238800 - tz.transition 2018, 3, :o6, 1521939600 - tz.transition 2018, 10, :o5, 1540688400 - tz.transition 2019, 3, :o6, 1553994000 - tz.transition 2019, 10, :o5, 1572138000 - tz.transition 2020, 3, :o6, 1585443600 - tz.transition 2020, 10, :o5, 1603587600 - tz.transition 2021, 3, :o6, 1616893200 - tz.transition 2021, 10, :o5, 1635642000 - tz.transition 2022, 3, :o6, 1648342800 - tz.transition 2022, 10, :o5, 1667091600 - tz.transition 2023, 3, :o6, 1679792400 - tz.transition 2023, 10, :o5, 1698541200 - tz.transition 2024, 3, :o6, 1711846800 - tz.transition 2024, 10, :o5, 1729990800 - tz.transition 2025, 3, :o6, 1743296400 - tz.transition 2025, 10, :o5, 1761440400 - tz.transition 2026, 3, :o6, 1774746000 - tz.transition 2026, 10, :o5, 1792890000 - tz.transition 2027, 3, :o6, 1806195600 - tz.transition 2027, 10, :o5, 1824944400 - tz.transition 2028, 3, :o6, 1837645200 - tz.transition 2028, 10, :o5, 1856394000 - tz.transition 2029, 3, :o6, 1869094800 - tz.transition 2029, 10, :o5, 1887843600 - tz.transition 2030, 3, :o6, 1901149200 - tz.transition 2030, 10, :o5, 1919293200 - tz.transition 2031, 3, :o6, 1932598800 - tz.transition 2031, 10, :o5, 1950742800 - tz.transition 2032, 3, :o6, 1964048400 - tz.transition 2032, 10, :o5, 1982797200 - tz.transition 2033, 3, :o6, 1995498000 - tz.transition 2033, 10, :o5, 2014246800 - tz.transition 2034, 3, :o6, 2026947600 - tz.transition 2034, 10, :o5, 2045696400 - tz.transition 2035, 3, :o6, 2058397200 - tz.transition 2035, 10, :o5, 2077146000 - tz.transition 2036, 3, :o6, 2090451600 - tz.transition 2036, 10, :o5, 2108595600 - tz.transition 2037, 3, :o6, 2121901200 - tz.transition 2037, 10, :o5, 2140045200 - tz.transition 2038, 3, :o6, 2153350800, 59172253, 24 - tz.transition 2038, 10, :o5, 2172099600, 59177461, 24 - tz.transition 2039, 3, :o6, 2184800400, 59180989, 24 - tz.transition 2039, 10, :o5, 2203549200, 59186197, 24 - tz.transition 2040, 3, :o6, 2216250000, 59189725, 24 - tz.transition 2040, 10, :o5, 2234998800, 59194933, 24 - tz.transition 2041, 3, :o6, 2248304400, 59198629, 24 - tz.transition 2041, 10, :o5, 2266448400, 59203669, 24 - tz.transition 2042, 3, :o6, 2279754000, 59207365, 24 - tz.transition 2042, 10, :o5, 2297898000, 59212405, 24 - tz.transition 2043, 3, :o6, 2311203600, 59216101, 24 - tz.transition 2043, 10, :o5, 2329347600, 59221141, 24 - tz.transition 2044, 3, :o6, 2342653200, 59224837, 24 - tz.transition 2044, 10, :o5, 2361402000, 59230045, 24 - tz.transition 2045, 3, :o6, 2374102800, 59233573, 24 - tz.transition 2045, 10, :o5, 2392851600, 59238781, 24 - tz.transition 2046, 3, :o6, 2405552400, 59242309, 24 - tz.transition 2046, 10, :o5, 2424301200, 59247517, 24 - tz.transition 2047, 3, :o6, 2437606800, 59251213, 24 - tz.transition 2047, 10, :o5, 2455750800, 59256253, 24 - tz.transition 2048, 3, :o6, 2469056400, 59259949, 24 - tz.transition 2048, 10, :o5, 2487200400, 59264989, 24 - tz.transition 2049, 3, :o6, 2500506000, 59268685, 24 - tz.transition 2049, 10, :o5, 2519254800, 59273893, 24 - tz.transition 2050, 3, :o6, 2531955600, 59277421, 24 - tz.transition 2050, 10, :o5, 2550704400, 59282629, 24 - tz.transition 2051, 3, :o6, 2563405200, 59286157, 24 - tz.transition 2051, 10, :o5, 2582154000, 59291365, 24 - tz.transition 2052, 3, :o6, 2595459600, 59295061, 24 - tz.transition 2052, 10, :o5, 2613603600, 59300101, 24 - tz.transition 2053, 3, :o6, 2626909200, 59303797, 24 - tz.transition 2053, 10, :o5, 2645053200, 59308837, 24 - tz.transition 2054, 3, :o6, 2658358800, 59312533, 24 - tz.transition 2054, 10, :o5, 2676502800, 59317573, 24 - tz.transition 2055, 3, :o6, 2689808400, 59321269, 24 - tz.transition 2055, 10, :o5, 2708557200, 59326477, 24 - tz.transition 2056, 3, :o6, 2721258000, 59330005, 24 - tz.transition 2056, 10, :o5, 2740006800, 59335213, 24 - tz.transition 2057, 3, :o6, 2752707600, 59338741, 24 - tz.transition 2057, 10, :o5, 2771456400, 59343949, 24 - tz.transition 2058, 3, :o6, 2784762000, 59347645, 24 - tz.transition 2058, 10, :o5, 2802906000, 59352685, 24 - tz.transition 2059, 3, :o6, 2816211600, 59356381, 24 - tz.transition 2059, 10, :o5, 2834355600, 59361421, 24 - tz.transition 2060, 3, :o6, 2847661200, 59365117, 24 - tz.transition 2060, 10, :o5, 2866410000, 59370325, 24 - tz.transition 2061, 3, :o6, 2879110800, 59373853, 24 - tz.transition 2061, 10, :o5, 2897859600, 59379061, 24 - tz.transition 2062, 3, :o6, 2910560400, 59382589, 24 - tz.transition 2062, 10, :o5, 2929309200, 59387797, 24 - tz.transition 2063, 3, :o6, 2942010000, 59391325, 24 - tz.transition 2063, 10, :o5, 2960758800, 59396533, 24 - tz.transition 2064, 3, :o6, 2974064400, 59400229, 24 - tz.transition 2064, 10, :o5, 2992208400, 59405269, 24 - tz.transition 2065, 3, :o6, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o5, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o6, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o5, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o6, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o5, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o6, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o5, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o6, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o5, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o6, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o5, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o6, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o5, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o6, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o5, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Monaco', 'Europe/Paris' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Oslo.rb b/lib/tzinfo/data/definitions/Europe/Oslo.rb index 551e8b0..01c9690 100644 --- a/lib/tzinfo/data/definitions/Europe/Oslo.rb +++ b/lib/tzinfo/data/definitions/Europe/Oslo.rb @@ -10,223 +10,7 @@ module Europe module Oslo include TimezoneDefinition - timezone 'Europe/Oslo' do |tz| - tz.offset :o0, 2580, 0, :LMT - tz.offset :o1, 3600, 0, :CET - tz.offset :o2, 3600, 3600, :CEST - - tz.transition 1894, 12, :o1, -2366757780, 3475000037, 1440 - tz.transition 1916, 5, :o2, -1691884800, 4842011, 2 - tz.transition 1916, 9, :o1, -1680573600, 29053637, 12 - tz.transition 1940, 8, :o2, -927511200, 29158229, 12 - tz.transition 1942, 11, :o1, -857257200, 58335973, 24 - tz.transition 1943, 3, :o2, -844556400, 58339501, 24 - tz.transition 1943, 10, :o1, -828226800, 58344037, 24 - tz.transition 1944, 4, :o2, -812502000, 58348405, 24 - tz.transition 1944, 10, :o1, -796777200, 58352773, 24 - tz.transition 1945, 4, :o2, -781052400, 58357141, 24 - tz.transition 1945, 10, :o1, -765327600, 58361509, 24 - tz.transition 1959, 3, :o2, -340844400, 58479421, 24 - tz.transition 1959, 9, :o1, -324514800, 58483957, 24 - tz.transition 1960, 3, :o2, -308790000, 58488325, 24 - tz.transition 1960, 9, :o1, -293065200, 58492693, 24 - tz.transition 1961, 3, :o2, -277340400, 58497061, 24 - tz.transition 1961, 9, :o1, -261615600, 58501429, 24 - tz.transition 1962, 3, :o2, -245890800, 58505797, 24 - tz.transition 1962, 9, :o1, -230166000, 58510165, 24 - tz.transition 1963, 3, :o2, -214441200, 58514533, 24 - tz.transition 1963, 9, :o1, -198716400, 58518901, 24 - tz.transition 1964, 3, :o2, -182991600, 58523269, 24 - tz.transition 1964, 9, :o1, -166662000, 58527805, 24 - tz.transition 1965, 4, :o2, -147913200, 58533013, 24 - tz.transition 1965, 9, :o1, -135212400, 58536541, 24 - tz.transition 1980, 4, :o2, 323830800 - tz.transition 1980, 9, :o1, 338950800 - tz.transition 1981, 3, :o2, 354675600 - tz.transition 1981, 9, :o1, 370400400 - tz.transition 1982, 3, :o2, 386125200 - tz.transition 1982, 9, :o1, 401850000 - tz.transition 1983, 3, :o2, 417574800 - tz.transition 1983, 9, :o1, 433299600 - tz.transition 1984, 3, :o2, 449024400 - tz.transition 1984, 9, :o1, 465354000 - tz.transition 1985, 3, :o2, 481078800 - tz.transition 1985, 9, :o1, 496803600 - tz.transition 1986, 3, :o2, 512528400 - tz.transition 1986, 9, :o1, 528253200 - tz.transition 1987, 3, :o2, 543978000 - tz.transition 1987, 9, :o1, 559702800 - tz.transition 1988, 3, :o2, 575427600 - tz.transition 1988, 9, :o1, 591152400 - tz.transition 1989, 3, :o2, 606877200 - tz.transition 1989, 9, :o1, 622602000 - tz.transition 1990, 3, :o2, 638326800 - tz.transition 1990, 9, :o1, 654656400 - tz.transition 1991, 3, :o2, 670381200 - tz.transition 1991, 9, :o1, 686106000 - tz.transition 1992, 3, :o2, 701830800 - tz.transition 1992, 9, :o1, 717555600 - tz.transition 1993, 3, :o2, 733280400 - tz.transition 1993, 9, :o1, 749005200 - tz.transition 1994, 3, :o2, 764730000 - tz.transition 1994, 9, :o1, 780454800 - tz.transition 1995, 3, :o2, 796179600 - tz.transition 1995, 9, :o1, 811904400 - tz.transition 1996, 3, :o2, 828234000 - tz.transition 1996, 10, :o1, 846378000 - tz.transition 1997, 3, :o2, 859683600 - tz.transition 1997, 10, :o1, 877827600 - tz.transition 1998, 3, :o2, 891133200 - tz.transition 1998, 10, :o1, 909277200 - tz.transition 1999, 3, :o2, 922582800 - tz.transition 1999, 10, :o1, 941331600 - tz.transition 2000, 3, :o2, 954032400 - tz.transition 2000, 10, :o1, 972781200 - tz.transition 2001, 3, :o2, 985482000 - tz.transition 2001, 10, :o1, 1004230800 - tz.transition 2002, 3, :o2, 1017536400 - tz.transition 2002, 10, :o1, 1035680400 - tz.transition 2003, 3, :o2, 1048986000 - tz.transition 2003, 10, :o1, 1067130000 - tz.transition 2004, 3, :o2, 1080435600 - tz.transition 2004, 10, :o1, 1099184400 - 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 - tz.transition 2065, 3, :o2, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o1, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o2, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o1, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o2, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o1, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o2, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o1, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o2, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o1, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o2, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o1, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o2, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o1, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o2, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o1, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Oslo', 'Europe/Berlin' end end end diff --git a/lib/tzinfo/data/definitions/Europe/Simferopol.rb b/lib/tzinfo/data/definitions/Europe/Simferopol.rb index 1d0deef..71d28a6 100644 --- a/lib/tzinfo/data/definitions/Europe/Simferopol.rb +++ b/lib/tzinfo/data/definitions/Europe/Simferopol.rb @@ -55,9 +55,9 @@ module Simferopol tz.transition 1993, 9, :o2, 749001600 tz.transition 1994, 3, :o7, 764726400 tz.transition 1994, 4, :o6, 767739600 - tz.transition 1994, 9, :o3, 780436800 - tz.transition 1995, 3, :o6, 796165200 - tz.transition 1995, 9, :o3, 811886400 + tz.transition 1994, 9, :o3, 780447600 + tz.transition 1995, 3, :o6, 796172400 + tz.transition 1995, 9, :o3, 811897200 tz.transition 1996, 3, :o6, 828219600 tz.transition 1996, 10, :o3, 846374400 tz.transition 1997, 3, :o7, 859683600 diff --git a/lib/tzinfo/data/definitions/Europe/Stockholm.rb b/lib/tzinfo/data/definitions/Europe/Stockholm.rb index c9bf6be..3772aba 100644 --- a/lib/tzinfo/data/definitions/Europe/Stockholm.rb +++ b/lib/tzinfo/data/definitions/Europe/Stockholm.rb @@ -10,203 +10,7 @@ module Europe module Stockholm include TimezoneDefinition - timezone 'Europe/Stockholm' do |tz| - tz.offset :o0, 4332, 0, :LMT - tz.offset :o1, 3614, 0, :SET - tz.offset :o2, 3600, 0, :CET - tz.offset :o3, 3600, 3600, :CEST - - tz.transition 1878, 12, :o1, -2871681132, 17332923239, 7200 - tz.transition 1899, 12, :o2, -2208992414, 104328883793, 43200 - tz.transition 1916, 5, :o3, -1692496800, 29051981, 12 - tz.transition 1916, 9, :o2, -1680483600, 58107299, 24 - tz.transition 1980, 4, :o3, 323830800 - tz.transition 1980, 9, :o2, 338950800 - tz.transition 1981, 3, :o3, 354675600 - tz.transition 1981, 9, :o2, 370400400 - tz.transition 1982, 3, :o3, 386125200 - tz.transition 1982, 9, :o2, 401850000 - tz.transition 1983, 3, :o3, 417574800 - tz.transition 1983, 9, :o2, 433299600 - tz.transition 1984, 3, :o3, 449024400 - tz.transition 1984, 9, :o2, 465354000 - tz.transition 1985, 3, :o3, 481078800 - tz.transition 1985, 9, :o2, 496803600 - tz.transition 1986, 3, :o3, 512528400 - tz.transition 1986, 9, :o2, 528253200 - tz.transition 1987, 3, :o3, 543978000 - tz.transition 1987, 9, :o2, 559702800 - tz.transition 1988, 3, :o3, 575427600 - tz.transition 1988, 9, :o2, 591152400 - tz.transition 1989, 3, :o3, 606877200 - tz.transition 1989, 9, :o2, 622602000 - tz.transition 1990, 3, :o3, 638326800 - tz.transition 1990, 9, :o2, 654656400 - tz.transition 1991, 3, :o3, 670381200 - tz.transition 1991, 9, :o2, 686106000 - tz.transition 1992, 3, :o3, 701830800 - tz.transition 1992, 9, :o2, 717555600 - tz.transition 1993, 3, :o3, 733280400 - tz.transition 1993, 9, :o2, 749005200 - tz.transition 1994, 3, :o3, 764730000 - tz.transition 1994, 9, :o2, 780454800 - tz.transition 1995, 3, :o3, 796179600 - tz.transition 1995, 9, :o2, 811904400 - tz.transition 1996, 3, :o3, 828234000 - tz.transition 1996, 10, :o2, 846378000 - tz.transition 1997, 3, :o3, 859683600 - tz.transition 1997, 10, :o2, 877827600 - tz.transition 1998, 3, :o3, 891133200 - tz.transition 1998, 10, :o2, 909277200 - tz.transition 1999, 3, :o3, 922582800 - tz.transition 1999, 10, :o2, 941331600 - tz.transition 2000, 3, :o3, 954032400 - tz.transition 2000, 10, :o2, 972781200 - tz.transition 2001, 3, :o3, 985482000 - tz.transition 2001, 10, :o2, 1004230800 - tz.transition 2002, 3, :o3, 1017536400 - tz.transition 2002, 10, :o2, 1035680400 - tz.transition 2003, 3, :o3, 1048986000 - tz.transition 2003, 10, :o2, 1067130000 - tz.transition 2004, 3, :o3, 1080435600 - tz.transition 2004, 10, :o2, 1099184400 - tz.transition 2005, 3, :o3, 1111885200 - tz.transition 2005, 10, :o2, 1130634000 - tz.transition 2006, 3, :o3, 1143334800 - tz.transition 2006, 10, :o2, 1162083600 - tz.transition 2007, 3, :o3, 1174784400 - tz.transition 2007, 10, :o2, 1193533200 - tz.transition 2008, 3, :o3, 1206838800 - tz.transition 2008, 10, :o2, 1224982800 - tz.transition 2009, 3, :o3, 1238288400 - tz.transition 2009, 10, :o2, 1256432400 - tz.transition 2010, 3, :o3, 1269738000 - tz.transition 2010, 10, :o2, 1288486800 - tz.transition 2011, 3, :o3, 1301187600 - tz.transition 2011, 10, :o2, 1319936400 - tz.transition 2012, 3, :o3, 1332637200 - tz.transition 2012, 10, :o2, 1351386000 - tz.transition 2013, 3, :o3, 1364691600 - tz.transition 2013, 10, :o2, 1382835600 - tz.transition 2014, 3, :o3, 1396141200 - tz.transition 2014, 10, :o2, 1414285200 - tz.transition 2015, 3, :o3, 1427590800 - tz.transition 2015, 10, :o2, 1445734800 - tz.transition 2016, 3, :o3, 1459040400 - tz.transition 2016, 10, :o2, 1477789200 - tz.transition 2017, 3, :o3, 1490490000 - tz.transition 2017, 10, :o2, 1509238800 - tz.transition 2018, 3, :o3, 1521939600 - tz.transition 2018, 10, :o2, 1540688400 - tz.transition 2019, 3, :o3, 1553994000 - tz.transition 2019, 10, :o2, 1572138000 - tz.transition 2020, 3, :o3, 1585443600 - tz.transition 2020, 10, :o2, 1603587600 - tz.transition 2021, 3, :o3, 1616893200 - tz.transition 2021, 10, :o2, 1635642000 - tz.transition 2022, 3, :o3, 1648342800 - tz.transition 2022, 10, :o2, 1667091600 - tz.transition 2023, 3, :o3, 1679792400 - tz.transition 2023, 10, :o2, 1698541200 - tz.transition 2024, 3, :o3, 1711846800 - tz.transition 2024, 10, :o2, 1729990800 - tz.transition 2025, 3, :o3, 1743296400 - tz.transition 2025, 10, :o2, 1761440400 - tz.transition 2026, 3, :o3, 1774746000 - tz.transition 2026, 10, :o2, 1792890000 - tz.transition 2027, 3, :o3, 1806195600 - tz.transition 2027, 10, :o2, 1824944400 - tz.transition 2028, 3, :o3, 1837645200 - tz.transition 2028, 10, :o2, 1856394000 - tz.transition 2029, 3, :o3, 1869094800 - tz.transition 2029, 10, :o2, 1887843600 - tz.transition 2030, 3, :o3, 1901149200 - tz.transition 2030, 10, :o2, 1919293200 - tz.transition 2031, 3, :o3, 1932598800 - tz.transition 2031, 10, :o2, 1950742800 - tz.transition 2032, 3, :o3, 1964048400 - tz.transition 2032, 10, :o2, 1982797200 - tz.transition 2033, 3, :o3, 1995498000 - tz.transition 2033, 10, :o2, 2014246800 - tz.transition 2034, 3, :o3, 2026947600 - tz.transition 2034, 10, :o2, 2045696400 - tz.transition 2035, 3, :o3, 2058397200 - tz.transition 2035, 10, :o2, 2077146000 - tz.transition 2036, 3, :o3, 2090451600 - tz.transition 2036, 10, :o2, 2108595600 - tz.transition 2037, 3, :o3, 2121901200 - tz.transition 2037, 10, :o2, 2140045200 - tz.transition 2038, 3, :o3, 2153350800, 59172253, 24 - tz.transition 2038, 10, :o2, 2172099600, 59177461, 24 - tz.transition 2039, 3, :o3, 2184800400, 59180989, 24 - tz.transition 2039, 10, :o2, 2203549200, 59186197, 24 - tz.transition 2040, 3, :o3, 2216250000, 59189725, 24 - tz.transition 2040, 10, :o2, 2234998800, 59194933, 24 - tz.transition 2041, 3, :o3, 2248304400, 59198629, 24 - tz.transition 2041, 10, :o2, 2266448400, 59203669, 24 - tz.transition 2042, 3, :o3, 2279754000, 59207365, 24 - tz.transition 2042, 10, :o2, 2297898000, 59212405, 24 - tz.transition 2043, 3, :o3, 2311203600, 59216101, 24 - tz.transition 2043, 10, :o2, 2329347600, 59221141, 24 - tz.transition 2044, 3, :o3, 2342653200, 59224837, 24 - tz.transition 2044, 10, :o2, 2361402000, 59230045, 24 - tz.transition 2045, 3, :o3, 2374102800, 59233573, 24 - tz.transition 2045, 10, :o2, 2392851600, 59238781, 24 - tz.transition 2046, 3, :o3, 2405552400, 59242309, 24 - tz.transition 2046, 10, :o2, 2424301200, 59247517, 24 - tz.transition 2047, 3, :o3, 2437606800, 59251213, 24 - tz.transition 2047, 10, :o2, 2455750800, 59256253, 24 - tz.transition 2048, 3, :o3, 2469056400, 59259949, 24 - tz.transition 2048, 10, :o2, 2487200400, 59264989, 24 - tz.transition 2049, 3, :o3, 2500506000, 59268685, 24 - tz.transition 2049, 10, :o2, 2519254800, 59273893, 24 - tz.transition 2050, 3, :o3, 2531955600, 59277421, 24 - tz.transition 2050, 10, :o2, 2550704400, 59282629, 24 - tz.transition 2051, 3, :o3, 2563405200, 59286157, 24 - tz.transition 2051, 10, :o2, 2582154000, 59291365, 24 - tz.transition 2052, 3, :o3, 2595459600, 59295061, 24 - tz.transition 2052, 10, :o2, 2613603600, 59300101, 24 - tz.transition 2053, 3, :o3, 2626909200, 59303797, 24 - tz.transition 2053, 10, :o2, 2645053200, 59308837, 24 - tz.transition 2054, 3, :o3, 2658358800, 59312533, 24 - tz.transition 2054, 10, :o2, 2676502800, 59317573, 24 - tz.transition 2055, 3, :o3, 2689808400, 59321269, 24 - tz.transition 2055, 10, :o2, 2708557200, 59326477, 24 - tz.transition 2056, 3, :o3, 2721258000, 59330005, 24 - tz.transition 2056, 10, :o2, 2740006800, 59335213, 24 - tz.transition 2057, 3, :o3, 2752707600, 59338741, 24 - tz.transition 2057, 10, :o2, 2771456400, 59343949, 24 - tz.transition 2058, 3, :o3, 2784762000, 59347645, 24 - tz.transition 2058, 10, :o2, 2802906000, 59352685, 24 - tz.transition 2059, 3, :o3, 2816211600, 59356381, 24 - tz.transition 2059, 10, :o2, 2834355600, 59361421, 24 - tz.transition 2060, 3, :o3, 2847661200, 59365117, 24 - tz.transition 2060, 10, :o2, 2866410000, 59370325, 24 - tz.transition 2061, 3, :o3, 2879110800, 59373853, 24 - tz.transition 2061, 10, :o2, 2897859600, 59379061, 24 - tz.transition 2062, 3, :o3, 2910560400, 59382589, 24 - tz.transition 2062, 10, :o2, 2929309200, 59387797, 24 - tz.transition 2063, 3, :o3, 2942010000, 59391325, 24 - tz.transition 2063, 10, :o2, 2960758800, 59396533, 24 - tz.transition 2064, 3, :o3, 2974064400, 59400229, 24 - tz.transition 2064, 10, :o2, 2992208400, 59405269, 24 - tz.transition 2065, 3, :o3, 3005514000, 59408965, 24 - tz.transition 2065, 10, :o2, 3023658000, 59414005, 24 - tz.transition 2066, 3, :o3, 3036963600, 59417701, 24 - tz.transition 2066, 10, :o2, 3055712400, 59422909, 24 - tz.transition 2067, 3, :o3, 3068413200, 59426437, 24 - tz.transition 2067, 10, :o2, 3087162000, 59431645, 24 - tz.transition 2068, 3, :o3, 3099862800, 59435173, 24 - tz.transition 2068, 10, :o2, 3118611600, 59440381, 24 - tz.transition 2069, 3, :o3, 3131917200, 59444077, 24 - tz.transition 2069, 10, :o2, 3150061200, 59449117, 24 - tz.transition 2070, 3, :o3, 3163366800, 59452813, 24 - tz.transition 2070, 10, :o2, 3181510800, 59457853, 24 - tz.transition 2071, 3, :o3, 3194816400, 59461549, 24 - tz.transition 2071, 10, :o2, 3212960400, 59466589, 24 - tz.transition 2072, 3, :o3, 3226266000, 59470285, 24 - tz.transition 2072, 10, :o2, 3245014800, 59475493, 24 - end + linked_timezone 'Europe/Stockholm', 'Europe/Berlin' end end end diff --git a/lib/tzinfo/data/definitions/Iceland.rb b/lib/tzinfo/data/definitions/Iceland.rb index e8ac71c..fdcf2b9 100644 --- a/lib/tzinfo/data/definitions/Iceland.rb +++ b/lib/tzinfo/data/definitions/Iceland.rb @@ -9,7 +9,7 @@ module Definitions module Iceland include TimezoneDefinition - linked_timezone 'Iceland', 'Atlantic/Reykjavik' + linked_timezone 'Iceland', 'Africa/Abidjan' end end end diff --git a/lib/tzinfo/data/definitions/Indian/Christmas.rb b/lib/tzinfo/data/definitions/Indian/Christmas.rb index befaba8..e61e215 100644 --- a/lib/tzinfo/data/definitions/Indian/Christmas.rb +++ b/lib/tzinfo/data/definitions/Indian/Christmas.rb @@ -10,12 +10,7 @@ module Indian module Christmas include TimezoneDefinition - timezone 'Indian/Christmas' do |tz| - tz.offset :o0, 25372, 0, :LMT - tz.offset :o1, 25200, 0, :'+07' - - tz.transition 1895, 1, :o1, -2364102172, 52125664457, 21600 - end + linked_timezone 'Indian/Christmas', 'Asia/Bangkok' end end end diff --git a/lib/tzinfo/data/definitions/Indian/Cocos.rb b/lib/tzinfo/data/definitions/Indian/Cocos.rb index 942a432..f0a2002 100644 --- a/lib/tzinfo/data/definitions/Indian/Cocos.rb +++ b/lib/tzinfo/data/definitions/Indian/Cocos.rb @@ -10,12 +10,7 @@ module Indian module Cocos include TimezoneDefinition - timezone 'Indian/Cocos' do |tz| - tz.offset :o0, 23260, 0, :LMT - tz.offset :o1, 23400, 0, :'+0630' - - tz.transition 1899, 12, :o1, -2209012060, 10432887397, 4320 - end + linked_timezone 'Indian/Cocos', 'Asia/Yangon' end end end diff --git a/lib/tzinfo/data/definitions/Indian/Kerguelen.rb b/lib/tzinfo/data/definitions/Indian/Kerguelen.rb index 2ed7672..7b65ff5 100644 --- a/lib/tzinfo/data/definitions/Indian/Kerguelen.rb +++ b/lib/tzinfo/data/definitions/Indian/Kerguelen.rb @@ -10,12 +10,7 @@ module Indian module Kerguelen include TimezoneDefinition - timezone 'Indian/Kerguelen' do |tz| - tz.offset :o0, 0, 0, :'-00' - tz.offset :o1, 18000, 0, :'+05' - - tz.transition 1950, 1, :o1, -631152000, 4866565, 2 - end + linked_timezone 'Indian/Kerguelen', 'Indian/Maldives' end end end diff --git a/lib/tzinfo/data/definitions/Indian/Mahe.rb b/lib/tzinfo/data/definitions/Indian/Mahe.rb index 8b0eac8..d72a916 100644 --- a/lib/tzinfo/data/definitions/Indian/Mahe.rb +++ b/lib/tzinfo/data/definitions/Indian/Mahe.rb @@ -10,12 +10,7 @@ module Indian module Mahe include TimezoneDefinition - timezone 'Indian/Mahe' do |tz| - tz.offset :o0, 13308, 0, :LMT - tz.offset :o1, 14400, 0, :'+04' - - tz.transition 1906, 12, :o1, -1988163708, 17406549691, 7200 - end + linked_timezone 'Indian/Mahe', 'Asia/Dubai' end end end diff --git a/lib/tzinfo/data/definitions/Indian/Reunion.rb b/lib/tzinfo/data/definitions/Indian/Reunion.rb index 3157910..5e6af8b 100644 --- a/lib/tzinfo/data/definitions/Indian/Reunion.rb +++ b/lib/tzinfo/data/definitions/Indian/Reunion.rb @@ -10,12 +10,7 @@ module Indian module Reunion include TimezoneDefinition - timezone 'Indian/Reunion' do |tz| - tz.offset :o0, 13312, 0, :LMT - tz.offset :o1, 14400, 0, :'+04' - - tz.transition 1911, 5, :o1, -1848886912, 3265904267, 1350 - end + linked_timezone 'Indian/Reunion', 'Asia/Dubai' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Chuuk.rb b/lib/tzinfo/data/definitions/Pacific/Chuuk.rb index 1fc30c8..f6e4b28 100644 --- a/lib/tzinfo/data/definitions/Pacific/Chuuk.rb +++ b/lib/tzinfo/data/definitions/Pacific/Chuuk.rb @@ -10,19 +10,7 @@ module Pacific module Chuuk include TimezoneDefinition - timezone 'Pacific/Chuuk' do |tz| - tz.offset :o0, -49972, 0, :LMT - tz.offset :o1, 36428, 0, :LMT - tz.offset :o2, 36000, 0, :'+10' - tz.offset :o3, 32400, 0, :'+09' - - tz.transition 1844, 12, :o1, -3944628428, 51730532893, 21600 - tz.transition 1900, 12, :o2, -2177489228, 52172317693, 21600 - tz.transition 1914, 9, :o3, -1743674400, 29044873, 12 - tz.transition 1919, 1, :o2, -1606813200, 19375921, 8 - tz.transition 1941, 3, :o3, -907408800, 29161021, 12 - tz.transition 1945, 7, :o2, -770634000, 19453345, 8 - end + linked_timezone 'Pacific/Chuuk', 'Pacific/Port_Moresby' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Easter.rb b/lib/tzinfo/data/definitions/Pacific/Easter.rb index 0575632..f741ed9 100644 --- a/lib/tzinfo/data/definitions/Pacific/Easter.rb +++ b/lib/tzinfo/data/definitions/Pacific/Easter.rb @@ -126,7 +126,7 @@ module Easter tz.transition 2021, 4, :o4, 1617505200 tz.transition 2021, 9, :o5, 1630814400 tz.transition 2022, 4, :o4, 1648954800 - tz.transition 2022, 9, :o5, 1662264000 + tz.transition 2022, 9, :o5, 1662868800 tz.transition 2023, 4, :o4, 1680404400 tz.transition 2023, 9, :o5, 1693713600 tz.transition 2024, 4, :o4, 1712458800 diff --git a/lib/tzinfo/data/definitions/Pacific/Funafuti.rb b/lib/tzinfo/data/definitions/Pacific/Funafuti.rb index 1459323..bf5c359 100644 --- a/lib/tzinfo/data/definitions/Pacific/Funafuti.rb +++ b/lib/tzinfo/data/definitions/Pacific/Funafuti.rb @@ -10,12 +10,7 @@ module Pacific module Funafuti include TimezoneDefinition - timezone 'Pacific/Funafuti' do |tz| - tz.offset :o0, 43012, 0, :LMT - tz.offset :o1, 43200, 0, :'+12' - - tz.transition 1900, 12, :o1, -2177495812, 52172316047, 21600 - end + linked_timezone 'Pacific/Funafuti', 'Pacific/Tarawa' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Majuro.rb b/lib/tzinfo/data/definitions/Pacific/Majuro.rb index 79d9d24..0a69a3a 100644 --- a/lib/tzinfo/data/definitions/Pacific/Majuro.rb +++ b/lib/tzinfo/data/definitions/Pacific/Majuro.rb @@ -10,21 +10,7 @@ module Pacific module Majuro include TimezoneDefinition - timezone 'Pacific/Majuro' do |tz| - tz.offset :o0, 41088, 0, :LMT - tz.offset :o1, 39600, 0, :'+11' - tz.offset :o2, 32400, 0, :'+09' - tz.offset :o3, 36000, 0, :'+10' - tz.offset :o4, 43200, 0, :'+12' - - tz.transition 1900, 12, :o1, -2177493888, 1086923261, 450 - tz.transition 1914, 9, :o2, -1743678000, 58089745, 24 - tz.transition 1919, 1, :o1, -1606813200, 19375921, 8 - tz.transition 1936, 12, :o3, -1041418800, 58284817, 24 - tz.transition 1941, 3, :o2, -907408800, 29161021, 12 - tz.transition 1944, 1, :o1, -818067600, 19448953, 8 - tz.transition 1969, 9, :o4, -7988400, 58571881, 24 - end + linked_timezone 'Pacific/Majuro', 'Pacific/Tarawa' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Pohnpei.rb b/lib/tzinfo/data/definitions/Pacific/Pohnpei.rb index 450e318..993a2d8 100644 --- a/lib/tzinfo/data/definitions/Pacific/Pohnpei.rb +++ b/lib/tzinfo/data/definitions/Pacific/Pohnpei.rb @@ -10,21 +10,7 @@ module Pacific module Pohnpei include TimezoneDefinition - timezone 'Pacific/Pohnpei' do |tz| - tz.offset :o0, -48428, 0, :LMT - tz.offset :o1, 37972, 0, :LMT - tz.offset :o2, 39600, 0, :'+11' - tz.offset :o3, 32400, 0, :'+09' - tz.offset :o4, 36000, 0, :'+10' - - tz.transition 1844, 12, :o1, -3944629972, 51730532507, 21600 - tz.transition 1900, 12, :o2, -2177490772, 52172317307, 21600 - tz.transition 1914, 9, :o3, -1743678000, 58089745, 24 - tz.transition 1919, 1, :o2, -1606813200, 19375921, 8 - tz.transition 1936, 12, :o4, -1041418800, 58284817, 24 - tz.transition 1941, 3, :o3, -907408800, 29161021, 12 - tz.transition 1945, 7, :o2, -770634000, 19453345, 8 - end + linked_timezone 'Pacific/Pohnpei', 'Pacific/Guadalcanal' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Ponape.rb b/lib/tzinfo/data/definitions/Pacific/Ponape.rb index 447bb9c..86956c9 100644 --- a/lib/tzinfo/data/definitions/Pacific/Ponape.rb +++ b/lib/tzinfo/data/definitions/Pacific/Ponape.rb @@ -10,7 +10,7 @@ module Pacific module Ponape include TimezoneDefinition - linked_timezone 'Pacific/Ponape', 'Pacific/Pohnpei' + linked_timezone 'Pacific/Ponape', 'Pacific/Guadalcanal' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Truk.rb b/lib/tzinfo/data/definitions/Pacific/Truk.rb index 7f65b99..ae697dc 100644 --- a/lib/tzinfo/data/definitions/Pacific/Truk.rb +++ b/lib/tzinfo/data/definitions/Pacific/Truk.rb @@ -10,7 +10,7 @@ module Pacific module Truk include TimezoneDefinition - linked_timezone 'Pacific/Truk', 'Pacific/Chuuk' + linked_timezone 'Pacific/Truk', 'Pacific/Port_Moresby' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Wake.rb b/lib/tzinfo/data/definitions/Pacific/Wake.rb index 13ea9e7..9ab0072 100644 --- a/lib/tzinfo/data/definitions/Pacific/Wake.rb +++ b/lib/tzinfo/data/definitions/Pacific/Wake.rb @@ -10,12 +10,7 @@ module Pacific module Wake include TimezoneDefinition - timezone 'Pacific/Wake' do |tz| - tz.offset :o0, 39988, 0, :LMT - tz.offset :o1, 43200, 0, :'+12' - - tz.transition 1900, 12, :o1, -2177492788, 52172316803, 21600 - end + linked_timezone 'Pacific/Wake', 'Pacific/Tarawa' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Wallis.rb b/lib/tzinfo/data/definitions/Pacific/Wallis.rb index bfd6195..317d910 100644 --- a/lib/tzinfo/data/definitions/Pacific/Wallis.rb +++ b/lib/tzinfo/data/definitions/Pacific/Wallis.rb @@ -10,12 +10,7 @@ module Pacific module Wallis include TimezoneDefinition - timezone 'Pacific/Wallis' do |tz| - tz.offset :o0, 44120, 0, :LMT - tz.offset :o1, 43200, 0, :'+12' - - tz.transition 1900, 12, :o1, -2177496920, 5217231577, 2160 - end + linked_timezone 'Pacific/Wallis', 'Pacific/Tarawa' end end end diff --git a/lib/tzinfo/data/definitions/Pacific/Yap.rb b/lib/tzinfo/data/definitions/Pacific/Yap.rb index adaf622..1dc8007 100644 --- a/lib/tzinfo/data/definitions/Pacific/Yap.rb +++ b/lib/tzinfo/data/definitions/Pacific/Yap.rb @@ -10,7 +10,7 @@ module Pacific module Yap include TimezoneDefinition - linked_timezone 'Pacific/Yap', 'Pacific/Chuuk' + linked_timezone 'Pacific/Yap', 'Pacific/Port_Moresby' end end end diff --git a/lib/tzinfo/data/indexes/countries.rb b/lib/tzinfo/data/indexes/countries.rb index 39252e9..9beb276 100644 --- a/lib/tzinfo/data/indexes/countries.rb +++ b/lib/tzinfo/data/indexes/countries.rb @@ -13,7 +13,7 @@ module Countries c.timezone 'Europe/Andorra', 85, 2, 91, 60 end country 'AE', 'United Arab Emirates' do |c| - c.timezone 'Asia/Dubai', 253, 10, 553, 10 + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is' end country 'AF', 'Afghanistan' do |c| c.timezone 'Asia/Kabul', 2071, 60, 346, 5 @@ -40,9 +40,9 @@ module Countries c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer' c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera' c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll' - c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok' + c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok' c.timezone 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time' - c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Dumont d\'Urville' + c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville' c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa' end country 'AR', 'Argentina' do |c| @@ -122,7 +122,7 @@ module Countries c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30 end country 'BN', 'Brunei' do |c| - c.timezone 'Asia/Brunei', 74, 15, 1379, 12 + c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei' end country 'BO', 'Bolivia' do |c| c.timezone 'America/La_Paz', -33, 2, -1363, 20 @@ -185,7 +185,7 @@ module Countries c.timezone 'America/Cambridge_Bay', 24881, 360, -37819, 360, 'Mountain - NU (west)' c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain - NT (central)' c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain - NT (west)' - c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)' + c.timezone 'America/Dawson_Creek', 1673, 30, -3607, 30, 'MST - BC (Dawson Cr, Ft St John)' c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'MST - BC (Ft Nelson)' c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'MST - Yukon (east)' c.timezone 'America/Dawson', 961, 15, -1673, 12, 'MST - Yukon (west)' @@ -195,7 +195,7 @@ module Countries c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo), Creston BC' end country 'CC', 'Cocos (Keeling) Islands' do |c| - c.timezone 'Indian/Cocos', -73, 6, 1163, 12 + c.timezone 'Asia/Yangon', 1007, 60, 577, 6 end country 'CD', 'Congo (Dem. Rep.)' do |c| c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' @@ -226,7 +226,7 @@ module Countries end country 'CN', 'China' do |c| c.timezone 'Asia/Shanghai', 937, 30, 1822, 15, 'Beijing Time' - c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time' + c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok' end country 'CO', 'Colombia' do |c| c.timezone 'America/Bogota', 23, 5, -889, 12 @@ -244,7 +244,7 @@ module Countries c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'CX', 'Christmas Island' do |c| - c.timezone 'Indian/Christmas', -125, 12, 6343, 60 + c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' end country 'CY', 'Cyprus' do |c| c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)' @@ -254,14 +254,14 @@ module Countries c.timezone 'Europe/Prague', 601, 12, 433, 30 end country 'DE', 'Germany' do |c| - c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas)' + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia' c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time' end country 'DJ', 'Djibouti' do |c| c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 end country 'DK', 'Denmark' do |c| - c.timezone 'Europe/Copenhagen', 167, 3, 151, 12 + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia' end country 'DM', 'Dominica' do |c| c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' @@ -306,9 +306,9 @@ module Countries c.timezone 'Atlantic/Stanley', -517, 10, -1157, 20 end country 'FM', 'Micronesia' do |c| - c.timezone 'Pacific/Chuuk', 89, 12, 9107, 60, 'Chuuk/Truk, Yap' - c.timezone 'Pacific/Pohnpei', 209, 30, 9493, 60, 'Pohnpei/Ponape' c.timezone 'Pacific/Kosrae', 319, 60, 9779, 60, 'Kosrae' + c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville' + c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei' end country 'FO', 'Faroe Islands' do |c| c.timezone 'Atlantic/Faroe', 3721, 60, -203, 30 @@ -420,7 +420,7 @@ module Countries c.timezone 'Asia/Tehran', 107, 3, 1543, 30 end country 'IS', 'Iceland' do |c| - c.timezone 'Atlantic/Reykjavik', 1283, 20, -437, 20 + c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'IT', 'Italy' do |c| c.timezone 'Europe/Rome', 419, 10, 749, 60 @@ -447,7 +447,7 @@ module Countries c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' end country 'KI', 'Kiribati' do |c| - c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands' + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake' c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands' c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands' end @@ -503,7 +503,7 @@ module Countries c.timezone 'Europe/Vilnius', 3281, 60, 1519, 60 end country 'LU', 'Luxembourg' do |c| - c.timezone 'Europe/Luxembourg', 248, 5, 123, 20 + c.timezone 'Europe/Brussels', 305, 6, 13, 3 end country 'LV', 'Latvia' do |c| c.timezone 'Europe/Riga', 1139, 20, 241, 10 @@ -515,7 +515,7 @@ module Countries c.timezone 'Africa/Casablanca', 673, 20, -91, 12 end country 'MC', 'Monaco' do |c| - c.timezone 'Europe/Monaco', 437, 10, 443, 60 + c.timezone 'Europe/Paris', 733, 15, 7, 3 end country 'MD', 'Moldova' do |c| c.timezone 'Europe/Chisinau', 47, 1, 173, 6 @@ -530,8 +530,8 @@ module Countries c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 end country 'MH', 'Marshall Islands' do |c| - c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'Marshall Islands (most areas)' c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein' + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake' end country 'MK', 'North Macedonia' do |c| c.timezone 'Europe/Belgrade', 269, 6, 41, 2 @@ -569,7 +569,7 @@ module Countries c.timezone 'Indian/Mauritius', -121, 6, 115, 2 end country 'MV', 'Maldives' do |c| - c.timezone 'Indian/Maldives', 25, 6, 147, 2 + c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I' end country 'MW', 'Malawi' do |c| c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' @@ -588,8 +588,7 @@ module Countries c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Central Time - Bahía de Banderas' end country 'MY', 'Malaysia' do |c| - c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'Malaysia (peninsula)' - c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak' + c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak, Brunei' c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia' end country 'MZ', 'Mozambique' do |c| @@ -614,10 +613,10 @@ module Countries c.timezone 'America/Managua', 243, 20, -5177, 60 end country 'NL', 'Netherlands' do |c| - c.timezone 'Europe/Amsterdam', 1571, 30, 49, 10 + c.timezone 'Europe/Brussels', 305, 6, 13, 3 end country 'NO', 'Norway' do |c| - c.timezone 'Europe/Oslo', 719, 12, 43, 4 + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia' end country 'NP', 'Nepal' do |c| c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60 @@ -633,7 +632,7 @@ module Countries c.timezone 'Pacific/Chatham', -879, 20, -3531, 20, 'Chatham Islands' end country 'OM', 'Oman' do |c| - c.timezone 'Asia/Dubai', 253, 10, 553, 10 + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is' end country 'PA', 'Panama' do |c| c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - Panama, Cayman, ON (Atikokan), NU (Coral H)' @@ -647,7 +646,7 @@ module Countries c.timezone 'Pacific/Gambier', -347, 15, -2699, 20, 'Gambier Islands' end country 'PG', 'Papua New Guinea' do |c| - c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Dumont d\'Urville' + c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville' c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville' end country 'PH', 'Philippines' do |c| @@ -687,7 +686,7 @@ module Countries c.timezone 'Asia/Qatar', 1517, 60, 773, 15 end country 'RE', 'Réunion' do |c| - c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands' + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is' end country 'RO', 'Romania' do |c| c.timezone 'Europe/Bucharest', 1333, 30, 261, 10 @@ -731,16 +730,16 @@ module Countries c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Arabia, Syowa' end country 'SB', 'Solomon Islands' do |c| - c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5 + c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Solomons, Pohnpei' end country 'SC', 'Seychelles' do |c| - c.timezone 'Indian/Mahe', -14, 3, 832, 15 + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is' end country 'SD', 'Sudan' do |c| c.timezone 'Africa/Khartoum', 78, 5, 488, 15 end country 'SE', 'Sweden' do |c| - c.timezone 'Europe/Stockholm', 178, 3, 361, 20 + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia' end country 'SG', 'Singapore' do |c| c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'Singapore, peninsular Malaysia' @@ -752,7 +751,7 @@ module Countries c.timezone 'Europe/Belgrade', 269, 6, 41, 2 end country 'SJ', 'Svalbard & Jan Mayen' do |c| - c.timezone 'Europe/Oslo', 719, 12, 43, 4 + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas), Scandinavia' end country 'SK', 'Slovakia' do |c| c.timezone 'Europe/Prague', 601, 12, 433, 30 @@ -797,8 +796,8 @@ module Countries c.timezone 'Africa/Ndjamena', 727, 60, 301, 20 end country 'TF', 'French Southern & Antarctic Lands' do |c| - c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400, 'Kerguelen, St Paul Island, Amsterdam Island' - c.timezone 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands' + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'UAE, Oman, Réunion, Seychelles, Crozet, Scattered Is' + c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Maldives, Kerguelen, St Paul I, Amsterdam I' end country 'TG', 'Togo' do |c| c.timezone 'Africa/Abidjan', 319, 60, -121, 30 @@ -831,7 +830,7 @@ module Countries c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'TV', 'Tuvalu' do |c| - c.timezone 'Pacific/Funafuti', -511, 60, 10753, 60 + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake' end country 'TW', 'Taiwan' do |c| c.timezone 'Asia/Taipei', 501, 20, 243, 2 @@ -840,7 +839,7 @@ module Countries c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 end country 'UA', 'Ukraine' do |c| - c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'Ukraine (most areas)' + c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'Ukraine (most areas)' c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Transcarpathia' c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozhye and east Lugansk' c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea' @@ -849,8 +848,8 @@ module Countries c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 end country 'UM', 'US minor outlying islands' do |c| - c.timezone 'Pacific/Wake', 1157, 60, 9997, 60, 'Wake Island' c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway' + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake' c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii' end country 'US', 'United States' do |c| @@ -914,7 +913,7 @@ module Countries c.timezone 'Pacific/Efate', -53, 3, 2021, 12 end country 'WF', 'Wallis & Futuna' do |c| - c.timezone 'Pacific/Wallis', -133, 10, -1057, 6 + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Tuvalu, Wallis & Futuna, Wake' end country 'WS', 'Samoa (western)' do |c| c.timezone 'Pacific/Apia', -83, 6, -2576, 15 diff --git a/lib/tzinfo/data/indexes/timezones.rb b/lib/tzinfo/data/indexes/timezones.rb index 267bd92..3bbadda 100644 --- a/lib/tzinfo/data/indexes/timezones.rb +++ b/lib/tzinfo/data/indexes/timezones.rb @@ -241,7 +241,7 @@ module Timezones linked_timezone 'Antarctica/South_Pole' linked_timezone 'Antarctica/Syowa' timezone 'Antarctica/Troll' - timezone 'Antarctica/Vostok' + linked_timezone 'Antarctica/Vostok' linked_timezone 'Arctic/Longyearbyen' linked_timezone 'Asia/Aden' timezone 'Asia/Almaty' @@ -259,7 +259,7 @@ module Timezones timezone 'Asia/Barnaul' timezone 'Asia/Beirut' timezone 'Asia/Bishkek' - timezone 'Asia/Brunei' + linked_timezone 'Asia/Brunei' linked_timezone 'Asia/Calcutta' timezone 'Asia/Chita' timezone 'Asia/Choibalsan' @@ -293,7 +293,7 @@ module Timezones timezone 'Asia/Khandyga' timezone 'Asia/Kolkata' timezone 'Asia/Krasnoyarsk' - timezone 'Asia/Kuala_Lumpur' + linked_timezone 'Asia/Kuala_Lumpur' timezone 'Asia/Kuching' linked_timezone 'Asia/Kuwait' linked_timezone 'Asia/Macao' @@ -350,7 +350,7 @@ module Timezones timezone 'Atlantic/Faroe' linked_timezone 'Atlantic/Jan_Mayen' timezone 'Atlantic/Madeira' - timezone 'Atlantic/Reykjavik' + linked_timezone 'Atlantic/Reykjavik' timezone 'Atlantic/South_Georgia' linked_timezone 'Atlantic/St_Helena' timezone 'Atlantic/Stanley' @@ -434,7 +434,7 @@ module Timezones timezone 'Etc/UTC' linked_timezone 'Etc/Universal' linked_timezone 'Etc/Zulu' - timezone 'Europe/Amsterdam' + linked_timezone 'Europe/Amsterdam' timezone 'Europe/Andorra' timezone 'Europe/Astrakhan' timezone 'Europe/Athens' @@ -447,7 +447,7 @@ module Timezones timezone 'Europe/Budapest' linked_timezone 'Europe/Busingen' timezone 'Europe/Chisinau' - timezone 'Europe/Copenhagen' + linked_timezone 'Europe/Copenhagen' timezone 'Europe/Dublin' timezone 'Europe/Gibraltar' linked_timezone 'Europe/Guernsey' @@ -456,20 +456,21 @@ module Timezones timezone 'Europe/Istanbul' linked_timezone 'Europe/Jersey' timezone 'Europe/Kaliningrad' - timezone 'Europe/Kiev' + linked_timezone 'Europe/Kiev' timezone 'Europe/Kirov' + timezone 'Europe/Kyiv' timezone 'Europe/Lisbon' linked_timezone 'Europe/Ljubljana' timezone 'Europe/London' - timezone 'Europe/Luxembourg' + linked_timezone 'Europe/Luxembourg' timezone 'Europe/Madrid' timezone 'Europe/Malta' linked_timezone 'Europe/Mariehamn' timezone 'Europe/Minsk' - timezone 'Europe/Monaco' + linked_timezone 'Europe/Monaco' timezone 'Europe/Moscow' linked_timezone 'Europe/Nicosia' - timezone 'Europe/Oslo' + linked_timezone 'Europe/Oslo' timezone 'Europe/Paris' linked_timezone 'Europe/Podgorica' timezone 'Europe/Prague' @@ -482,7 +483,7 @@ module Timezones timezone 'Europe/Simferopol' linked_timezone 'Europe/Skopje' timezone 'Europe/Sofia' - timezone 'Europe/Stockholm' + linked_timezone 'Europe/Stockholm' timezone 'Europe/Tallinn' timezone 'Europe/Tirane' linked_timezone 'Europe/Tiraspol' @@ -510,15 +511,15 @@ module Timezones linked_timezone 'Iceland' linked_timezone 'Indian/Antananarivo' timezone 'Indian/Chagos' - timezone 'Indian/Christmas' - timezone 'Indian/Cocos' + linked_timezone 'Indian/Christmas' + linked_timezone 'Indian/Cocos' linked_timezone 'Indian/Comoro' - timezone 'Indian/Kerguelen' - timezone 'Indian/Mahe' + linked_timezone 'Indian/Kerguelen' + linked_timezone 'Indian/Mahe' timezone 'Indian/Maldives' timezone 'Indian/Mauritius' linked_timezone 'Indian/Mayotte' - timezone 'Indian/Reunion' + linked_timezone 'Indian/Reunion' linked_timezone 'Iran' linked_timezone 'Israel' linked_timezone 'Jamaica' @@ -540,13 +541,13 @@ module Timezones timezone 'Pacific/Auckland' timezone 'Pacific/Bougainville' timezone 'Pacific/Chatham' - timezone 'Pacific/Chuuk' + linked_timezone 'Pacific/Chuuk' timezone 'Pacific/Easter' timezone 'Pacific/Efate' linked_timezone 'Pacific/Enderbury' timezone 'Pacific/Fakaofo' timezone 'Pacific/Fiji' - timezone 'Pacific/Funafuti' + linked_timezone 'Pacific/Funafuti' timezone 'Pacific/Galapagos' timezone 'Pacific/Gambier' timezone 'Pacific/Guadalcanal' @@ -557,7 +558,7 @@ module Timezones timezone 'Pacific/Kiritimati' timezone 'Pacific/Kosrae' timezone 'Pacific/Kwajalein' - timezone 'Pacific/Majuro' + linked_timezone 'Pacific/Majuro' timezone 'Pacific/Marquesas' linked_timezone 'Pacific/Midway' timezone 'Pacific/Nauru' @@ -567,7 +568,7 @@ module Timezones timezone 'Pacific/Pago_Pago' timezone 'Pacific/Palau' timezone 'Pacific/Pitcairn' - timezone 'Pacific/Pohnpei' + linked_timezone 'Pacific/Pohnpei' linked_timezone 'Pacific/Ponape' timezone 'Pacific/Port_Moresby' timezone 'Pacific/Rarotonga' @@ -577,8 +578,8 @@ module Timezones timezone 'Pacific/Tarawa' timezone 'Pacific/Tongatapu' linked_timezone 'Pacific/Truk' - timezone 'Pacific/Wake' - timezone 'Pacific/Wallis' + linked_timezone 'Pacific/Wake' + linked_timezone 'Pacific/Wallis' linked_timezone 'Pacific/Yap' linked_timezone 'Poland' linked_timezone 'Portugal' diff --git a/lib/tzinfo/data/version.rb b/lib/tzinfo/data/version.rb index afaec58..29bfb39 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.2022.1' + VERSION = '1.2022.2' # TZInfo::Data version information. module Version @@ -14,7 +14,7 @@ module Version # The version of the {IANA Time Zone Database}[https://www.iana.org/time-zones] # used to generate this version of TZInfo::Data. - TZDATA = '2022a' + TZDATA = '2022b' end end end