diff --git a/test/data_sources/tc_ruby_data_source.rb b/test/data_sources/tc_ruby_data_source.rb index 88eb55d2..4a12c2bb 100644 --- a/test/data_sources/tc_ruby_data_source.rb +++ b/test/data_sources/tc_ruby_data_source.rb @@ -122,10 +122,10 @@ def test_load_timezone_info_tainted skip_if_taint_is_undefined_or_no_op safe_test(unavailable: :skip) do - identifier = 'Europe/Amsterdam'.dup.taint + identifier = 'Europe/Brussels'.dup.taint assert(identifier.tainted?) info = @data_source.send(:load_timezone_info, identifier) - assert_equal('Europe/Amsterdam', info.identifier) + assert_equal('Europe/Brussels', info.identifier) assert(identifier.tainted?) end end @@ -134,8 +134,8 @@ def test_load_timezone_info_tainted_and_frozen skip_if_taint_is_undefined_or_no_op safe_test do - info = @data_source.send(:load_timezone_info, 'Europe/Amsterdam'.dup.taint.freeze) - assert_equal('Europe/Amsterdam', info.identifier) + info = @data_source.send(:load_timezone_info, 'Europe/Brussels'.dup.taint.freeze) + assert_equal('Europe/Brussels', info.identifier) end end @@ -282,11 +282,11 @@ def test_country_codes end def test_to_s - assert_equal("Ruby DataSource: tzdb v2020d, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2020.4.test", @data_source.to_s) + assert_equal("Ruby DataSource: tzdb v2023c, tzinfo-data v#{defined?(TZINFO_TEST_DATA_FORMAT) ? TZINFO_TEST_DATA_FORMAT : 2}.2023.3.test", @data_source.to_s) end def test_inspect - assert_equal("#", @data_source.inspect) + assert_equal("#", @data_source.inspect) end if defined?(TZINFO_TEST_DATA_FORMAT) && TZINFO_TEST_DATA_FORMAT == 1 @@ -303,7 +303,7 @@ def test_to_s_no_tzinfo_data_version puts ds.to_s EOF - assert_sub_process_returns(['Ruby DataSource: tzdb v2020d'], code) + assert_sub_process_returns(['Ruby DataSource: tzdb v2023c'], code) end def test_inspect_no_tzinfo_data_version @@ -316,7 +316,7 @@ def test_inspect_no_tzinfo_data_version puts ds.inspect EOF - assert_sub_process_returns(['#'], code) + assert_sub_process_returns(['#'], code) end end diff --git a/test/data_sources/tc_zoneinfo_data_source.rb b/test/data_sources/tc_zoneinfo_data_source.rb index d812a174..c5b9ca93 100644 --- a/test/data_sources/tc_zoneinfo_data_source.rb +++ b/test/data_sources/tc_zoneinfo_data_source.rb @@ -787,10 +787,10 @@ def test_load_timezone_info_tainted skip_if_taint_is_undefined_or_no_op safe_test(unavailable: :skip) do - identifier = 'Europe/Amsterdam'.dup.taint + identifier = 'Europe/Brussels'.dup.taint assert(identifier.tainted?) info = @data_source.send(:load_timezone_info, identifier) - assert_equal('Europe/Amsterdam', info.identifier) + assert_equal('Europe/Brussels', info.identifier) assert(identifier.tainted?) end end @@ -799,8 +799,8 @@ def test_load_timezone_info_tainted_and_frozen skip_if_taint_is_undefined_or_no_op safe_test do - info = @data_source.send(:load_timezone_info, 'Europe/Amsterdam'.dup.taint.freeze) - assert_equal('Europe/Amsterdam', info.identifier) + info = @data_source.send(:load_timezone_info, 'Europe/Brussels'.dup.taint.freeze) + assert_equal('Europe/Brussels', info.identifier) end end diff --git a/test/tc_timezone.rb b/test/tc_timezone.rb index bd82af8b..7fc7d1f3 100644 --- a/test/tc_timezone.rb +++ b/test/tc_timezone.rb @@ -296,8 +296,8 @@ def test_get_tainted_and_frozen_not_previously_loaded skip_if_taint_is_undefined_or_no_op safe_test do - tz = Timezone.get('Europe/Amsterdam'.dup.taint.freeze) - assert_equal('Europe/Amsterdam', tz.identifier) + tz = Timezone.get('Europe/Brussels'.dup.taint.freeze) + assert_equal('Europe/Brussels', tz.identifier) end end diff --git a/test/tc_timezone_melbourne.rb b/test/tc_timezone_melbourne.rb index 0fd7bf82..07fdc178 100644 --- a/test/tc_timezone_melbourne.rb +++ b/test/tc_timezone_melbourne.rb @@ -84,71 +84,71 @@ def test_2004 end def test_1942 - #Australia/Melbourne Sat Mar 28 14:59:59 1942 UTC = Sun Mar 29 01:59:59 1942 AEDT isdst=1 gmtoff=39600 - #Australia/Melbourne Sat Mar 28 15:00:00 1942 UTC = Sun Mar 29 01:00:00 1942 AEST isdst=0 gmtoff=36000 + #Australia/Melbourne Sat Mar 28 15:59:59 1942 UTC = Sun Mar 29 02:59:59 1942 AEDT isdst=1 gmtoff=39600 + #Australia/Melbourne Sat Mar 28 16:00:00 1942 UTC = Sun Mar 29 02:00:00 1942 AEST isdst=0 gmtoff=36000 #Australia/Melbourne Sat Sep 26 15:59:59 1942 UTC = Sun Sep 27 01:59:59 1942 AEST isdst=0 gmtoff=36000 #Australia/Melbourne Sat Sep 26 16:00:00 1942 UTC = Sun Sep 27 03:00:00 1942 AEDT isdst=1 gmtoff=39600 tz = Timezone.get('Australia/Melbourne') time_types_test(:offset) do |h| - assert_equal_with_offset(h.output_time(1942,3,29,1,59,59,0,39600), tz.to_local(h.time(1942,3,28,14,59,59,0,0))) - assert_equal_with_offset(h.output_time(1942,3,29,1, 0, 0,0,36000), tz.to_local(h.time(1942,3,28,15, 0, 0,0,0))) + assert_equal_with_offset(h.output_time(1942,3,29,2,59,59,0,39600), tz.to_local(h.time(1942,3,28,15,59,59,0,0))) + assert_equal_with_offset(h.output_time(1942,3,29,2, 0, 0,0,36000), tz.to_local(h.time(1942,3,28,16, 0, 0,0,0))) assert_equal_with_offset(h.output_time(1942,9,27,1,59,59,0,36000), tz.to_local(h.time(1942,9,26,15,59,59,0,0))) assert_equal_with_offset(h.output_time(1942,9,27,3, 0, 0,0,39600), tz.to_local(h.time(1942,9,26,16, 0, 0,0,0))) - assert_equal_with_offset(h.output_time(1942,3,29,1,59,59,0,39600), tz.utc_to_local(h.time(1942,3,28,14,59,59))) - assert_equal_with_offset(h.output_time(1942,3,29,1, 0, 0,0,36000), tz.utc_to_local(h.time(1942,3,28,15, 0, 0))) + assert_equal_with_offset(h.output_time(1942,3,29,2,59,59,0,39600), tz.utc_to_local(h.time(1942,3,28,15,59,59))) + assert_equal_with_offset(h.output_time(1942,3,29,2, 0, 0,0,36000), tz.utc_to_local(h.time(1942,3,28,16, 0, 0))) assert_equal_with_offset(h.output_time(1942,9,27,1,59,59,0,36000), tz.utc_to_local(h.time(1942,9,26,15,59,59))) assert_equal_with_offset(h.output_time(1942,9,27,3, 0, 0,0,39600), tz.utc_to_local(h.time(1942,9,26,16, 0, 0))) - assert_equal_with_offset(h.output_time(1942,3,28,14,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,1,59,59), true)) - assert_equal_with_offset(h.output_time(1942,3,28,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,1,59,59), false)) - assert_equal_with_offset(h.output_time(1942,3,28,14, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,1, 0, 0), true)) - assert_equal_with_offset(h.output_time(1942,3,28,15, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,1, 0, 0), false)) + assert_equal_with_offset(h.output_time(1942,3,28,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,2,59,59), true)) + assert_equal_with_offset(h.output_time(1942,3,28,16,59,59,0,:utc), tz.local_to_utc(h.time(1942,3,29,2,59,59), false)) + assert_equal_with_offset(h.output_time(1942,3,28,15, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,2, 0, 0), true)) + assert_equal_with_offset(h.output_time(1942,3,28,16, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,3,29,2, 0, 0), false)) assert_equal_with_offset(h.output_time(1942,9,26,15,59,59,0,:utc), tz.local_to_utc(h.time(1942,9,27,1,59,59))) assert_equal_with_offset(h.output_time(1942,9,26,16, 0, 0,0,:utc), tz.local_to_utc(h.time(1942,9,27,3, 0, 0))) assert_raises(PeriodNotFound) { tz.local_to_utc(h.time(1942,9,27,2,0,0)) } - assert_raises(AmbiguousTime) { tz.local_to_utc(h.time(1942,3,29,1,0,0)) } + assert_raises(AmbiguousTime) { tz.local_to_utc(h.time(1942,3,29,2,0,0)) } - assert_equal('AEDT', tz.period_for(h.time(1942,3,28,14,59,59,0,0)).zone_identifier) - assert_equal('AEST', tz.period_for(h.time(1942,3,28,15, 0, 0,0,0)).zone_identifier) + assert_equal('AEDT', tz.period_for(h.time(1942,3,28,15,59,59,0,0)).zone_identifier) + assert_equal('AEST', tz.period_for(h.time(1942,3,28,16, 0, 0,0,0)).zone_identifier) assert_equal('AEST', tz.period_for(h.time(1942,9,26,15,59,59,0,0)).zone_identifier) assert_equal('AEDT', tz.period_for(h.time(1942,9,26,16, 0, 0,0,0)).zone_identifier) - assert_equal('AEDT', tz.period_for_utc(h.time(1942,3,28,14,59,59)).zone_identifier) - assert_equal('AEST', tz.period_for_utc(h.time(1942,3,28,15, 0, 0)).zone_identifier) + assert_equal('AEDT', tz.period_for_utc(h.time(1942,3,28,15,59,59)).zone_identifier) + assert_equal('AEST', tz.period_for_utc(h.time(1942,3,28,16, 0, 0)).zone_identifier) assert_equal('AEST', tz.period_for_utc(h.time(1942,9,26,15,59,59)).zone_identifier) assert_equal('AEDT', tz.period_for_utc(h.time(1942,9,26,16, 0, 0)).zone_identifier) - assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,1,59,59), true).zone_identifier) - assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,1,59,59), false).zone_identifier) - assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,1, 0, 0), true).zone_identifier) - assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,1, 0, 0), false).zone_identifier) + assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,2,59,59), true).zone_identifier) + assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,2,59,59), false).zone_identifier) + assert_equal('AEDT', tz.period_for_local(h.time(1942,3,29,2, 0, 0), true).zone_identifier) + assert_equal('AEST', tz.period_for_local(h.time(1942,3,29,2, 0, 0), false).zone_identifier) assert_equal('AEST', tz.period_for_local(h.time(1942,9,27,1,59,59)).zone_identifier) assert_equal('AEDT', tz.period_for_local(h.time(1942,9,27,3, 0, 0)).zone_identifier) - assert_equal(39600, tz.period_for(h.time(1942,3,28,14,59,59,0,0)).observed_utc_offset) - assert_equal(36000, tz.period_for(h.time(1942,3,28,15, 0, 0,0,0)).observed_utc_offset) + assert_equal(39600, tz.period_for(h.time(1942,3,28,15,59,59,0,0)).observed_utc_offset) + assert_equal(36000, tz.period_for(h.time(1942,3,28,16, 0, 0,0,0)).observed_utc_offset) assert_equal(36000, tz.period_for(h.time(1942,9,26,15,59,59,0,0)).observed_utc_offset) assert_equal(39600, tz.period_for(h.time(1942,9,26,16, 0, 0,0,0)).observed_utc_offset) - assert_equal(39600, tz.period_for_utc(h.time(1942,3,28,14,59,59)).observed_utc_offset) - assert_equal(36000, tz.period_for_utc(h.time(1942,3,28,15, 0, 0)).observed_utc_offset) + assert_equal(39600, tz.period_for_utc(h.time(1942,3,28,15,59,59)).observed_utc_offset) + assert_equal(36000, tz.period_for_utc(h.time(1942,3,28,16, 0, 0)).observed_utc_offset) assert_equal(36000, tz.period_for_utc(h.time(1942,9,26,15,59,59)).observed_utc_offset) assert_equal(39600, tz.period_for_utc(h.time(1942,9,26,16, 0, 0)).observed_utc_offset) - assert_equal(39600, tz.period_for_local(h.time(1942,3,29,1,59,59), true).observed_utc_offset) - assert_equal(36000, tz.period_for_local(h.time(1942,3,29,1,59,59), false).observed_utc_offset) - assert_equal(39600, tz.period_for_local(h.time(1942,3,29,1, 0, 0), true).observed_utc_offset) - assert_equal(36000, tz.period_for_local(h.time(1942,3,29,1, 0, 0), false).observed_utc_offset) + assert_equal(39600, tz.period_for_local(h.time(1942,3,29,2,59,59), true).observed_utc_offset) + assert_equal(36000, tz.period_for_local(h.time(1942,3,29,2,59,59), false).observed_utc_offset) + assert_equal(39600, tz.period_for_local(h.time(1942,3,29,2, 0, 0), true).observed_utc_offset) + assert_equal(36000, tz.period_for_local(h.time(1942,3,29,2, 0, 0), false).observed_utc_offset) assert_equal(36000, tz.period_for_local(h.time(1942,9,27,1,59,59)).observed_utc_offset) assert_equal(39600, tz.period_for_local(h.time(1942,9,27,3, 0, 0)).observed_utc_offset) transitions = tz.transitions_up_to(h.time(1943,1,1,0,0,0,0,0), h.time(1942,1,1,0,0,0,0,0)) assert_equal(2, transitions.length) - assert_equal_with_offset(Timestamp.for(Time.utc(1942,3,28,15,0,0)), transitions[0].at) + assert_equal_with_offset(Timestamp.for(Time.utc(1942,3,28,16,0,0)), transitions[0].at) assert_equal(TimezoneOffset.new(36000, 3600, 'AEDT'), transitions[0].previous_offset) assert_equal(TimezoneOffset.new(36000, 0, 'AEST'), transitions[0].offset) assert_equal_with_offset(Timestamp.for(Time.utc(1942,9,26,16,0,0)), transitions[1].at) diff --git a/test/tzinfo-data1/tzinfo/data/definitions/America/New_York.rb b/test/tzinfo-data1/tzinfo/data/definitions/America/New_York.rb index 6802f535..1ffc4b91 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/America/New_York.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/America/New_York.rb @@ -319,6 +319,12 @@ module New_York tz.transition 2069, 11, :o1, 3150684000, 9908215, 4 tz.transition 2070, 3, :o2, 3161574000, 59452315, 24 tz.transition 2070, 11, :o1, 3182133600, 9909671, 4 + tz.transition 2071, 3, :o2, 3193023600, 59461051, 24 + tz.transition 2071, 11, :o1, 3213583200, 9911127, 4 + tz.transition 2072, 3, :o2, 3225078000, 59469955, 24 + tz.transition 2072, 11, :o1, 3245637600, 9912611, 4 + tz.transition 2073, 3, :o2, 3256527600, 59478691, 24 + tz.transition 2073, 11, :o1, 3277087200, 9914067, 4 end end end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Australia/Melbourne.rb b/test/tzinfo-data1/tzinfo/data/definitions/Australia/Melbourne.rb index 6acd078e..fbeef48e 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/Australia/Melbourne.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/Australia/Melbourne.rb @@ -16,14 +16,14 @@ module Melbourne tz.offset :o2, 36000, 3600, :AEDT tz.transition 1895, 1, :o1, -2364111592, 26062831051, 10800 - tz.transition 1916, 12, :o2, -1672567140, 3486569881, 1440 - tz.transition 1917, 3, :o1, -1665392400, 19370497, 8 + tz.transition 1916, 12, :o2, -1672560000, 14527375, 6 + tz.transition 1917, 3, :o1, -1665388800, 14527873, 6 tz.transition 1941, 12, :o2, -883641600, 14582161, 6 - tz.transition 1942, 3, :o1, -876128400, 19443577, 8 + tz.transition 1942, 3, :o1, -876124800, 14582683, 6 tz.transition 1942, 9, :o2, -860400000, 14583775, 6 - tz.transition 1943, 3, :o1, -844678800, 19446489, 8 + tz.transition 1943, 3, :o1, -844675200, 14584867, 6 tz.transition 1943, 10, :o2, -828345600, 14586001, 6 - tz.transition 1944, 3, :o1, -813229200, 19449401, 8 + tz.transition 1944, 3, :o1, -813225600, 14587051, 6 tz.transition 1971, 10, :o2, 57686400 tz.transition 1972, 2, :o1, 67968000 tz.transition 1972, 10, :o2, 89136000 @@ -222,6 +222,12 @@ module Melbourne tz.transition 2069, 4, :o1, 3132489600, 14861059, 6 tz.transition 2069, 10, :o2, 3148214400, 14862151, 6 tz.transition 2070, 4, :o1, 3163939200, 14863243, 6 + tz.transition 2070, 10, :o2, 3179664000, 14864335, 6 + tz.transition 2071, 4, :o1, 3195388800, 14865427, 6 + tz.transition 2071, 10, :o2, 3211113600, 14866519, 6 + tz.transition 2072, 4, :o1, 3226838400, 14867611, 6 + tz.transition 2072, 10, :o2, 3242563200, 14868703, 6 + tz.transition 2073, 4, :o1, 3258288000, 14869795, 6 end end end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Amsterdam.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Amsterdam.rb deleted file mode 100644 index bedf7e4c..00000000 --- a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Amsterdam.rb +++ /dev/null @@ -1,273 +0,0 @@ -# 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 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 - end - end - end - end - end -end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Andorra.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Andorra.rb index d51c5dc3..fbaa2368 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Andorra.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Andorra.rb @@ -190,6 +190,12 @@ module Andorra 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 + tz.transition 2073, 3, :o3, 3257715600, 59479021, 24 + tz.transition 2073, 10, :o2, 3276464400, 59484229, 24 end end end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Brussels.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Brussels.rb new file mode 100644 index 00000000..b8c1881e --- /dev/null +++ b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Brussels.rb @@ -0,0 +1,283 @@ +# 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 Brussels + include TimezoneDefinition + + timezone 'Europe/Brussels' do |tz| + tz.offset :o0, 1050, 0, :LMT + tz.offset :o1, 1050, 0, :BMT + tz.offset :o2, 0, 0, :WET + tz.offset :o3, 3600, 0, :CET + tz.offset :o4, 3600, 3600, :CEST + tz.offset :o5, 0, 3600, :WEST + + tz.transition 1879, 12, :o1, -2840141850, 1386844121, 576 + tz.transition 1892, 5, :o2, -2450995200, 4824439, 2 + tz.transition 1914, 11, :o3, -1740355200, 4840889, 2 + tz.transition 1916, 4, :o4, -1693702800, 58103627, 24 + tz.transition 1916, 9, :o3, -1680483600, 58107299, 24 + tz.transition 1917, 4, :o4, -1663455600, 58112029, 24 + tz.transition 1917, 9, :o3, -1650150000, 58115725, 24 + tz.transition 1918, 4, :o4, -1632006000, 58120765, 24 + tz.transition 1918, 9, :o3, -1618700400, 58124461, 24 + tz.transition 1918, 11, :o2, -1613826000, 58125815, 24 + tz.transition 1919, 3, :o5, -1604278800, 58128467, 24 + tz.transition 1919, 10, :o2, -1585530000, 58133675, 24 + tz.transition 1920, 2, :o5, -1574038800, 58136867, 24 + tz.transition 1920, 10, :o2, -1552266000, 58142915, 24 + tz.transition 1921, 3, :o5, -1539997200, 58146323, 24 + tz.transition 1921, 10, :o2, -1520557200, 58151723, 24 + tz.transition 1922, 3, :o5, -1507510800, 58155347, 24 + tz.transition 1922, 10, :o2, -1490576400, 58160051, 24 + tz.transition 1923, 4, :o5, -1473642000, 58164755, 24 + tz.transition 1923, 10, :o2, -1459126800, 58168787, 24 + tz.transition 1924, 3, :o5, -1444006800, 58172987, 24 + tz.transition 1924, 10, :o2, -1427677200, 58177523, 24 + tz.transition 1925, 4, :o5, -1411952400, 58181891, 24 + tz.transition 1925, 10, :o2, -1396227600, 58186259, 24 + tz.transition 1926, 4, :o5, -1379293200, 58190963, 24 + tz.transition 1926, 10, :o2, -1364778000, 58194995, 24 + tz.transition 1927, 4, :o5, -1348448400, 58199531, 24 + tz.transition 1927, 10, :o2, -1333328400, 58203731, 24 + tz.transition 1928, 4, :o5, -1316394000, 58208435, 24 + tz.transition 1928, 10, :o2, -1301263200, 29106319, 12 + tz.transition 1929, 4, :o5, -1284328800, 29108671, 12 + tz.transition 1929, 10, :o2, -1269813600, 29110687, 12 + tz.transition 1930, 4, :o5, -1253484000, 29112955, 12 + tz.transition 1930, 10, :o2, -1238364000, 29115055, 12 + tz.transition 1931, 4, :o5, -1221429600, 29117407, 12 + tz.transition 1931, 10, :o2, -1206914400, 29119423, 12 + tz.transition 1932, 4, :o5, -1191189600, 29121607, 12 + tz.transition 1932, 10, :o2, -1175464800, 29123791, 12 + tz.transition 1933, 3, :o5, -1160344800, 29125891, 12 + tz.transition 1933, 10, :o2, -1143410400, 29128243, 12 + tz.transition 1934, 4, :o5, -1127685600, 29130427, 12 + tz.transition 1934, 10, :o2, -1111960800, 29132611, 12 + tz.transition 1935, 3, :o5, -1096840800, 29134711, 12 + tz.transition 1935, 10, :o2, -1080511200, 29136979, 12 + tz.transition 1936, 4, :o5, -1063576800, 29139331, 12 + tz.transition 1936, 10, :o2, -1049061600, 29141347, 12 + tz.transition 1937, 4, :o5, -1033336800, 29143531, 12 + tz.transition 1937, 10, :o2, -1017612000, 29145715, 12 + tz.transition 1938, 3, :o5, -1002492000, 29147815, 12 + tz.transition 1938, 10, :o2, -986162400, 29150083, 12 + tz.transition 1939, 4, :o5, -969228000, 29152435, 12 + tz.transition 1939, 11, :o2, -950479200, 29155039, 12 + tz.transition 1940, 2, :o5, -942012000, 29156215, 12 + tz.transition 1940, 5, :o4, -934668000, 29157235, 12 + 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, 9, :o3, -798073200, 58352413, 24 + tz.transition 1945, 4, :o4, -781052400, 58357141, 24 + tz.transition 1945, 9, :o3, -766623600, 58361149, 24 + tz.transition 1946, 5, :o4, -745455600, 58367029, 24 + tz.transition 1946, 10, :o3, -733273200, 58370413, 24 + tz.transition 1977, 4, :o4, 228877200 + tz.transition 1977, 9, :o3, 243997200 + tz.transition 1978, 4, :o4, 260326800 + tz.transition 1978, 10, :o3, 276051600 + tz.transition 1979, 4, :o4, 291776400 + tz.transition 1979, 9, :o3, 307501200 + tz.transition 1980, 4, :o4, 323830800 + tz.transition 1980, 9, :o3, 338950800 + tz.transition 1981, 3, :o4, 354675600 + tz.transition 1981, 9, :o3, 370400400 + tz.transition 1982, 3, :o4, 386125200 + tz.transition 1982, 9, :o3, 401850000 + tz.transition 1983, 3, :o4, 417574800 + tz.transition 1983, 9, :o3, 433299600 + tz.transition 1984, 3, :o4, 449024400 + tz.transition 1984, 9, :o3, 465354000 + tz.transition 1985, 3, :o4, 481078800 + tz.transition 1985, 9, :o3, 496803600 + tz.transition 1986, 3, :o4, 512528400 + tz.transition 1986, 9, :o3, 528253200 + tz.transition 1987, 3, :o4, 543978000 + tz.transition 1987, 9, :o3, 559702800 + tz.transition 1988, 3, :o4, 575427600 + tz.transition 1988, 9, :o3, 591152400 + tz.transition 1989, 3, :o4, 606877200 + tz.transition 1989, 9, :o3, 622602000 + tz.transition 1990, 3, :o4, 638326800 + tz.transition 1990, 9, :o3, 654656400 + tz.transition 1991, 3, :o4, 670381200 + tz.transition 1991, 9, :o3, 686106000 + tz.transition 1992, 3, :o4, 701830800 + tz.transition 1992, 9, :o3, 717555600 + tz.transition 1993, 3, :o4, 733280400 + tz.transition 1993, 9, :o3, 749005200 + tz.transition 1994, 3, :o4, 764730000 + tz.transition 1994, 9, :o3, 780454800 + tz.transition 1995, 3, :o4, 796179600 + tz.transition 1995, 9, :o3, 811904400 + tz.transition 1996, 3, :o4, 828234000 + tz.transition 1996, 10, :o3, 846378000 + tz.transition 1997, 3, :o4, 859683600 + tz.transition 1997, 10, :o3, 877827600 + tz.transition 1998, 3, :o4, 891133200 + tz.transition 1998, 10, :o3, 909277200 + tz.transition 1999, 3, :o4, 922582800 + tz.transition 1999, 10, :o3, 941331600 + tz.transition 2000, 3, :o4, 954032400 + tz.transition 2000, 10, :o3, 972781200 + tz.transition 2001, 3, :o4, 985482000 + tz.transition 2001, 10, :o3, 1004230800 + tz.transition 2002, 3, :o4, 1017536400 + tz.transition 2002, 10, :o3, 1035680400 + tz.transition 2003, 3, :o4, 1048986000 + tz.transition 2003, 10, :o3, 1067130000 + tz.transition 2004, 3, :o4, 1080435600 + tz.transition 2004, 10, :o3, 1099184400 + tz.transition 2005, 3, :o4, 1111885200 + tz.transition 2005, 10, :o3, 1130634000 + tz.transition 2006, 3, :o4, 1143334800 + tz.transition 2006, 10, :o3, 1162083600 + tz.transition 2007, 3, :o4, 1174784400 + tz.transition 2007, 10, :o3, 1193533200 + tz.transition 2008, 3, :o4, 1206838800 + tz.transition 2008, 10, :o3, 1224982800 + tz.transition 2009, 3, :o4, 1238288400 + tz.transition 2009, 10, :o3, 1256432400 + tz.transition 2010, 3, :o4, 1269738000 + tz.transition 2010, 10, :o3, 1288486800 + tz.transition 2011, 3, :o4, 1301187600 + tz.transition 2011, 10, :o3, 1319936400 + tz.transition 2012, 3, :o4, 1332637200 + tz.transition 2012, 10, :o3, 1351386000 + tz.transition 2013, 3, :o4, 1364691600 + tz.transition 2013, 10, :o3, 1382835600 + tz.transition 2014, 3, :o4, 1396141200 + tz.transition 2014, 10, :o3, 1414285200 + tz.transition 2015, 3, :o4, 1427590800 + tz.transition 2015, 10, :o3, 1445734800 + tz.transition 2016, 3, :o4, 1459040400 + tz.transition 2016, 10, :o3, 1477789200 + tz.transition 2017, 3, :o4, 1490490000 + tz.transition 2017, 10, :o3, 1509238800 + tz.transition 2018, 3, :o4, 1521939600 + tz.transition 2018, 10, :o3, 1540688400 + tz.transition 2019, 3, :o4, 1553994000 + tz.transition 2019, 10, :o3, 1572138000 + tz.transition 2020, 3, :o4, 1585443600 + tz.transition 2020, 10, :o3, 1603587600 + tz.transition 2021, 3, :o4, 1616893200 + tz.transition 2021, 10, :o3, 1635642000 + tz.transition 2022, 3, :o4, 1648342800 + tz.transition 2022, 10, :o3, 1667091600 + tz.transition 2023, 3, :o4, 1679792400 + tz.transition 2023, 10, :o3, 1698541200 + tz.transition 2024, 3, :o4, 1711846800 + tz.transition 2024, 10, :o3, 1729990800 + tz.transition 2025, 3, :o4, 1743296400 + tz.transition 2025, 10, :o3, 1761440400 + tz.transition 2026, 3, :o4, 1774746000 + tz.transition 2026, 10, :o3, 1792890000 + tz.transition 2027, 3, :o4, 1806195600 + tz.transition 2027, 10, :o3, 1824944400 + tz.transition 2028, 3, :o4, 1837645200 + tz.transition 2028, 10, :o3, 1856394000 + tz.transition 2029, 3, :o4, 1869094800 + tz.transition 2029, 10, :o3, 1887843600 + tz.transition 2030, 3, :o4, 1901149200 + tz.transition 2030, 10, :o3, 1919293200 + tz.transition 2031, 3, :o4, 1932598800 + tz.transition 2031, 10, :o3, 1950742800 + tz.transition 2032, 3, :o4, 1964048400 + tz.transition 2032, 10, :o3, 1982797200 + tz.transition 2033, 3, :o4, 1995498000 + tz.transition 2033, 10, :o3, 2014246800 + tz.transition 2034, 3, :o4, 2026947600 + tz.transition 2034, 10, :o3, 2045696400 + tz.transition 2035, 3, :o4, 2058397200 + tz.transition 2035, 10, :o3, 2077146000 + tz.transition 2036, 3, :o4, 2090451600 + tz.transition 2036, 10, :o3, 2108595600 + tz.transition 2037, 3, :o4, 2121901200 + tz.transition 2037, 10, :o3, 2140045200 + tz.transition 2038, 3, :o4, 2153350800, 59172253, 24 + tz.transition 2038, 10, :o3, 2172099600, 59177461, 24 + tz.transition 2039, 3, :o4, 2184800400, 59180989, 24 + tz.transition 2039, 10, :o3, 2203549200, 59186197, 24 + tz.transition 2040, 3, :o4, 2216250000, 59189725, 24 + tz.transition 2040, 10, :o3, 2234998800, 59194933, 24 + tz.transition 2041, 3, :o4, 2248304400, 59198629, 24 + tz.transition 2041, 10, :o3, 2266448400, 59203669, 24 + tz.transition 2042, 3, :o4, 2279754000, 59207365, 24 + tz.transition 2042, 10, :o3, 2297898000, 59212405, 24 + tz.transition 2043, 3, :o4, 2311203600, 59216101, 24 + tz.transition 2043, 10, :o3, 2329347600, 59221141, 24 + tz.transition 2044, 3, :o4, 2342653200, 59224837, 24 + tz.transition 2044, 10, :o3, 2361402000, 59230045, 24 + tz.transition 2045, 3, :o4, 2374102800, 59233573, 24 + tz.transition 2045, 10, :o3, 2392851600, 59238781, 24 + tz.transition 2046, 3, :o4, 2405552400, 59242309, 24 + tz.transition 2046, 10, :o3, 2424301200, 59247517, 24 + tz.transition 2047, 3, :o4, 2437606800, 59251213, 24 + tz.transition 2047, 10, :o3, 2455750800, 59256253, 24 + tz.transition 2048, 3, :o4, 2469056400, 59259949, 24 + tz.transition 2048, 10, :o3, 2487200400, 59264989, 24 + tz.transition 2049, 3, :o4, 2500506000, 59268685, 24 + tz.transition 2049, 10, :o3, 2519254800, 59273893, 24 + tz.transition 2050, 3, :o4, 2531955600, 59277421, 24 + tz.transition 2050, 10, :o3, 2550704400, 59282629, 24 + tz.transition 2051, 3, :o4, 2563405200, 59286157, 24 + tz.transition 2051, 10, :o3, 2582154000, 59291365, 24 + tz.transition 2052, 3, :o4, 2595459600, 59295061, 24 + tz.transition 2052, 10, :o3, 2613603600, 59300101, 24 + tz.transition 2053, 3, :o4, 2626909200, 59303797, 24 + tz.transition 2053, 10, :o3, 2645053200, 59308837, 24 + tz.transition 2054, 3, :o4, 2658358800, 59312533, 24 + tz.transition 2054, 10, :o3, 2676502800, 59317573, 24 + tz.transition 2055, 3, :o4, 2689808400, 59321269, 24 + tz.transition 2055, 10, :o3, 2708557200, 59326477, 24 + tz.transition 2056, 3, :o4, 2721258000, 59330005, 24 + tz.transition 2056, 10, :o3, 2740006800, 59335213, 24 + tz.transition 2057, 3, :o4, 2752707600, 59338741, 24 + tz.transition 2057, 10, :o3, 2771456400, 59343949, 24 + tz.transition 2058, 3, :o4, 2784762000, 59347645, 24 + tz.transition 2058, 10, :o3, 2802906000, 59352685, 24 + tz.transition 2059, 3, :o4, 2816211600, 59356381, 24 + tz.transition 2059, 10, :o3, 2834355600, 59361421, 24 + tz.transition 2060, 3, :o4, 2847661200, 59365117, 24 + tz.transition 2060, 10, :o3, 2866410000, 59370325, 24 + tz.transition 2061, 3, :o4, 2879110800, 59373853, 24 + tz.transition 2061, 10, :o3, 2897859600, 59379061, 24 + tz.transition 2062, 3, :o4, 2910560400, 59382589, 24 + tz.transition 2062, 10, :o3, 2929309200, 59387797, 24 + tz.transition 2063, 3, :o4, 2942010000, 59391325, 24 + tz.transition 2063, 10, :o3, 2960758800, 59396533, 24 + tz.transition 2064, 3, :o4, 2974064400, 59400229, 24 + tz.transition 2064, 10, :o3, 2992208400, 59405269, 24 + tz.transition 2065, 3, :o4, 3005514000, 59408965, 24 + tz.transition 2065, 10, :o3, 3023658000, 59414005, 24 + tz.transition 2066, 3, :o4, 3036963600, 59417701, 24 + tz.transition 2066, 10, :o3, 3055712400, 59422909, 24 + tz.transition 2067, 3, :o4, 3068413200, 59426437, 24 + tz.transition 2067, 10, :o3, 3087162000, 59431645, 24 + tz.transition 2068, 3, :o4, 3099862800, 59435173, 24 + tz.transition 2068, 10, :o3, 3118611600, 59440381, 24 + tz.transition 2069, 3, :o4, 3131917200, 59444077, 24 + tz.transition 2069, 10, :o3, 3150061200, 59449117, 24 + tz.transition 2070, 3, :o4, 3163366800, 59452813, 24 + tz.transition 2070, 10, :o3, 3181510800, 59457853, 24 + tz.transition 2071, 3, :o4, 3194816400, 59461549, 24 + tz.transition 2071, 10, :o3, 3212960400, 59466589, 24 + tz.transition 2072, 3, :o4, 3226266000, 59470285, 24 + tz.transition 2072, 10, :o3, 3245014800, 59475493, 24 + tz.transition 2073, 3, :o4, 3257715600, 59479021, 24 + tz.transition 2073, 10, :o3, 3276464400, 59484229, 24 + end + end + end + end + end +end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/London.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/London.rb index 942e0084..6b222acc 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/Europe/London.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/Europe/London.rb @@ -325,6 +325,12 @@ module London 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 + tz.transition 2073, 3, :o2, 3257715600, 59479021, 24 + tz.transition 2073, 10, :o1, 3276464400, 59484229, 24 end end end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Paris.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Paris.rb index e16ba37e..ca59be2b 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Paris.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Paris.rb @@ -269,6 +269,12 @@ module Paris tz.transition 2069, 10, :o5, 3150061200, 59449117, 24 tz.transition 2070, 3, :o4, 3163366800, 59452813, 24 tz.transition 2070, 10, :o5, 3181510800, 59457853, 24 + tz.transition 2071, 3, :o4, 3194816400, 59461549, 24 + tz.transition 2071, 10, :o5, 3212960400, 59466589, 24 + tz.transition 2072, 3, :o4, 3226266000, 59470285, 24 + tz.transition 2072, 10, :o5, 3245014800, 59475493, 24 + tz.transition 2073, 3, :o4, 3257715600, 59479021, 24 + tz.transition 2073, 10, :o5, 3276464400, 59484229, 24 end end end diff --git a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Prague.rb b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Prague.rb index 9db42087..f7a20ea3 100644 --- a/test/tzinfo-data1/tzinfo/data/definitions/Europe/Prague.rb +++ b/test/tzinfo-data1/tzinfo/data/definitions/Europe/Prague.rb @@ -227,6 +227,12 @@ module Prague 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 + tz.transition 2073, 3, :o3, 3257715600, 59479021, 24 + tz.transition 2073, 10, :o2, 3276464400, 59484229, 24 end end end diff --git a/test/tzinfo-data1/tzinfo/data/indexes/countries.rb b/test/tzinfo-data1/tzinfo/data/indexes/countries.rb index 689e68b2..7d419113 100644 --- a/test/tzinfo-data1/tzinfo/data/indexes/countries.rb +++ b/test/tzinfo-data1/tzinfo/data/indexes/countries.rb @@ -13,16 +13,16 @@ 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, 'Crozet, Scattered Is' end country 'AF', 'Afghanistan' do |c| c.timezone 'Asia/Kabul', 2071, 60, 346, 5 end country 'AG', 'Antigua & Barbuda' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'AI', 'Anguilla' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'AL', 'Albania' do |c| c.timezone 'Europe/Tirane', 124, 3, 119, 6 @@ -36,18 +36,18 @@ module Countries country 'AQ', 'Antarctica' do |c| c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey' c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis' - c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville' c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson' c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer' c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera' - c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa' 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), Chuuk, Yap, Dumont d\'Urville' + c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa' end country 'AR', 'Argentina' do |c| c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)' - c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)' + c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most areas: CB, CC, CN, ER, FM, MN, SE, SF' c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, 'Salta (SA, LP, NQ, RN)' c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)' c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucumán (TM)' @@ -60,7 +60,7 @@ module Countries c.timezone 'America/Argentina/Ushuaia', -274, 5, -683, 10, 'Tierra del Fuego (TF)' end country 'AS', 'Samoa (American)' do |c| - c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway' + c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Midway' end country 'AT', 'Austria' do |c| c.timezone 'Europe/Vienna', 2893, 60, 49, 3 @@ -68,8 +68,7 @@ module Countries country 'AU', 'Australia' do |c| c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island' c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island' - c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania (most areas)' - c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania (King Island)' + c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania' c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria' c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales (most areas)' c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales (Yancowinna)' @@ -81,7 +80,7 @@ module Countries c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia (Eucla)' end country 'AW', 'Aruba' do |c| - c.timezone 'America/Curacao', 731, 60, -69, 1 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'AX', 'Åland Islands' do |c| c.timezone 'Europe/Helsinki', 361, 6, 749, 30 @@ -117,19 +116,19 @@ module Countries c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time' end country 'BL', 'St Barthelemy' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'BM', 'Bermuda' do |c| 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' end country 'BO', 'Bolivia' do |c| c.timezone 'America/La_Paz', -33, 2, -1363, 20 end country 'BQ', 'Caribbean NL' do |c| - c.timezone 'America/Curacao', 731, 60, -69, 1 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'BR', 'Brazil' do |c| c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands' @@ -150,7 +149,7 @@ module Countries c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre' end country 'BS', 'Bahamas' do |c| - c.timezone 'America/Nassau', 301, 12, -1547, 20 + c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)' end country 'BT', 'Bhutan' do |c| c.timezone 'Asia/Thimphu', 412, 15, 1793, 20 @@ -171,32 +170,27 @@ module Countries c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic - NS (Cape Breton)' c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic - New Brunswick' c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic - Labrador (most areas)' - c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'AST - QC (Lower North Shore)' c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)' - c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern - ON, QC (no DST 1967-73)' - c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern - ON (Thunder Bay)' - c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most east areas)' - c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern - NU (Pangnirtung)' - c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'EST - ON (Atikokan); NU (Coral H)' + c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most areas)' c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central - ON (west); Manitoba' - c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central - ON (Rainy R, Ft Frances)' c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central - NU (Resolute)' c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)' c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)' c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'CST - SK (midwest)' - c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); SK (W)' + c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); NT (E); SK (W)' 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/Creston', 491, 10, -6991, 60, 'MST - BC (Creston)' - 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)' c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)' - c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific - Yukon (east)' - c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific - Yukon (west)' + c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)' + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' + c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - AZ (most areas), 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' @@ -209,7 +203,7 @@ module Countries c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time' end country 'CH', 'Switzerland' do |c| - c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time' + c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen' end country 'CI', 'Côte d\'Ivoire' do |c| c.timezone 'Africa/Abidjan', 319, 60, -121, 30 @@ -218,7 +212,7 @@ module Countries c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30 end country 'CL', 'Chile' do |c| - c.timezone 'America/Santiago', -669, 20, -212, 3, 'Chile (most areas)' + c.timezone 'America/Santiago', -669, 20, -212, 3, 'most of Chile' c.timezone 'America/Punta_Arenas', -1063, 20, -851, 12, 'Region of Magallanes' c.timezone 'Pacific/Easter', -543, 20, -3283, 30, 'Easter Island' end @@ -227,7 +221,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 @@ -242,30 +236,30 @@ module Countries c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60 end country 'CW', 'Curaçao' do |c| - c.timezone 'America/Curacao', 731, 60, -69, 1 + 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, 'north Vietnam' end country 'CY', 'Cyprus' do |c| - c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)' + c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'most of Cyprus' c.timezone 'Asia/Famagusta', 2107, 60, 679, 20, 'Northern Cyprus' end country 'CZ', 'Czech Republic' do |c| 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/Zurich', 2843, 60, 128, 15, 'Swiss time' + c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany' + c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen' 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, 'most of Germany' end country 'DM', 'Dominica' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'DO', 'Dominican Republic' do |c| c.timezone 'America/Santo_Domingo', 277, 15, -699, 10 @@ -307,9 +301,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, 'Pohnpei' end country 'FO', 'Faroe Islands' do |c| c.timezone 'Atlantic/Faroe', 3721, 60, -203, 30 @@ -324,7 +318,7 @@ module Countries c.timezone 'Europe/London', 6181, 120, -451, 3600 end country 'GD', 'Grenada' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'GE', 'Georgia' do |c| c.timezone 'Asia/Tbilisi', 2503, 60, 2689, 60 @@ -336,13 +330,13 @@ module Countries c.timezone 'Europe/London', 6181, 120, -451, 3600 end country 'GH', 'Ghana' do |c| - c.timezone 'Africa/Accra', 111, 20, -13, 60 + c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'GI', 'Gibraltar' do |c| c.timezone 'Europe/Gibraltar', 542, 15, -107, 20 end country 'GL', 'Greenland' do |c| - c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)' + c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'most of Greenland' c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)' c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit' c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik' @@ -354,7 +348,7 @@ module Countries c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'GP', 'Guadeloupe' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'GQ', 'Equatorial Guinea' do |c| c.timezone 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time' @@ -421,7 +415,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 @@ -445,18 +439,18 @@ module Countries c.timezone 'Asia/Bishkek', 429, 10, 373, 5 end country 'KH', 'Cambodia' do |c| - c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' + c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam' end country 'KI', 'Kiribati' do |c| - c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands' - c.timezone 'Pacific/Enderbury', -47, 15, -2053, 12, 'Phoenix Islands' + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake' + c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands' c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands' end country 'KM', 'Comoros' do |c| c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 end country 'KN', 'St Kitts & Nevis' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'KP', 'Korea (North)' do |c| c.timezone 'Asia/Pyongyang', 2341, 60, 503, 4 @@ -465,13 +459,13 @@ module Countries c.timezone 'Asia/Seoul', 751, 20, 3809, 30 end country 'KW', 'Kuwait' do |c| - c.timezone 'Asia/Riyadh', 739, 30, 2803, 60 + c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa' end country 'KY', 'Cayman Islands' do |c| - c.timezone 'America/Panama', 269, 30, -1193, 15 + c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)' end country 'KZ', 'Kazakhstan' do |c| - c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)' + c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most of Kazakhstan' c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda' c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay' c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtöbe/Aktobe' @@ -480,16 +474,16 @@ module Countries c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan' end country 'LA', 'Laos' do |c| - c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' + c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam' end country 'LB', 'Lebanon' do |c| c.timezone 'Asia/Beirut', 2033, 60, 71, 2 end country 'LC', 'St Lucia' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'LI', 'Liechtenstein' do |c| - c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time' + c.timezone 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen' end country 'LK', 'Sri Lanka' do |c| c.timezone 'Asia/Colombo', 104, 15, 1597, 20 @@ -504,7 +498,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 @@ -516,7 +510,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 @@ -525,14 +519,14 @@ module Countries c.timezone 'Europe/Belgrade', 269, 6, 41, 2 end country 'MF', 'St Martin (French)' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'MG', 'Madagascar' do |c| 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, Wake' end country 'MK', 'North Macedonia' do |c| c.timezone 'Europe/Belgrade', 269, 6, 41, 2 @@ -544,7 +538,7 @@ module Countries c.timezone 'Asia/Yangon', 1007, 60, 577, 6 end country 'MN', 'Mongolia' do |c| - c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'Mongolia (most areas)' + c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most of Mongolia' c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan' c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sükhbaatar' end @@ -561,7 +555,7 @@ module Countries c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'MS', 'Montserrat' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'MT', 'Malta' do |c| c.timezone 'Europe/Malta', 359, 10, 871, 60 @@ -570,27 +564,28 @@ 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, 'Kerguelen, St Paul I, Amsterdam I' end country 'MW', 'Malawi' do |c| c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' end country 'MX', 'Mexico' do |c| - c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time' - c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Eastern Standard Time - Quintana Roo' - c.timezone 'America/Merida', 629, 30, -5377, 60, 'Central Time - Campeche, Yucatán' - c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)' - c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)' - c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - Baja California Sur, Nayarit, Sinaloa' - c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mountain Time - Chihuahua (most areas)' - c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Mountain Time US - Chihuahua (US border)' - c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora' - c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Pacific Time US - Baja California' - c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Central Time - Bahía de Banderas' + c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Mexico' + c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Quintana Roo' + c.timezone 'America/Merida', 629, 30, -5377, 60, 'Campeche, Yucatán' + c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Durango; Coahuila, Nuevo León, Tamaulipas (most areas)' + c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Coahuila, Nuevo León, Tamaulipas (US border)' + c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Chihuahua (most areas)' + c.timezone 'America/Ciudad_Juarez', 476, 15, -6389, 60, 'Chihuahua (US border - west)' + c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Chihuahua (US border - east)' + c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Baja California Sur, Nayarit (most areas), Sinaloa' + c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Bahía de Banderas' + c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Sonora' + c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Baja California' 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/Singapore', 77, 60, 2077, 20, 'peninsular Malaysia' end country 'MZ', 'Mozambique' do |c| c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' @@ -614,10 +609,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, 'most of Germany' end country 'NP', 'Nepal' do |c| c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60 @@ -633,10 +628,10 @@ 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, 'Crozet, Scattered Is' end country 'PA', 'Panama' do |c| - c.timezone 'America/Panama', 269, 30, -1193, 15 + c.timezone 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)' end country 'PE', 'Peru' do |c| c.timezone 'America/Lima', -241, 20, -1541, 20 @@ -647,7 +642,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)' + 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| @@ -666,7 +661,7 @@ module Countries c.timezone 'Pacific/Pitcairn', -376, 15, -1561, 12 end country 'PR', 'Puerto Rico' do |c| - c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'PS', 'Palestine' do |c| c.timezone 'Asia/Gaza', 63, 2, 517, 15, 'Gaza Strip' @@ -687,7 +682,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, 'Crozet, Scattered Is' end country 'RO', 'Romania' do |c| c.timezone 'Europe/Bucharest', 1333, 30, 261, 10 @@ -700,8 +695,8 @@ module Countries c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'MSK+00 - Moscow area' c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea' c.timezone 'Europe/Kirov', 293, 5, 993, 20, 'MSK+00 - Kirov' + c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+00 - Volgograd' c.timezone 'Europe/Astrakhan', 927, 20, 961, 20, 'MSK+01 - Astrakhan' - c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+01 - Volgograd' c.timezone 'Europe/Saratov', 1547, 30, 1381, 30, 'MSK+01 - Saratov' c.timezone 'Europe/Ulyanovsk', 163, 3, 242, 5, 'MSK+01 - Ulyanovsk' c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'MSK+01 - Samara, Udmurtia' @@ -720,7 +715,7 @@ module Countries c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'MSK+07 - Oymyakonsky' c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'MSK+08 - Magadan' c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'MSK+08 - Sakhalin Island' - c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); North Kuril Is' + c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); N Kuril Is' c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'MSK+09 - Kamchatka' c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'MSK+09 - Bering Sea' end @@ -728,22 +723,22 @@ module Countries c.timezone 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' end country 'SA', 'Saudi Arabia' do |c| - c.timezone 'Asia/Riyadh', 739, 30, 2803, 60 + c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa' end country 'SB', 'Solomon Islands' do |c| - c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5 + c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Pohnpei' end country 'SC', 'Seychelles' do |c| - c.timezone 'Indian/Mahe', -14, 3, 832, 15 + c.timezone 'Asia/Dubai', 253, 10, 553, 10, '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, 'most of Germany' end country 'SG', 'Singapore' do |c| - c.timezone 'Asia/Singapore', 77, 60, 2077, 20 + c.timezone 'Asia/Singapore', 77, 60, 2077, 20, 'peninsular Malaysia' end country 'SH', 'St Helena' do |c| c.timezone 'Africa/Abidjan', 319, 60, -121, 30 @@ -752,7 +747,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, 'most of Germany' end country 'SK', 'Slovakia' do |c| c.timezone 'Europe/Prague', 601, 12, 433, 30 @@ -782,7 +777,7 @@ module Countries c.timezone 'America/El_Salvador', 137, 10, -446, 5 end country 'SX', 'St Maarten (Dutch)' do |c| - c.timezone 'America/Curacao', 731, 60, -69, 1 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'SY', 'Syria' do |c| c.timezone 'Asia/Damascus', 67, 2, 363, 10 @@ -796,15 +791,15 @@ module Countries country 'TD', 'Chad' do |c| 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' + country 'TF', 'French S. Terr.' do |c| + c.timezone 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is' + c.timezone 'Indian/Maldives', 25, 6, 147, 2, 'Kerguelen, St Paul I, Amsterdam I' end country 'TG', 'Togo' do |c| c.timezone 'Africa/Abidjan', 319, 60, -121, 30 end country 'TH', 'Thailand' do |c| - c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' + c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam' end country 'TJ', 'Tajikistan' do |c| c.timezone 'Asia/Dushanbe', 463, 12, 344, 5 @@ -822,16 +817,16 @@ module Countries c.timezone 'Africa/Tunis', 184, 5, 611, 60 end country 'TO', 'Tonga' do |c| - c.timezone 'Pacific/Tongatapu', -127, 6, -1051, 6 + c.timezone 'Pacific/Tongatapu', -317, 15, -876, 5 end country 'TR', 'Turkey' do |c| c.timezone 'Europe/Istanbul', 2461, 60, 869, 30 end country 'TT', 'Trinidad & Tobago' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + 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, Wake' end country 'TW', 'Taiwan' do |c| c.timezone 'Asia/Taipei', 501, 20, 243, 2 @@ -840,18 +835,15 @@ 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/Uzhgorod', 2917, 60, 223, 10, 'Transcarpathia' - c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozhye and east Lugansk' + c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'most of Ukraine' c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea' end country 'UG', 'Uganda' do |c| 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/Honolulu', 15341, 720, -18943, 120, 'Hawaii' + c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Midway' + c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake' end country 'US', 'United States' do |c| c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern (most areas)' @@ -873,7 +865,7 @@ module Countries c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central - ND (Mercer)' c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain (most areas)' c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain - ID (south); OR (east)' - c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo)' + c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - AZ (most areas), Creston BC' c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific' c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska (most areas)' c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska - Juneau area' @@ -881,7 +873,7 @@ module Countries c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Alaska - Annette Island' c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska - Yakutat' c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska (west)' - c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands' + c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Alaska - western Aleutians' c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii' end country 'UY', 'Uruguay' do |c| @@ -895,32 +887,32 @@ module Countries c.timezone 'Europe/Rome', 419, 10, 749, 60 end country 'VC', 'St Vincent' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'VE', 'Venezuela' do |c| c.timezone 'America/Caracas', 21, 2, -1004, 15 end country 'VG', 'Virgin Islands (UK)' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'VI', 'Virgin Islands (US)' do |c| - c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60 + c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' end country 'VN', 'Vietnam' do |c| - c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)' - c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' + c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'south Vietnam' + c.timezone 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam' end country 'VU', 'Vanuatu' do |c| 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, Wake' end country 'WS', 'Samoa (western)' do |c| c.timezone 'Pacific/Apia', -83, 6, -2576, 15 end country 'YE', 'Yemen' do |c| - c.timezone 'Asia/Riyadh', 739, 30, 2803, 60 + c.timezone 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa' end country 'YT', 'Mayotte' do |c| c.timezone 'Africa/Nairobi', -77, 60, 2209, 60 diff --git a/test/tzinfo-data1/tzinfo/data/indexes/timezones.rb b/test/tzinfo-data1/tzinfo/data/indexes/timezones.rb index a42a2573..9611f146 100644 --- a/test/tzinfo-data1/tzinfo/data/indexes/timezones.rb +++ b/test/tzinfo-data1/tzinfo/data/indexes/timezones.rb @@ -10,7 +10,7 @@ module Timezones include TimezoneIndexDefinition timezone 'Africa/Abidjan' - timezone 'Africa/Accra' + linked_timezone 'Africa/Accra' linked_timezone 'Africa/Addis_Ababa' timezone 'Africa/Algiers' linked_timezone 'Africa/Asmara' @@ -83,14 +83,14 @@ module Timezones timezone 'America/Argentina/Ushuaia' linked_timezone 'America/Aruba' timezone 'America/Asuncion' - timezone 'America/Atikokan' + linked_timezone 'America/Atikokan' linked_timezone 'America/Atka' timezone 'America/Bahia' timezone 'America/Bahia_Banderas' timezone 'America/Barbados' timezone 'America/Belem' timezone 'America/Belize' - timezone 'America/Blanc-Sablon' + linked_timezone 'America/Blanc-Sablon' timezone 'America/Boa_Vista' timezone 'America/Bogota' timezone 'America/Boise' @@ -104,12 +104,13 @@ module Timezones linked_timezone 'America/Cayman' timezone 'America/Chicago' timezone 'America/Chihuahua' + timezone 'America/Ciudad_Juarez' linked_timezone 'America/Coral_Harbour' linked_timezone 'America/Cordoba' timezone 'America/Costa_Rica' - timezone 'America/Creston' + linked_timezone 'America/Creston' timezone 'America/Cuiaba' - timezone 'America/Curacao' + linked_timezone 'America/Curacao' timezone 'America/Danmarkshavn' timezone 'America/Dawson' timezone 'America/Dawson_Creek' @@ -176,9 +177,9 @@ module Timezones timezone 'America/Montevideo' linked_timezone 'America/Montreal' linked_timezone 'America/Montserrat' - timezone 'America/Nassau' + linked_timezone 'America/Nassau' timezone 'America/New_York' - timezone 'America/Nipigon' + linked_timezone 'America/Nipigon' timezone 'America/Nome' timezone 'America/Noronha' timezone 'America/North_Dakota/Beulah' @@ -187,16 +188,16 @@ module Timezones timezone 'America/Nuuk' timezone 'America/Ojinaga' timezone 'America/Panama' - timezone 'America/Pangnirtung' + linked_timezone 'America/Pangnirtung' timezone 'America/Paramaribo' timezone 'America/Phoenix' timezone 'America/Port-au-Prince' - timezone 'America/Port_of_Spain' + linked_timezone 'America/Port_of_Spain' linked_timezone 'America/Porto_Acre' timezone 'America/Porto_Velho' timezone 'America/Puerto_Rico' timezone 'America/Punta_Arenas' - timezone 'America/Rainy_River' + linked_timezone 'America/Rainy_River' timezone 'America/Rankin_Inlet' timezone 'America/Recife' timezone 'America/Regina' @@ -220,7 +221,7 @@ module Timezones timezone 'America/Swift_Current' timezone 'America/Tegucigalpa' timezone 'America/Thule' - timezone 'America/Thunder_Bay' + linked_timezone 'America/Thunder_Bay' timezone 'America/Tijuana' timezone 'America/Toronto' linked_timezone 'America/Tortola' @@ -229,19 +230,19 @@ module Timezones timezone 'America/Whitehorse' timezone 'America/Winnipeg' timezone 'America/Yakutat' - timezone 'America/Yellowknife' + linked_timezone 'America/Yellowknife' timezone 'Antarctica/Casey' timezone 'Antarctica/Davis' - timezone 'Antarctica/DumontDUrville' + linked_timezone 'Antarctica/DumontDUrville' timezone 'Antarctica/Macquarie' timezone 'Antarctica/Mawson' linked_timezone 'Antarctica/McMurdo' timezone 'Antarctica/Palmer' timezone 'Antarctica/Rothera' linked_timezone 'Antarctica/South_Pole' - timezone 'Antarctica/Syowa' + 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 +260,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 +294,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 +351,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' @@ -359,7 +360,7 @@ module Timezones timezone 'Australia/Brisbane' timezone 'Australia/Broken_Hill' linked_timezone 'Australia/Canberra' - timezone 'Australia/Currie' + linked_timezone 'Australia/Currie' timezone 'Australia/Darwin' timezone 'Australia/Eucla' timezone 'Australia/Hobart' @@ -434,7 +435,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 +448,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 +457,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,12 +484,12 @@ 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' timezone 'Europe/Ulyanovsk' - timezone 'Europe/Uzhgorod' + linked_timezone 'Europe/Uzhgorod' linked_timezone 'Europe/Vaduz' linked_timezone 'Europe/Vatican' timezone 'Europe/Vienna' @@ -495,7 +497,7 @@ module Timezones timezone 'Europe/Volgograd' timezone 'Europe/Warsaw' linked_timezone 'Europe/Zagreb' - timezone 'Europe/Zaporozhye' + linked_timezone 'Europe/Zaporozhye' timezone 'Europe/Zurich' timezone 'Factory' linked_timezone 'GB' @@ -510,15 +512,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,23 +542,24 @@ module Timezones timezone 'Pacific/Auckland' timezone 'Pacific/Bougainville' timezone 'Pacific/Chatham' - timezone 'Pacific/Chuuk' + linked_timezone 'Pacific/Chuuk' timezone 'Pacific/Easter' timezone 'Pacific/Efate' - timezone 'Pacific/Enderbury' + 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' timezone 'Pacific/Guam' timezone 'Pacific/Honolulu' linked_timezone 'Pacific/Johnston' + timezone 'Pacific/Kanton' 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' @@ -566,7 +569,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' @@ -576,8 +579,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/test/tzinfo-data1/tzinfo/data/version.rb b/test/tzinfo-data1/tzinfo/data/version.rb index df07db72..b4f2acfa 100644 --- a/test/tzinfo-data1/tzinfo/data/version.rb +++ b/test/tzinfo-data1/tzinfo/data/version.rb @@ -1,7 +1,7 @@ module TZInfo module Data # TZInfo::Data version number. - VERSION = '1.2020.4.test' + VERSION = '1.2023.3.test' # 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 = '2020d' + TZDATA = '2023c' end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/America/New_York.rb b/test/tzinfo-data2/tzinfo/data/definitions/America/New_York.rb index ebd8e48d..9ad2bcc1 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/America/New_York.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/America/New_York.rb @@ -320,6 +320,12 @@ module New_York tz.transition :o1, 3150684000 tz.transition :o2, 3161574000 tz.transition :o1, 3182133600 + tz.transition :o2, 3193023600 + tz.transition :o1, 3213583200 + tz.transition :o2, 3225078000 + tz.transition :o1, 3245637600 + tz.transition :o2, 3256527600 + tz.transition :o1, 3277087200 end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Australia/Melbourne.rb b/test/tzinfo-data2/tzinfo/data/definitions/Australia/Melbourne.rb index 32ab6cd0..1b4d0072 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/Australia/Melbourne.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/Australia/Melbourne.rb @@ -17,14 +17,14 @@ module Melbourne tz.offset :o2, 36000, 3600, 'AEDT' tz.transition :o1, -2364111592 - tz.transition :o2, -1672567140 - tz.transition :o1, -1665392400 + tz.transition :o2, -1672560000 + tz.transition :o1, -1665388800 tz.transition :o2, -883641600 - tz.transition :o1, -876128400 + tz.transition :o1, -876124800 tz.transition :o2, -860400000 - tz.transition :o1, -844678800 + tz.transition :o1, -844675200 tz.transition :o2, -828345600 - tz.transition :o1, -813229200 + tz.transition :o1, -813225600 tz.transition :o2, 57686400 tz.transition :o1, 67968000 tz.transition :o2, 89136000 @@ -223,6 +223,12 @@ module Melbourne tz.transition :o1, 3132489600 tz.transition :o2, 3148214400 tz.transition :o1, 3163939200 + tz.transition :o2, 3179664000 + tz.transition :o1, 3195388800 + tz.transition :o2, 3211113600 + tz.transition :o1, 3226838400 + tz.transition :o2, 3242563200 + tz.transition :o1, 3258288000 end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Amsterdam.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Amsterdam.rb deleted file mode 100644 index 35554fe5..00000000 --- a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Amsterdam.rb +++ /dev/null @@ -1,274 +0,0 @@ -# encoding: UTF-8 -# frozen_string_literal: true - -# 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 Amsterdam - include Format2::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 :o1, -4260212372 - tz.transition :o2, -1693700372 - tz.transition :o1, -1680484772 - tz.transition :o2, -1663453172 - tz.transition :o1, -1650147572 - tz.transition :o2, -1633213172 - tz.transition :o1, -1617488372 - tz.transition :o2, -1601158772 - tz.transition :o1, -1586038772 - tz.transition :o2, -1569709172 - tz.transition :o1, -1554589172 - tz.transition :o2, -1538259572 - tz.transition :o1, -1523139572 - tz.transition :o2, -1507501172 - tz.transition :o1, -1490566772 - tz.transition :o2, -1470176372 - tz.transition :o1, -1459117172 - tz.transition :o2, -1443997172 - tz.transition :o1, -1427667572 - tz.transition :o2, -1406672372 - tz.transition :o1, -1396217972 - tz.transition :o2, -1376950772 - tz.transition :o1, -1364768372 - tz.transition :o2, -1345414772 - tz.transition :o1, -1333318772 - tz.transition :o2, -1313792372 - tz.transition :o1, -1301264372 - tz.transition :o2, -1282256372 - tz.transition :o1, -1269814772 - tz.transition :o2, -1250720372 - tz.transition :o1, -1238365172 - tz.transition :o2, -1219184372 - tz.transition :o1, -1206915572 - tz.transition :o2, -1186957172 - tz.transition :o1, -1175465972 - tz.transition :o2, -1156025972 - tz.transition :o1, -1143411572 - tz.transition :o2, -1124489972 - tz.transition :o1, -1111961972 - tz.transition :o2, -1092953972 - tz.transition :o1, -1080512372 - tz.transition :o2, -1061331572 - tz.transition :o1, -1049062772 - tz.transition :o2, -1029190772 - tz.transition :o3, -1025745572 - tz.transition :o4, -1017613200 - tz.transition :o3, -998259600 - tz.transition :o4, -986163600 - tz.transition :o3, -966723600 - tz.transition :o4, -954109200 - tz.transition :o5, -935022000 - tz.transition :o6, -857257200 - tz.transition :o5, -844556400 - tz.transition :o6, -828226800 - tz.transition :o5, -812502000 - tz.transition :o6, -796777200 - tz.transition :o5, -781052400 - tz.transition :o6, -766623600 - tz.transition :o5, 228877200 - tz.transition :o6, 243997200 - tz.transition :o5, 260326800 - tz.transition :o6, 276051600 - tz.transition :o5, 291776400 - tz.transition :o6, 307501200 - tz.transition :o5, 323830800 - tz.transition :o6, 338950800 - tz.transition :o5, 354675600 - tz.transition :o6, 370400400 - tz.transition :o5, 386125200 - tz.transition :o6, 401850000 - tz.transition :o5, 417574800 - tz.transition :o6, 433299600 - tz.transition :o5, 449024400 - tz.transition :o6, 465354000 - tz.transition :o5, 481078800 - tz.transition :o6, 496803600 - tz.transition :o5, 512528400 - tz.transition :o6, 528253200 - tz.transition :o5, 543978000 - tz.transition :o6, 559702800 - tz.transition :o5, 575427600 - tz.transition :o6, 591152400 - tz.transition :o5, 606877200 - tz.transition :o6, 622602000 - tz.transition :o5, 638326800 - tz.transition :o6, 654656400 - tz.transition :o5, 670381200 - tz.transition :o6, 686106000 - tz.transition :o5, 701830800 - tz.transition :o6, 717555600 - tz.transition :o5, 733280400 - tz.transition :o6, 749005200 - tz.transition :o5, 764730000 - tz.transition :o6, 780454800 - tz.transition :o5, 796179600 - tz.transition :o6, 811904400 - tz.transition :o5, 828234000 - tz.transition :o6, 846378000 - tz.transition :o5, 859683600 - tz.transition :o6, 877827600 - tz.transition :o5, 891133200 - tz.transition :o6, 909277200 - tz.transition :o5, 922582800 - tz.transition :o6, 941331600 - tz.transition :o5, 954032400 - tz.transition :o6, 972781200 - tz.transition :o5, 985482000 - tz.transition :o6, 1004230800 - tz.transition :o5, 1017536400 - tz.transition :o6, 1035680400 - tz.transition :o5, 1048986000 - tz.transition :o6, 1067130000 - tz.transition :o5, 1080435600 - tz.transition :o6, 1099184400 - tz.transition :o5, 1111885200 - tz.transition :o6, 1130634000 - tz.transition :o5, 1143334800 - tz.transition :o6, 1162083600 - tz.transition :o5, 1174784400 - tz.transition :o6, 1193533200 - tz.transition :o5, 1206838800 - tz.transition :o6, 1224982800 - tz.transition :o5, 1238288400 - tz.transition :o6, 1256432400 - tz.transition :o5, 1269738000 - tz.transition :o6, 1288486800 - tz.transition :o5, 1301187600 - tz.transition :o6, 1319936400 - tz.transition :o5, 1332637200 - tz.transition :o6, 1351386000 - tz.transition :o5, 1364691600 - tz.transition :o6, 1382835600 - tz.transition :o5, 1396141200 - tz.transition :o6, 1414285200 - tz.transition :o5, 1427590800 - tz.transition :o6, 1445734800 - tz.transition :o5, 1459040400 - tz.transition :o6, 1477789200 - tz.transition :o5, 1490490000 - tz.transition :o6, 1509238800 - tz.transition :o5, 1521939600 - tz.transition :o6, 1540688400 - tz.transition :o5, 1553994000 - tz.transition :o6, 1572138000 - tz.transition :o5, 1585443600 - tz.transition :o6, 1603587600 - tz.transition :o5, 1616893200 - tz.transition :o6, 1635642000 - tz.transition :o5, 1648342800 - tz.transition :o6, 1667091600 - tz.transition :o5, 1679792400 - tz.transition :o6, 1698541200 - tz.transition :o5, 1711846800 - tz.transition :o6, 1729990800 - tz.transition :o5, 1743296400 - tz.transition :o6, 1761440400 - tz.transition :o5, 1774746000 - tz.transition :o6, 1792890000 - tz.transition :o5, 1806195600 - tz.transition :o6, 1824944400 - tz.transition :o5, 1837645200 - tz.transition :o6, 1856394000 - tz.transition :o5, 1869094800 - tz.transition :o6, 1887843600 - tz.transition :o5, 1901149200 - tz.transition :o6, 1919293200 - tz.transition :o5, 1932598800 - tz.transition :o6, 1950742800 - tz.transition :o5, 1964048400 - tz.transition :o6, 1982797200 - tz.transition :o5, 1995498000 - tz.transition :o6, 2014246800 - tz.transition :o5, 2026947600 - tz.transition :o6, 2045696400 - tz.transition :o5, 2058397200 - tz.transition :o6, 2077146000 - tz.transition :o5, 2090451600 - tz.transition :o6, 2108595600 - tz.transition :o5, 2121901200 - tz.transition :o6, 2140045200 - tz.transition :o5, 2153350800 - tz.transition :o6, 2172099600 - tz.transition :o5, 2184800400 - tz.transition :o6, 2203549200 - tz.transition :o5, 2216250000 - tz.transition :o6, 2234998800 - tz.transition :o5, 2248304400 - tz.transition :o6, 2266448400 - tz.transition :o5, 2279754000 - tz.transition :o6, 2297898000 - tz.transition :o5, 2311203600 - tz.transition :o6, 2329347600 - tz.transition :o5, 2342653200 - tz.transition :o6, 2361402000 - tz.transition :o5, 2374102800 - tz.transition :o6, 2392851600 - tz.transition :o5, 2405552400 - tz.transition :o6, 2424301200 - tz.transition :o5, 2437606800 - tz.transition :o6, 2455750800 - tz.transition :o5, 2469056400 - tz.transition :o6, 2487200400 - tz.transition :o5, 2500506000 - tz.transition :o6, 2519254800 - tz.transition :o5, 2531955600 - tz.transition :o6, 2550704400 - tz.transition :o5, 2563405200 - tz.transition :o6, 2582154000 - tz.transition :o5, 2595459600 - tz.transition :o6, 2613603600 - tz.transition :o5, 2626909200 - tz.transition :o6, 2645053200 - tz.transition :o5, 2658358800 - tz.transition :o6, 2676502800 - tz.transition :o5, 2689808400 - tz.transition :o6, 2708557200 - tz.transition :o5, 2721258000 - tz.transition :o6, 2740006800 - tz.transition :o5, 2752707600 - tz.transition :o6, 2771456400 - tz.transition :o5, 2784762000 - tz.transition :o6, 2802906000 - tz.transition :o5, 2816211600 - tz.transition :o6, 2834355600 - tz.transition :o5, 2847661200 - tz.transition :o6, 2866410000 - tz.transition :o5, 2879110800 - tz.transition :o6, 2897859600 - tz.transition :o5, 2910560400 - tz.transition :o6, 2929309200 - tz.transition :o5, 2942010000 - tz.transition :o6, 2960758800 - tz.transition :o5, 2974064400 - tz.transition :o6, 2992208400 - tz.transition :o5, 3005514000 - tz.transition :o6, 3023658000 - tz.transition :o5, 3036963600 - tz.transition :o6, 3055712400 - tz.transition :o5, 3068413200 - tz.transition :o6, 3087162000 - tz.transition :o5, 3099862800 - tz.transition :o6, 3118611600 - tz.transition :o5, 3131917200 - tz.transition :o6, 3150061200 - tz.transition :o5, 3163366800 - tz.transition :o6, 3181510800 - end - end - end - end - end -end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Andorra.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Andorra.rb index 2e115607..ffa024cd 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Andorra.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Andorra.rb @@ -191,6 +191,12 @@ module Andorra tz.transition :o2, 3150061200 tz.transition :o3, 3163366800 tz.transition :o2, 3181510800 + tz.transition :o3, 3194816400 + tz.transition :o2, 3212960400 + tz.transition :o3, 3226266000 + tz.transition :o2, 3245014800 + tz.transition :o3, 3257715600 + tz.transition :o2, 3276464400 end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Brussels.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Brussels.rb new file mode 100644 index 00000000..f0e7a6d6 --- /dev/null +++ b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Brussels.rb @@ -0,0 +1,283 @@ +# 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 Brussels + include Format2::TimezoneDefinition + + timezone 'Europe/Brussels' do |tz| + tz.offset :o0, 1050, 0, 'LMT' + tz.offset :o1, 1050, 0, 'BMT' + tz.offset :o2, 0, 0, 'WET' + tz.offset :o3, 3600, 0, 'CET' + tz.offset :o4, 3600, 3600, 'CEST' + tz.offset :o5, 0, 3600, 'WEST' + + tz.transition :o1, -2840141850 + tz.transition :o2, -2450995200 + tz.transition :o3, -1740355200 + tz.transition :o4, -1693702800 + tz.transition :o3, -1680483600 + tz.transition :o4, -1663455600 + tz.transition :o3, -1650150000 + tz.transition :o4, -1632006000 + tz.transition :o3, -1618700400 + tz.transition :o2, -1613826000 + tz.transition :o5, -1604278800 + tz.transition :o2, -1585530000 + tz.transition :o5, -1574038800 + tz.transition :o2, -1552266000 + tz.transition :o5, -1539997200 + tz.transition :o2, -1520557200 + tz.transition :o5, -1507510800 + tz.transition :o2, -1490576400 + tz.transition :o5, -1473642000 + tz.transition :o2, -1459126800 + tz.transition :o5, -1444006800 + tz.transition :o2, -1427677200 + tz.transition :o5, -1411952400 + tz.transition :o2, -1396227600 + tz.transition :o5, -1379293200 + tz.transition :o2, -1364778000 + tz.transition :o5, -1348448400 + tz.transition :o2, -1333328400 + tz.transition :o5, -1316394000 + tz.transition :o2, -1301263200 + tz.transition :o5, -1284328800 + tz.transition :o2, -1269813600 + tz.transition :o5, -1253484000 + tz.transition :o2, -1238364000 + tz.transition :o5, -1221429600 + tz.transition :o2, -1206914400 + tz.transition :o5, -1191189600 + tz.transition :o2, -1175464800 + tz.transition :o5, -1160344800 + tz.transition :o2, -1143410400 + tz.transition :o5, -1127685600 + tz.transition :o2, -1111960800 + tz.transition :o5, -1096840800 + tz.transition :o2, -1080511200 + tz.transition :o5, -1063576800 + tz.transition :o2, -1049061600 + tz.transition :o5, -1033336800 + tz.transition :o2, -1017612000 + tz.transition :o5, -1002492000 + tz.transition :o2, -986162400 + tz.transition :o5, -969228000 + tz.transition :o2, -950479200 + tz.transition :o5, -942012000 + tz.transition :o4, -934668000 + tz.transition :o3, -857257200 + tz.transition :o4, -844556400 + tz.transition :o3, -828226800 + tz.transition :o4, -812502000 + tz.transition :o3, -798073200 + tz.transition :o4, -781052400 + tz.transition :o3, -766623600 + tz.transition :o4, -745455600 + tz.transition :o3, -733273200 + tz.transition :o4, 228877200 + tz.transition :o3, 243997200 + tz.transition :o4, 260326800 + tz.transition :o3, 276051600 + tz.transition :o4, 291776400 + tz.transition :o3, 307501200 + tz.transition :o4, 323830800 + tz.transition :o3, 338950800 + tz.transition :o4, 354675600 + tz.transition :o3, 370400400 + tz.transition :o4, 386125200 + tz.transition :o3, 401850000 + tz.transition :o4, 417574800 + tz.transition :o3, 433299600 + tz.transition :o4, 449024400 + tz.transition :o3, 465354000 + tz.transition :o4, 481078800 + tz.transition :o3, 496803600 + tz.transition :o4, 512528400 + tz.transition :o3, 528253200 + tz.transition :o4, 543978000 + tz.transition :o3, 559702800 + tz.transition :o4, 575427600 + tz.transition :o3, 591152400 + tz.transition :o4, 606877200 + tz.transition :o3, 622602000 + tz.transition :o4, 638326800 + tz.transition :o3, 654656400 + tz.transition :o4, 670381200 + tz.transition :o3, 686106000 + tz.transition :o4, 701830800 + tz.transition :o3, 717555600 + tz.transition :o4, 733280400 + tz.transition :o3, 749005200 + tz.transition :o4, 764730000 + tz.transition :o3, 780454800 + tz.transition :o4, 796179600 + tz.transition :o3, 811904400 + tz.transition :o4, 828234000 + tz.transition :o3, 846378000 + tz.transition :o4, 859683600 + tz.transition :o3, 877827600 + tz.transition :o4, 891133200 + tz.transition :o3, 909277200 + tz.transition :o4, 922582800 + tz.transition :o3, 941331600 + tz.transition :o4, 954032400 + tz.transition :o3, 972781200 + tz.transition :o4, 985482000 + tz.transition :o3, 1004230800 + tz.transition :o4, 1017536400 + tz.transition :o3, 1035680400 + tz.transition :o4, 1048986000 + tz.transition :o3, 1067130000 + tz.transition :o4, 1080435600 + tz.transition :o3, 1099184400 + tz.transition :o4, 1111885200 + tz.transition :o3, 1130634000 + tz.transition :o4, 1143334800 + tz.transition :o3, 1162083600 + tz.transition :o4, 1174784400 + tz.transition :o3, 1193533200 + tz.transition :o4, 1206838800 + tz.transition :o3, 1224982800 + tz.transition :o4, 1238288400 + tz.transition :o3, 1256432400 + tz.transition :o4, 1269738000 + tz.transition :o3, 1288486800 + tz.transition :o4, 1301187600 + tz.transition :o3, 1319936400 + tz.transition :o4, 1332637200 + tz.transition :o3, 1351386000 + tz.transition :o4, 1364691600 + tz.transition :o3, 1382835600 + tz.transition :o4, 1396141200 + tz.transition :o3, 1414285200 + tz.transition :o4, 1427590800 + tz.transition :o3, 1445734800 + tz.transition :o4, 1459040400 + tz.transition :o3, 1477789200 + tz.transition :o4, 1490490000 + tz.transition :o3, 1509238800 + tz.transition :o4, 1521939600 + tz.transition :o3, 1540688400 + tz.transition :o4, 1553994000 + tz.transition :o3, 1572138000 + tz.transition :o4, 1585443600 + tz.transition :o3, 1603587600 + tz.transition :o4, 1616893200 + tz.transition :o3, 1635642000 + tz.transition :o4, 1648342800 + tz.transition :o3, 1667091600 + tz.transition :o4, 1679792400 + tz.transition :o3, 1698541200 + tz.transition :o4, 1711846800 + tz.transition :o3, 1729990800 + tz.transition :o4, 1743296400 + tz.transition :o3, 1761440400 + tz.transition :o4, 1774746000 + tz.transition :o3, 1792890000 + tz.transition :o4, 1806195600 + tz.transition :o3, 1824944400 + tz.transition :o4, 1837645200 + tz.transition :o3, 1856394000 + tz.transition :o4, 1869094800 + tz.transition :o3, 1887843600 + tz.transition :o4, 1901149200 + tz.transition :o3, 1919293200 + tz.transition :o4, 1932598800 + tz.transition :o3, 1950742800 + tz.transition :o4, 1964048400 + tz.transition :o3, 1982797200 + tz.transition :o4, 1995498000 + tz.transition :o3, 2014246800 + tz.transition :o4, 2026947600 + tz.transition :o3, 2045696400 + tz.transition :o4, 2058397200 + tz.transition :o3, 2077146000 + tz.transition :o4, 2090451600 + tz.transition :o3, 2108595600 + tz.transition :o4, 2121901200 + tz.transition :o3, 2140045200 + tz.transition :o4, 2153350800 + tz.transition :o3, 2172099600 + tz.transition :o4, 2184800400 + tz.transition :o3, 2203549200 + tz.transition :o4, 2216250000 + tz.transition :o3, 2234998800 + tz.transition :o4, 2248304400 + tz.transition :o3, 2266448400 + tz.transition :o4, 2279754000 + tz.transition :o3, 2297898000 + tz.transition :o4, 2311203600 + tz.transition :o3, 2329347600 + tz.transition :o4, 2342653200 + tz.transition :o3, 2361402000 + tz.transition :o4, 2374102800 + tz.transition :o3, 2392851600 + tz.transition :o4, 2405552400 + tz.transition :o3, 2424301200 + tz.transition :o4, 2437606800 + tz.transition :o3, 2455750800 + tz.transition :o4, 2469056400 + tz.transition :o3, 2487200400 + tz.transition :o4, 2500506000 + tz.transition :o3, 2519254800 + tz.transition :o4, 2531955600 + tz.transition :o3, 2550704400 + tz.transition :o4, 2563405200 + tz.transition :o3, 2582154000 + tz.transition :o4, 2595459600 + tz.transition :o3, 2613603600 + tz.transition :o4, 2626909200 + tz.transition :o3, 2645053200 + tz.transition :o4, 2658358800 + tz.transition :o3, 2676502800 + tz.transition :o4, 2689808400 + tz.transition :o3, 2708557200 + tz.transition :o4, 2721258000 + tz.transition :o3, 2740006800 + tz.transition :o4, 2752707600 + tz.transition :o3, 2771456400 + tz.transition :o4, 2784762000 + tz.transition :o3, 2802906000 + tz.transition :o4, 2816211600 + tz.transition :o3, 2834355600 + tz.transition :o4, 2847661200 + tz.transition :o3, 2866410000 + tz.transition :o4, 2879110800 + tz.transition :o3, 2897859600 + tz.transition :o4, 2910560400 + tz.transition :o3, 2929309200 + tz.transition :o4, 2942010000 + tz.transition :o3, 2960758800 + tz.transition :o4, 2974064400 + tz.transition :o3, 2992208400 + tz.transition :o4, 3005514000 + tz.transition :o3, 3023658000 + tz.transition :o4, 3036963600 + tz.transition :o3, 3055712400 + tz.transition :o4, 3068413200 + tz.transition :o3, 3087162000 + tz.transition :o4, 3099862800 + tz.transition :o3, 3118611600 + tz.transition :o4, 3131917200 + tz.transition :o3, 3150061200 + tz.transition :o4, 3163366800 + tz.transition :o3, 3181510800 + tz.transition :o4, 3194816400 + tz.transition :o3, 3212960400 + tz.transition :o4, 3226266000 + tz.transition :o3, 3245014800 + tz.transition :o4, 3257715600 + tz.transition :o3, 3276464400 + end + end + end + end + end +end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/London.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/London.rb index 5a650193..524b72d2 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/Europe/London.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/Europe/London.rb @@ -326,6 +326,12 @@ module London tz.transition :o1, 3150061200 tz.transition :o2, 3163366800 tz.transition :o1, 3181510800 + tz.transition :o2, 3194816400 + tz.transition :o1, 3212960400 + tz.transition :o2, 3226266000 + tz.transition :o1, 3245014800 + tz.transition :o2, 3257715600 + tz.transition :o1, 3276464400 end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Paris.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Paris.rb index eb708d03..b29f0f5c 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Paris.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Paris.rb @@ -270,6 +270,12 @@ module Paris tz.transition :o5, 3150061200 tz.transition :o4, 3163366800 tz.transition :o5, 3181510800 + tz.transition :o4, 3194816400 + tz.transition :o5, 3212960400 + tz.transition :o4, 3226266000 + tz.transition :o5, 3245014800 + tz.transition :o4, 3257715600 + tz.transition :o5, 3276464400 end end end diff --git a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Prague.rb b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Prague.rb index f4ebb8f2..8965fdfd 100644 --- a/test/tzinfo-data2/tzinfo/data/definitions/Europe/Prague.rb +++ b/test/tzinfo-data2/tzinfo/data/definitions/Europe/Prague.rb @@ -228,6 +228,12 @@ module Prague tz.transition :o2, 3150061200 tz.transition :o3, 3163366800 tz.transition :o2, 3181510800 + tz.transition :o3, 3194816400 + tz.transition :o2, 3212960400 + tz.transition :o3, 3226266000 + tz.transition :o2, 3245014800 + tz.transition :o3, 3257715600 + tz.transition :o2, 3276464400 end end end diff --git a/test/tzinfo-data2/tzinfo/data/indexes/countries.rb b/test/tzinfo-data2/tzinfo/data/indexes/countries.rb index 8ed6b9d2..ddd9db33 100644 --- a/test/tzinfo-data2/tzinfo/data/indexes/countries.rb +++ b/test/tzinfo-data2/tzinfo/data/indexes/countries.rb @@ -16,31 +16,41 @@ module Countries i.timezone :t3, 'Africa/Lagos', 129, 20, 17, 5, 'West Africa Time' i.timezone :t4, 'Africa/Maputo', -779, 30, 391, 12, 'Central Africa Time' i.timezone :t5, 'Africa/Nairobi', -77, 60, 2209, 60 - i.timezone :t6, 'America/Curacao', 731, 60, -69, 1 - i.timezone :t7, 'America/Panama', 269, 30, -1193, 15 - i.timezone :t8, 'America/Port_of_Spain', 213, 20, -3691, 60 - i.timezone :t9, 'Asia/Bangkok', 55, 4, 6031, 60, 'Indochina (most areas)' - i.timezone :t10, 'Asia/Dubai', 253, 10, 553, 10 - i.timezone :t11, 'Asia/Qatar', 1517, 60, 773, 15 - i.timezone :t12, 'Asia/Riyadh', 739, 30, 2803, 60 - i.timezone :t13, 'Europe/Belgrade', 269, 6, 41, 2 - i.timezone :t14, 'Europe/Helsinki', 361, 6, 749, 30 - i.timezone :t15, 'Europe/London', 6181, 120, -451, 3600 - i.timezone :t16, 'Europe/Oslo', 719, 12, 43, 4 - i.timezone :t17, 'Europe/Prague', 601, 12, 433, 30 - i.timezone :t18, 'Europe/Rome', 419, 10, 749, 60 - i.timezone :t19, 'Europe/Zurich', 2843, 60, 128, 15, 'Swiss time' - i.timezone :t20, 'Indian/Reunion', -313, 15, 832, 15, 'Réunion, Crozet, Scattered Islands' - i.timezone :t21, 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time' - i.timezone :t22, 'Pacific/Guam', 202, 15, 579, 4 - i.timezone :t23, 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii' - i.timezone :t24, 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Samoa, Midway' + i.timezone :t6, 'America/Panama', 269, 30, -1193, 15, 'EST - ON (Atikokan), NU (Coral H)' + i.timezone :t7, 'America/Phoenix', 20069, 600, -16811, 150, 'MST - AZ (most areas), Creston BC' + i.timezone :t8, 'America/Puerto_Rico', 11081, 600, -118991, 1800, 'AST' + i.timezone :t9, 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)' + i.timezone :t10, 'Asia/Bangkok', 55, 4, 6031, 60, 'north Vietnam' + i.timezone :t11, 'Asia/Dubai', 253, 10, 553, 10, 'Crozet, Scattered Is' + i.timezone :t12, 'Asia/Kuching', 31, 20, 331, 3, 'Sabah, Sarawak' + i.timezone :t13, 'Asia/Qatar', 1517, 60, 773, 15 + i.timezone :t14, 'Asia/Riyadh', 739, 30, 2803, 60, 'Syowa' + i.timezone :t15, 'Asia/Singapore', 77, 60, 2077, 20, 'peninsular Malaysia' + i.timezone :t16, 'Asia/Urumqi', 219, 5, 1051, 12, 'Xinjiang Time, Vostok' + i.timezone :t17, 'Asia/Yangon', 1007, 60, 577, 6 + i.timezone :t18, 'Europe/Belgrade', 269, 6, 41, 2 + i.timezone :t19, 'Europe/Berlin', 105, 2, 401, 30, 'most of Germany' + i.timezone :t20, 'Europe/Brussels', 305, 6, 13, 3 + i.timezone :t21, 'Europe/Helsinki', 361, 6, 749, 30 + i.timezone :t22, 'Europe/London', 6181, 120, -451, 3600 + i.timezone :t23, 'Europe/Paris', 733, 15, 7, 3 + i.timezone :t24, 'Europe/Prague', 601, 12, 433, 30 + i.timezone :t25, 'Europe/Rome', 419, 10, 749, 60 + i.timezone :t26, 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea' + i.timezone :t27, 'Europe/Zurich', 2843, 60, 128, 15, 'Büsingen' + i.timezone :t28, 'Indian/Maldives', 25, 6, 147, 2, 'Kerguelen, St Paul I, Amsterdam I' + i.timezone :t29, 'Pacific/Auckland', -553, 15, 5243, 30, 'New Zealand time' + i.timezone :t30, 'Pacific/Guadalcanal', -143, 15, 801, 5, 'Pohnpei' + i.timezone :t31, 'Pacific/Guam', 202, 15, 579, 4 + i.timezone :t32, 'Pacific/Pago_Pago', -214, 15, -1707, 10, 'Midway' + i.timezone :t33, 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas), Chuuk, Yap, Dumont d\'Urville' + i.timezone :t34, 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilberts, Marshalls, Wake' i.country 'AD', 'Andorra' do |c| c.timezone 'Europe/Andorra', 85, 2, 91, 60 end i.country 'AE', 'United Arab Emirates' do |c| - c.timezone :t10 + c.timezone :t11 end i.country 'AF', 'Afghanistan' do |c| c.timezone 'Asia/Kabul', 2071, 60, 346, 5 @@ -63,18 +73,18 @@ module Countries i.country 'AQ', 'Antarctica' do |c| c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey' c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis' - c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville' c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson' c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer' c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera' - c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa' c.timezone 'Antarctica/Troll', -259241, 3600, 507, 200, 'Troll' - c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok' - c.timezone :t21 + c.timezone :t16 + c.timezone :t29 + c.timezone :t33 + c.timezone :t14 end i.country 'AR', 'Argentina' do |c| c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)' - c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)' + c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most areas: CB, CC, CN, ER, FM, MN, SE, SF' c.timezone 'America/Argentina/Salta', -1487, 60, -785, 12, 'Salta (SA, LP, NQ, RN)' c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)' c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucumán (TM)' @@ -87,7 +97,7 @@ module Countries c.timezone 'America/Argentina/Ushuaia', -274, 5, -683, 10, 'Tierra del Fuego (TF)' end i.country 'AS', 'Samoa (American)' do |c| - c.timezone :t24 + c.timezone :t32 end i.country 'AT', 'Austria' do |c| c.timezone 'Europe/Vienna', 2893, 60, 49, 3 @@ -95,8 +105,7 @@ module Countries i.country 'AU', 'Australia' do |c| c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island' c.timezone 'Antarctica/Macquarie', -109, 2, 3179, 20, 'Macquarie Island' - c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania (most areas)' - c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania (King Island)' + c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania' c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria' c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales (most areas)' c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales (Yancowinna)' @@ -108,16 +117,16 @@ module Countries c.timezone 'Australia/Eucla', -1903, 60, 1933, 15, 'Western Australia (Eucla)' end i.country 'AW', 'Aruba' do |c| - c.timezone :t6 + c.timezone :t8 end i.country 'AX', 'Åland Islands' do |c| - c.timezone :t14 + c.timezone :t21 end i.country 'AZ', 'Azerbaijan' do |c| c.timezone 'Asia/Baku', 2423, 60, 997, 20 end i.country 'BA', 'Bosnia & Herzegovina' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'BB', 'Barbados' do |c| c.timezone 'America/Barbados', 131, 10, -3577, 60 @@ -126,7 +135,7 @@ module Countries c.timezone 'Asia/Dhaka', 1423, 60, 1085, 12 end i.country 'BE', 'Belgium' do |c| - c.timezone 'Europe/Brussels', 305, 6, 13, 3 + c.timezone :t20 end i.country 'BF', 'Burkina Faso' do |c| c.timezone :t1 @@ -135,7 +144,7 @@ module Countries c.timezone 'Europe/Sofia', 2561, 60, 1399, 60 end i.country 'BH', 'Bahrain' do |c| - c.timezone :t11 + c.timezone :t13 end i.country 'BI', 'Burundi' do |c| c.timezone :t4 @@ -150,13 +159,13 @@ module Countries c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30 end i.country 'BN', 'Brunei' do |c| - c.timezone 'Asia/Brunei', 74, 15, 1379, 12 + c.timezone :t12 end i.country 'BO', 'Bolivia' do |c| c.timezone 'America/La_Paz', -33, 2, -1363, 20 end i.country 'BQ', 'Caribbean NL' do |c| - c.timezone :t6 + c.timezone :t8 end i.country 'BR', 'Brazil' do |c| c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands' @@ -177,7 +186,7 @@ module Countries c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre' end i.country 'BS', 'Bahamas' do |c| - c.timezone 'America/Nassau', 301, 12, -1547, 20 + c.timezone :t9 end i.country 'BT', 'Bhutan' do |c| c.timezone 'Asia/Thimphu', 412, 15, 1793, 20 @@ -198,32 +207,27 @@ module Countries c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic - NS (Cape Breton)' c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic - New Brunswick' c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic - Labrador (most areas)' - c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'AST - QC (Lower North Shore)' - c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern - ON, QC (most areas)' - c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern - ON, QC (no DST 1967-73)' - c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern - ON (Thunder Bay)' - c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most east areas)' - c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern - NU (Pangnirtung)' - c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'EST - ON (Atikokan); NU (Coral H)' + c.timezone :t9 + c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern - NU (most areas)' c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central - ON (west); Manitoba' - c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central - ON (Rainy R, Ft Frances)' c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Central - NU (Resolute)' c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central - NU (central)' c.timezone 'America/Regina', 252, 5, -2093, 20, 'CST - SK (most areas)' c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'CST - SK (midwest)' - c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); SK (W)' + c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain - AB; BC (E); NT (E); SK (W)' 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/Creston', 491, 10, -6991, 60, 'MST - BC (Creston)' - 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)' c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific - BC (most areas)' - c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific - Yukon (east)' - c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific - Yukon (west)' + c.timezone :t6 + c.timezone :t8 + c.timezone :t7 end i.country 'CC', 'Cocos (Keeling) Islands' do |c| - c.timezone 'Indian/Cocos', -73, 6, 1163, 12 + c.timezone :t17 end i.country 'CD', 'Congo (Dem. Rep.)' do |c| c.timezone :t4 @@ -236,7 +240,7 @@ module Countries c.timezone :t3 end i.country 'CH', 'Switzerland' do |c| - c.timezone :t19 + c.timezone :t27 end i.country 'CI', 'Côte d\'Ivoire' do |c| c.timezone :t1 @@ -245,7 +249,7 @@ module Countries c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30 end i.country 'CL', 'Chile' do |c| - c.timezone 'America/Santiago', -669, 20, -212, 3, 'Chile (most areas)' + c.timezone 'America/Santiago', -669, 20, -212, 3, 'most of Chile' c.timezone 'America/Punta_Arenas', -1063, 20, -851, 12, 'Region of Magallanes' c.timezone 'Pacific/Easter', -543, 20, -3283, 30, 'Easter Island' end @@ -254,7 +258,7 @@ module Countries end i.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 :t16 end i.country 'CO', 'Colombia' do |c| c.timezone 'America/Bogota', 23, 5, -889, 12 @@ -269,27 +273,27 @@ module Countries c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60 end i.country 'CW', 'Curaçao' do |c| - c.timezone :t6 + c.timezone :t8 end i.country 'CX', 'Christmas Island' do |c| - c.timezone 'Indian/Christmas', -125, 12, 6343, 60 + c.timezone :t10 end i.country 'CY', 'Cyprus' do |c| - c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'Cyprus (most areas)' + c.timezone 'Asia/Nicosia', 211, 6, 1001, 30, 'most of Cyprus' c.timezone 'Asia/Famagusta', 2107, 60, 679, 20, 'Northern Cyprus' end i.country 'CZ', 'Czech Republic' do |c| - c.timezone :t17 + c.timezone :t24 end i.country 'DE', 'Germany' do |c| - c.timezone 'Europe/Berlin', 105, 2, 401, 30, 'Germany (most areas)' c.timezone :t19 + c.timezone :t27 end i.country 'DJ', 'Djibouti' do |c| c.timezone :t5 end i.country 'DK', 'Denmark' do |c| - c.timezone 'Europe/Copenhagen', 167, 3, 151, 12 + c.timezone :t19 end i.country 'DM', 'Dominica' do |c| c.timezone :t8 @@ -325,7 +329,7 @@ module Countries c.timezone :t5 end i.country 'FI', 'Finland' do |c| - c.timezone :t14 + c.timezone :t21 end i.country 'FJ', 'Fiji' do |c| c.timezone 'Pacific/Fiji', -272, 15, 2141, 12 @@ -334,21 +338,21 @@ module Countries c.timezone 'Atlantic/Stanley', -517, 10, -1157, 20 end i.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 :t33 + c.timezone :t30 end i.country 'FO', 'Faroe Islands' do |c| c.timezone 'Atlantic/Faroe', 3721, 60, -203, 30 end i.country 'FR', 'France' do |c| - c.timezone 'Europe/Paris', 733, 15, 7, 3 + c.timezone :t23 end i.country 'GA', 'Gabon' do |c| c.timezone :t3 end i.country 'GB', 'Britain (UK)' do |c| - c.timezone :t15 + c.timezone :t22 end i.country 'GD', 'Grenada' do |c| c.timezone :t8 @@ -360,16 +364,16 @@ module Countries c.timezone 'America/Cayenne', 74, 15, -157, 3 end i.country 'GG', 'Guernsey' do |c| - c.timezone :t15 + c.timezone :t22 end i.country 'GH', 'Ghana' do |c| - c.timezone 'Africa/Accra', 111, 20, -13, 60 + c.timezone :t1 end i.country 'GI', 'Gibraltar' do |c| c.timezone 'Europe/Gibraltar', 542, 15, -107, 20 end i.country 'GL', 'Greenland' do |c| - c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'Greenland (most areas)' + c.timezone 'America/Nuuk', 3851, 60, -776, 15, 'most of Greenland' c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'National Park (east coast)' c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund/Ittoqqortoormiit' c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule/Pituffik' @@ -396,7 +400,7 @@ module Countries c.timezone 'America/Guatemala', 439, 30, -5431, 60 end i.country 'GU', 'Guam' do |c| - c.timezone :t22 + c.timezone :t31 end i.country 'GW', 'Guinea-Bissau' do |c| c.timezone 'Africa/Bissau', 237, 20, -187, 12 @@ -412,7 +416,7 @@ module Countries c.timezone 'America/Tegucigalpa', 141, 10, -5233, 60 end i.country 'HR', 'Croatia' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'HT', 'Haiti' do |c| c.timezone 'America/Port-au-Prince', 278, 15, -217, 3 @@ -433,7 +437,7 @@ module Countries c.timezone 'Asia/Jerusalem', 11441, 360, 63403, 1800 end i.country 'IM', 'Isle of Man' do |c| - c.timezone :t15 + c.timezone :t22 end i.country 'IN', 'India' do |c| c.timezone 'Asia/Kolkata', 338, 15, 2651, 30 @@ -448,13 +452,13 @@ module Countries c.timezone 'Asia/Tehran', 107, 3, 1543, 30 end i.country 'IS', 'Iceland' do |c| - c.timezone 'Atlantic/Reykjavik', 1283, 20, -437, 20 + c.timezone :t1 end i.country 'IT', 'Italy' do |c| - c.timezone :t18 + c.timezone :t25 end i.country 'JE', 'Jersey' do |c| - c.timezone :t15 + c.timezone :t22 end i.country 'JM', 'Jamaica' do |c| c.timezone 'America/Jamaica', 12937, 720, -11519, 150 @@ -472,11 +476,11 @@ module Countries c.timezone 'Asia/Bishkek', 429, 10, 373, 5 end i.country 'KH', 'Cambodia' do |c| - c.timezone :t9 + c.timezone :t10 end i.country 'KI', 'Kiribati' do |c| - c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands' - c.timezone 'Pacific/Enderbury', -47, 15, -2053, 12, 'Phoenix Islands' + c.timezone :t34 + c.timezone 'Pacific/Kanton', -167, 60, -10303, 60, 'Phoenix Islands' c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands' end i.country 'KM', 'Comoros' do |c| @@ -492,13 +496,13 @@ module Countries c.timezone 'Asia/Seoul', 751, 20, 3809, 30 end i.country 'KW', 'Kuwait' do |c| - c.timezone :t12 + c.timezone :t14 end i.country 'KY', 'Cayman Islands' do |c| - c.timezone :t7 + c.timezone :t6 end i.country 'KZ', 'Kazakhstan' do |c| - c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'Kazakhstan (most areas)' + c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most of Kazakhstan' c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda/Kyzylorda/Kzyl-Orda' c.timezone 'Asia/Qostanay', 266, 5, 3817, 60, 'Qostanay/Kostanay/Kustanay' c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtöbe/Aktobe' @@ -507,7 +511,7 @@ module Countries c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan' end i.country 'LA', 'Laos' do |c| - c.timezone :t9 + c.timezone :t10 end i.country 'LB', 'Lebanon' do |c| c.timezone 'Asia/Beirut', 2033, 60, 71, 2 @@ -516,7 +520,7 @@ module Countries c.timezone :t8 end i.country 'LI', 'Liechtenstein' do |c| - c.timezone :t19 + c.timezone :t27 end i.country 'LK', 'Sri Lanka' do |c| c.timezone 'Asia/Colombo', 104, 15, 1597, 20 @@ -531,7 +535,7 @@ module Countries c.timezone 'Europe/Vilnius', 3281, 60, 1519, 60 end i.country 'LU', 'Luxembourg' do |c| - c.timezone 'Europe/Luxembourg', 248, 5, 123, 20 + c.timezone :t20 end i.country 'LV', 'Latvia' do |c| c.timezone 'Europe/Riga', 1139, 20, 241, 10 @@ -543,13 +547,13 @@ module Countries c.timezone 'Africa/Casablanca', 673, 20, -91, 12 end i.country 'MC', 'Monaco' do |c| - c.timezone 'Europe/Monaco', 437, 10, 443, 60 + c.timezone :t23 end i.country 'MD', 'Moldova' do |c| c.timezone 'Europe/Chisinau', 47, 1, 173, 6 end i.country 'ME', 'Montenegro' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'MF', 'St Martin (French)' do |c| c.timezone :t8 @@ -558,20 +562,20 @@ module Countries c.timezone :t5 end i.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 :t34 end i.country 'MK', 'North Macedonia' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'ML', 'Mali' do |c| c.timezone :t1 end i.country 'MM', 'Myanmar (Burma)' do |c| - c.timezone 'Asia/Yangon', 1007, 60, 577, 6 + c.timezone :t17 end i.country 'MN', 'Mongolia' do |c| - c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'Mongolia (most areas)' + c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most of Mongolia' c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan' c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sükhbaatar' end @@ -579,7 +583,7 @@ module Countries c.timezone 'Asia/Macau', 7991, 360, 2725, 24 end i.country 'MP', 'Northern Mariana Islands' do |c| - c.timezone :t22 + c.timezone :t31 end i.country 'MQ', 'Martinique' do |c| c.timezone 'America/Martinique', 73, 5, -733, 12 @@ -597,27 +601,28 @@ module Countries c.timezone 'Indian/Mauritius', -121, 6, 115, 2 end i.country 'MV', 'Maldives' do |c| - c.timezone 'Indian/Maldives', 25, 6, 147, 2 + c.timezone :t28 end i.country 'MW', 'Malawi' do |c| c.timezone :t4 end i.country 'MX', 'Mexico' do |c| - c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time' - c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Eastern Standard Time - Quintana Roo' - c.timezone 'America/Merida', 629, 30, -5377, 60, 'Central Time - Campeche, Yucatán' - c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas)' - c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)' - c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - Baja California Sur, Nayarit, Sinaloa' - c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mountain Time - Chihuahua (most areas)' - c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Mountain Time US - Chihuahua (US border)' - c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora' - c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Pacific Time US - Baja California' - c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Central Time - Bahía de Banderas' + c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Mexico' + c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Quintana Roo' + c.timezone 'America/Merida', 629, 30, -5377, 60, 'Campeche, Yucatán' + c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Durango; Coahuila, Nuevo León, Tamaulipas (most areas)' + c.timezone 'America/Matamoros', 155, 6, -195, 2, 'Coahuila, Nuevo León, Tamaulipas (US border)' + c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Chihuahua (most areas)' + c.timezone 'America/Ciudad_Juarez', 476, 15, -6389, 60, 'Chihuahua (US border - west)' + c.timezone 'America/Ojinaga', 887, 30, -1253, 12, 'Chihuahua (US border - east)' + c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Baja California Sur, Nayarit (most areas), Sinaloa' + c.timezone 'America/Bahia_Banderas', 104, 5, -421, 4, 'Bahía de Banderas' + c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Sonora' + c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Baja California' end i.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 :t12 + c.timezone :t15 end i.country 'MZ', 'Mozambique' do |c| c.timezone :t4 @@ -641,10 +646,10 @@ module Countries c.timezone 'America/Managua', 243, 20, -5177, 60 end i.country 'NL', 'Netherlands' do |c| - c.timezone 'Europe/Amsterdam', 1571, 30, 49, 10 + c.timezone :t20 end i.country 'NO', 'Norway' do |c| - c.timezone :t16 + c.timezone :t19 end i.country 'NP', 'Nepal' do |c| c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60 @@ -656,14 +661,14 @@ module Countries c.timezone 'Pacific/Niue', -1141, 60, -2039, 12 end i.country 'NZ', 'New Zealand' do |c| - c.timezone :t21 + c.timezone :t29 c.timezone 'Pacific/Chatham', -879, 20, -3531, 20, 'Chatham Islands' end i.country 'OM', 'Oman' do |c| - c.timezone :t10 + c.timezone :t11 end i.country 'PA', 'Panama' do |c| - c.timezone :t7 + c.timezone :t6 end i.country 'PE', 'Peru' do |c| c.timezone 'America/Lima', -241, 20, -1541, 20 @@ -674,7 +679,7 @@ module Countries c.timezone 'Pacific/Gambier', -347, 15, -2699, 20, 'Gambier Islands' end i.country 'PG', 'Papua New Guinea' do |c| - c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6, 'Papua New Guinea (most areas)' + c.timezone :t33 c.timezone 'Pacific/Bougainville', -373, 60, 4667, 30, 'Bougainville' end i.country 'PH', 'Philippines' do |c| @@ -693,7 +698,7 @@ module Countries c.timezone 'Pacific/Pitcairn', -376, 15, -1561, 12 end i.country 'PR', 'Puerto Rico' do |c| - c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800 + c.timezone :t8 end i.country 'PS', 'Palestine' do |c| c.timezone 'Asia/Gaza', 63, 2, 517, 15, 'Gaza Strip' @@ -711,24 +716,24 @@ module Countries c.timezone 'America/Asuncion', -379, 15, -173, 3 end i.country 'QA', 'Qatar' do |c| - c.timezone :t11 + c.timezone :t13 end i.country 'RE', 'Réunion' do |c| - c.timezone :t20 + c.timezone :t11 end i.country 'RO', 'Romania' do |c| c.timezone 'Europe/Bucharest', 1333, 30, 261, 10 end i.country 'RS', 'Serbia' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'RU', 'Russia' do |c| c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'MSK-01 - Kaliningrad' c.timezone 'Europe/Moscow', 66907, 1200, 8464, 225, 'MSK+00 - Moscow area' - c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'Crimea' + c.timezone :t26 c.timezone 'Europe/Kirov', 293, 5, 993, 20, 'MSK+00 - Kirov' + c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+00 - Volgograd' c.timezone 'Europe/Astrakhan', 927, 20, 961, 20, 'MSK+01 - Astrakhan' - c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'MSK+01 - Volgograd' c.timezone 'Europe/Saratov', 1547, 30, 1381, 30, 'MSK+01 - Saratov' c.timezone 'Europe/Ulyanovsk', 163, 3, 242, 5, 'MSK+01 - Ulyanovsk' c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'MSK+01 - Samara, Udmurtia' @@ -747,7 +752,7 @@ module Countries c.timezone 'Asia/Ust-Nera', 232417, 3600, 10742, 75, 'MSK+07 - Oymyakonsky' c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'MSK+08 - Magadan' c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'MSK+08 - Sakhalin Island' - c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); North Kuril Is' + c.timezone 'Asia/Srednekolymsk', 1012, 15, 9223, 60, 'MSK+08 - Sakha (E); N Kuril Is' c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'MSK+09 - Kamchatka' c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'MSK+09 - Bering Sea' end @@ -755,40 +760,40 @@ module Countries c.timezone :t4 end i.country 'SA', 'Saudi Arabia' do |c| - c.timezone :t12 + c.timezone :t14 end i.country 'SB', 'Solomon Islands' do |c| - c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5 + c.timezone :t30 end i.country 'SC', 'Seychelles' do |c| - c.timezone 'Indian/Mahe', -14, 3, 832, 15 + c.timezone :t11 end i.country 'SD', 'Sudan' do |c| - c.timezone :t3 + c.timezone 'Africa/Khartoum', 78, 5, 488, 15 end i.country 'SE', 'Sweden' do |c| - c.timezone 'Europe/Stockholm', 178, 3, 361, 20 + c.timezone :t19 end i.country 'SG', 'Singapore' do |c| - c.timezone 'Asia/Singapore', 77, 60, 2077, 20 + c.timezone :t15 end i.country 'SH', 'St Helena' do |c| c.timezone :t1 end i.country 'SI', 'Slovenia' do |c| - c.timezone :t13 + c.timezone :t18 end i.country 'SJ', 'Svalbard & Jan Mayen' do |c| - c.timezone :t16 + c.timezone :t19 end i.country 'SK', 'Slovakia' do |c| - c.timezone :t17 + c.timezone :t24 end i.country 'SL', 'Sierra Leone' do |c| c.timezone :t1 end i.country 'SM', 'San Marino' do |c| - c.timezone :t18 + c.timezone :t25 end i.country 'SN', 'Senegal' do |c| c.timezone :t1 @@ -809,7 +814,7 @@ module Countries c.timezone 'America/El_Salvador', 137, 10, -446, 5 end i.country 'SX', 'St Maarten (Dutch)' do |c| - c.timezone :t6 + c.timezone :t8 end i.country 'SY', 'Syria' do |c| c.timezone 'Asia/Damascus', 67, 2, 363, 10 @@ -823,15 +828,15 @@ module Countries i.country 'TD', 'Chad' do |c| c.timezone 'Africa/Ndjamena', 727, 60, 301, 20 end - i.country 'TF', 'French Southern & Antarctic Lands' do |c| - c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400, 'Kerguelen, St Paul Island, Amsterdam Island' - c.timezone :t20 + i.country 'TF', 'French S. Terr.' do |c| + c.timezone :t11 + c.timezone :t28 end i.country 'TG', 'Togo' do |c| c.timezone :t1 end i.country 'TH', 'Thailand' do |c| - c.timezone :t9 + c.timezone :t10 end i.country 'TJ', 'Tajikistan' do |c| c.timezone 'Asia/Dushanbe', 463, 12, 344, 5 @@ -849,7 +854,7 @@ module Countries c.timezone 'Africa/Tunis', 184, 5, 611, 60 end i.country 'TO', 'Tonga' do |c| - c.timezone 'Pacific/Tongatapu', -127, 6, -1051, 6 + c.timezone 'Pacific/Tongatapu', -317, 15, -876, 5 end i.country 'TR', 'Turkey' do |c| c.timezone 'Europe/Istanbul', 2461, 60, 869, 30 @@ -858,7 +863,7 @@ module Countries c.timezone :t8 end i.country 'TV', 'Tuvalu' do |c| - c.timezone 'Pacific/Funafuti', -511, 60, 10753, 60 + c.timezone :t34 end i.country 'TW', 'Taiwan' do |c| c.timezone 'Asia/Taipei', 501, 20, 243, 2 @@ -867,18 +872,15 @@ module Countries c.timezone :t5 end i.country 'UA', 'Ukraine' do |c| - c.timezone 'Europe/Kiev', 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' + c.timezone 'Europe/Kyiv', 1513, 30, 1831, 60, 'most of Ukraine' + c.timezone :t26 end i.country 'UG', 'Uganda' do |c| c.timezone :t5 end i.country 'UM', 'US minor outlying islands' do |c| - c.timezone 'Pacific/Wake', 1157, 60, 9997, 60, 'Wake Island' - c.timezone :t24 - c.timezone :t23 + c.timezone :t32 + c.timezone :t34 end i.country 'US', 'United States' do |c| c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern (most areas)' @@ -900,7 +902,7 @@ module Countries c.timezone 'America/North_Dakota/Beulah', 56717, 1200, -916, 9, 'Central - ND (Mercer)' c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain (most areas)' c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain - ID (south); OR (east)' - c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'MST - Arizona (except Navajo)' + c.timezone :t7 c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific' c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska (most areas)' c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska - Juneau area' @@ -908,8 +910,8 @@ module Countries c.timezone 'America/Metlakatla', 198457, 3600, -18947, 144, 'Alaska - Annette Island' c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska - Yakutat' c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska (west)' - c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands' - c.timezone :t23 + c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Alaska - western Aleutians' + c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii' end i.country 'UY', 'Uruguay' do |c| c.timezone 'America/Montevideo', -41891, 1200, -4497, 80 @@ -919,7 +921,7 @@ module Countries c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'Uzbekistan (east)' end i.country 'VA', 'Vatican City' do |c| - c.timezone :t18 + c.timezone :t25 end i.country 'VC', 'St Vincent' do |c| c.timezone :t8 @@ -934,20 +936,20 @@ module Countries c.timezone :t8 end i.country 'VN', 'Vietnam' do |c| - c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'Vietnam (south)' - c.timezone :t9 + c.timezone 'Asia/Ho_Chi_Minh', 43, 4, 320, 3, 'south Vietnam' + c.timezone :t10 end i.country 'VU', 'Vanuatu' do |c| c.timezone 'Pacific/Efate', -53, 3, 2021, 12 end i.country 'WF', 'Wallis & Futuna' do |c| - c.timezone 'Pacific/Wallis', -133, 10, -1057, 6 + c.timezone :t34 end i.country 'WS', 'Samoa (western)' do |c| c.timezone 'Pacific/Apia', -83, 6, -2576, 15 end i.country 'YE', 'Yemen' do |c| - c.timezone :t12 + c.timezone :t14 end i.country 'YT', 'Mayotte' do |c| c.timezone :t5 diff --git a/test/tzinfo-data2/tzinfo/data/indexes/timezones.rb b/test/tzinfo-data2/tzinfo/data/indexes/timezones.rb index 7ce3e2ed..8bb313fe 100644 --- a/test/tzinfo-data2/tzinfo/data/indexes/timezones.rb +++ b/test/tzinfo-data2/tzinfo/data/indexes/timezones.rb @@ -12,7 +12,7 @@ module Timezones timezone_index do |i| i.data_timezone 'Africa/Abidjan' - i.data_timezone 'Africa/Accra' + i.linked_timezone 'Africa/Accra' i.linked_timezone 'Africa/Addis_Ababa' i.data_timezone 'Africa/Algiers' i.linked_timezone 'Africa/Asmara' @@ -85,14 +85,14 @@ module Timezones i.data_timezone 'America/Argentina/Ushuaia' i.linked_timezone 'America/Aruba' i.data_timezone 'America/Asuncion' - i.data_timezone 'America/Atikokan' + i.linked_timezone 'America/Atikokan' i.linked_timezone 'America/Atka' i.data_timezone 'America/Bahia' i.data_timezone 'America/Bahia_Banderas' i.data_timezone 'America/Barbados' i.data_timezone 'America/Belem' i.data_timezone 'America/Belize' - i.data_timezone 'America/Blanc-Sablon' + i.linked_timezone 'America/Blanc-Sablon' i.data_timezone 'America/Boa_Vista' i.data_timezone 'America/Bogota' i.data_timezone 'America/Boise' @@ -106,12 +106,13 @@ module Timezones i.linked_timezone 'America/Cayman' i.data_timezone 'America/Chicago' i.data_timezone 'America/Chihuahua' + i.data_timezone 'America/Ciudad_Juarez' i.linked_timezone 'America/Coral_Harbour' i.linked_timezone 'America/Cordoba' i.data_timezone 'America/Costa_Rica' - i.data_timezone 'America/Creston' + i.linked_timezone 'America/Creston' i.data_timezone 'America/Cuiaba' - i.data_timezone 'America/Curacao' + i.linked_timezone 'America/Curacao' i.data_timezone 'America/Danmarkshavn' i.data_timezone 'America/Dawson' i.data_timezone 'America/Dawson_Creek' @@ -178,9 +179,9 @@ module Timezones i.data_timezone 'America/Montevideo' i.linked_timezone 'America/Montreal' i.linked_timezone 'America/Montserrat' - i.data_timezone 'America/Nassau' + i.linked_timezone 'America/Nassau' i.data_timezone 'America/New_York' - i.data_timezone 'America/Nipigon' + i.linked_timezone 'America/Nipigon' i.data_timezone 'America/Nome' i.data_timezone 'America/Noronha' i.data_timezone 'America/North_Dakota/Beulah' @@ -189,16 +190,16 @@ module Timezones i.data_timezone 'America/Nuuk' i.data_timezone 'America/Ojinaga' i.data_timezone 'America/Panama' - i.data_timezone 'America/Pangnirtung' + i.linked_timezone 'America/Pangnirtung' i.data_timezone 'America/Paramaribo' i.data_timezone 'America/Phoenix' i.data_timezone 'America/Port-au-Prince' - i.data_timezone 'America/Port_of_Spain' + i.linked_timezone 'America/Port_of_Spain' i.linked_timezone 'America/Porto_Acre' i.data_timezone 'America/Porto_Velho' i.data_timezone 'America/Puerto_Rico' i.data_timezone 'America/Punta_Arenas' - i.data_timezone 'America/Rainy_River' + i.linked_timezone 'America/Rainy_River' i.data_timezone 'America/Rankin_Inlet' i.data_timezone 'America/Recife' i.data_timezone 'America/Regina' @@ -222,7 +223,7 @@ module Timezones i.data_timezone 'America/Swift_Current' i.data_timezone 'America/Tegucigalpa' i.data_timezone 'America/Thule' - i.data_timezone 'America/Thunder_Bay' + i.linked_timezone 'America/Thunder_Bay' i.data_timezone 'America/Tijuana' i.data_timezone 'America/Toronto' i.linked_timezone 'America/Tortola' @@ -231,19 +232,19 @@ module Timezones i.data_timezone 'America/Whitehorse' i.data_timezone 'America/Winnipeg' i.data_timezone 'America/Yakutat' - i.data_timezone 'America/Yellowknife' + i.linked_timezone 'America/Yellowknife' i.data_timezone 'Antarctica/Casey' i.data_timezone 'Antarctica/Davis' - i.data_timezone 'Antarctica/DumontDUrville' + i.linked_timezone 'Antarctica/DumontDUrville' i.data_timezone 'Antarctica/Macquarie' i.data_timezone 'Antarctica/Mawson' i.linked_timezone 'Antarctica/McMurdo' i.data_timezone 'Antarctica/Palmer' i.data_timezone 'Antarctica/Rothera' i.linked_timezone 'Antarctica/South_Pole' - i.data_timezone 'Antarctica/Syowa' + i.linked_timezone 'Antarctica/Syowa' i.data_timezone 'Antarctica/Troll' - i.data_timezone 'Antarctica/Vostok' + i.linked_timezone 'Antarctica/Vostok' i.linked_timezone 'Arctic/Longyearbyen' i.linked_timezone 'Asia/Aden' i.data_timezone 'Asia/Almaty' @@ -261,7 +262,7 @@ module Timezones i.data_timezone 'Asia/Barnaul' i.data_timezone 'Asia/Beirut' i.data_timezone 'Asia/Bishkek' - i.data_timezone 'Asia/Brunei' + i.linked_timezone 'Asia/Brunei' i.linked_timezone 'Asia/Calcutta' i.data_timezone 'Asia/Chita' i.data_timezone 'Asia/Choibalsan' @@ -295,7 +296,7 @@ module Timezones i.data_timezone 'Asia/Khandyga' i.data_timezone 'Asia/Kolkata' i.data_timezone 'Asia/Krasnoyarsk' - i.data_timezone 'Asia/Kuala_Lumpur' + i.linked_timezone 'Asia/Kuala_Lumpur' i.data_timezone 'Asia/Kuching' i.linked_timezone 'Asia/Kuwait' i.linked_timezone 'Asia/Macao' @@ -352,7 +353,7 @@ module Timezones i.data_timezone 'Atlantic/Faroe' i.linked_timezone 'Atlantic/Jan_Mayen' i.data_timezone 'Atlantic/Madeira' - i.data_timezone 'Atlantic/Reykjavik' + i.linked_timezone 'Atlantic/Reykjavik' i.data_timezone 'Atlantic/South_Georgia' i.linked_timezone 'Atlantic/St_Helena' i.data_timezone 'Atlantic/Stanley' @@ -361,7 +362,7 @@ module Timezones i.data_timezone 'Australia/Brisbane' i.data_timezone 'Australia/Broken_Hill' i.linked_timezone 'Australia/Canberra' - i.data_timezone 'Australia/Currie' + i.linked_timezone 'Australia/Currie' i.data_timezone 'Australia/Darwin' i.data_timezone 'Australia/Eucla' i.data_timezone 'Australia/Hobart' @@ -436,7 +437,7 @@ module Timezones i.data_timezone 'Etc/UTC' i.linked_timezone 'Etc/Universal' i.linked_timezone 'Etc/Zulu' - i.data_timezone 'Europe/Amsterdam' + i.linked_timezone 'Europe/Amsterdam' i.data_timezone 'Europe/Andorra' i.data_timezone 'Europe/Astrakhan' i.data_timezone 'Europe/Athens' @@ -449,7 +450,7 @@ module Timezones i.data_timezone 'Europe/Budapest' i.linked_timezone 'Europe/Busingen' i.data_timezone 'Europe/Chisinau' - i.data_timezone 'Europe/Copenhagen' + i.linked_timezone 'Europe/Copenhagen' i.data_timezone 'Europe/Dublin' i.data_timezone 'Europe/Gibraltar' i.linked_timezone 'Europe/Guernsey' @@ -458,20 +459,21 @@ module Timezones i.data_timezone 'Europe/Istanbul' i.linked_timezone 'Europe/Jersey' i.data_timezone 'Europe/Kaliningrad' - i.data_timezone 'Europe/Kiev' + i.linked_timezone 'Europe/Kiev' i.data_timezone 'Europe/Kirov' + i.data_timezone 'Europe/Kyiv' i.data_timezone 'Europe/Lisbon' i.linked_timezone 'Europe/Ljubljana' i.data_timezone 'Europe/London' - i.data_timezone 'Europe/Luxembourg' + i.linked_timezone 'Europe/Luxembourg' i.data_timezone 'Europe/Madrid' i.data_timezone 'Europe/Malta' i.linked_timezone 'Europe/Mariehamn' i.data_timezone 'Europe/Minsk' - i.data_timezone 'Europe/Monaco' + i.linked_timezone 'Europe/Monaco' i.data_timezone 'Europe/Moscow' i.linked_timezone 'Europe/Nicosia' - i.data_timezone 'Europe/Oslo' + i.linked_timezone 'Europe/Oslo' i.data_timezone 'Europe/Paris' i.linked_timezone 'Europe/Podgorica' i.data_timezone 'Europe/Prague' @@ -484,12 +486,12 @@ module Timezones i.data_timezone 'Europe/Simferopol' i.linked_timezone 'Europe/Skopje' i.data_timezone 'Europe/Sofia' - i.data_timezone 'Europe/Stockholm' + i.linked_timezone 'Europe/Stockholm' i.data_timezone 'Europe/Tallinn' i.data_timezone 'Europe/Tirane' i.linked_timezone 'Europe/Tiraspol' i.data_timezone 'Europe/Ulyanovsk' - i.data_timezone 'Europe/Uzhgorod' + i.linked_timezone 'Europe/Uzhgorod' i.linked_timezone 'Europe/Vaduz' i.linked_timezone 'Europe/Vatican' i.data_timezone 'Europe/Vienna' @@ -497,7 +499,7 @@ module Timezones i.data_timezone 'Europe/Volgograd' i.data_timezone 'Europe/Warsaw' i.linked_timezone 'Europe/Zagreb' - i.data_timezone 'Europe/Zaporozhye' + i.linked_timezone 'Europe/Zaporozhye' i.data_timezone 'Europe/Zurich' i.data_timezone 'Factory' i.linked_timezone 'GB' @@ -512,15 +514,15 @@ module Timezones i.linked_timezone 'Iceland' i.linked_timezone 'Indian/Antananarivo' i.data_timezone 'Indian/Chagos' - i.data_timezone 'Indian/Christmas' - i.data_timezone 'Indian/Cocos' + i.linked_timezone 'Indian/Christmas' + i.linked_timezone 'Indian/Cocos' i.linked_timezone 'Indian/Comoro' - i.data_timezone 'Indian/Kerguelen' - i.data_timezone 'Indian/Mahe' + i.linked_timezone 'Indian/Kerguelen' + i.linked_timezone 'Indian/Mahe' i.data_timezone 'Indian/Maldives' i.data_timezone 'Indian/Mauritius' i.linked_timezone 'Indian/Mayotte' - i.data_timezone 'Indian/Reunion' + i.linked_timezone 'Indian/Reunion' i.linked_timezone 'Iran' i.linked_timezone 'Israel' i.linked_timezone 'Jamaica' @@ -542,23 +544,24 @@ module Timezones i.data_timezone 'Pacific/Auckland' i.data_timezone 'Pacific/Bougainville' i.data_timezone 'Pacific/Chatham' - i.data_timezone 'Pacific/Chuuk' + i.linked_timezone 'Pacific/Chuuk' i.data_timezone 'Pacific/Easter' i.data_timezone 'Pacific/Efate' - i.data_timezone 'Pacific/Enderbury' + i.linked_timezone 'Pacific/Enderbury' i.data_timezone 'Pacific/Fakaofo' i.data_timezone 'Pacific/Fiji' - i.data_timezone 'Pacific/Funafuti' + i.linked_timezone 'Pacific/Funafuti' i.data_timezone 'Pacific/Galapagos' i.data_timezone 'Pacific/Gambier' i.data_timezone 'Pacific/Guadalcanal' i.data_timezone 'Pacific/Guam' i.data_timezone 'Pacific/Honolulu' i.linked_timezone 'Pacific/Johnston' + i.data_timezone 'Pacific/Kanton' i.data_timezone 'Pacific/Kiritimati' i.data_timezone 'Pacific/Kosrae' i.data_timezone 'Pacific/Kwajalein' - i.data_timezone 'Pacific/Majuro' + i.linked_timezone 'Pacific/Majuro' i.data_timezone 'Pacific/Marquesas' i.linked_timezone 'Pacific/Midway' i.data_timezone 'Pacific/Nauru' @@ -568,7 +571,7 @@ module Timezones i.data_timezone 'Pacific/Pago_Pago' i.data_timezone 'Pacific/Palau' i.data_timezone 'Pacific/Pitcairn' - i.data_timezone 'Pacific/Pohnpei' + i.linked_timezone 'Pacific/Pohnpei' i.linked_timezone 'Pacific/Ponape' i.data_timezone 'Pacific/Port_Moresby' i.data_timezone 'Pacific/Rarotonga' @@ -578,8 +581,8 @@ module Timezones i.data_timezone 'Pacific/Tarawa' i.data_timezone 'Pacific/Tongatapu' i.linked_timezone 'Pacific/Truk' - i.data_timezone 'Pacific/Wake' - i.data_timezone 'Pacific/Wallis' + i.linked_timezone 'Pacific/Wake' + i.linked_timezone 'Pacific/Wallis' i.linked_timezone 'Pacific/Yap' i.linked_timezone 'Poland' i.linked_timezone 'Portugal' diff --git a/test/tzinfo-data2/tzinfo/data/version.rb b/test/tzinfo-data2/tzinfo/data/version.rb index 3126e145..8e0136ce 100644 --- a/test/tzinfo-data2/tzinfo/data/version.rb +++ b/test/tzinfo-data2/tzinfo/data/version.rb @@ -3,7 +3,7 @@ module TZInfo module Data # TZInfo::Data version number. - VERSION = '2.2020.4.test' + VERSION = '2.2023.3.test' # TZInfo::Data version information. module Version @@ -15,7 +15,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 = '2020d' + TZDATA = '2023c' end end end diff --git a/test/zoneinfo/Australia/Melbourne b/test/zoneinfo/Australia/Melbourne index c7160da3..d3f195ac 100644 Binary files a/test/zoneinfo/Australia/Melbourne and b/test/zoneinfo/Australia/Melbourne differ diff --git a/test/zoneinfo/Europe/Amsterdam b/test/zoneinfo/Europe/Amsterdam deleted file mode 100644 index 4a6fa1d4..00000000 Binary files a/test/zoneinfo/Europe/Amsterdam and /dev/null differ diff --git a/test/zoneinfo/Europe/Brussels b/test/zoneinfo/Europe/Brussels new file mode 100644 index 00000000..31973271 Binary files /dev/null and b/test/zoneinfo/Europe/Brussels differ diff --git a/test/zoneinfo/iso3166.tab b/test/zoneinfo/iso3166.tab index a4ff61a4..be3348d1 100644 --- a/test/zoneinfo/iso3166.tab +++ b/test/zoneinfo/iso3166.tab @@ -3,13 +3,13 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2015-05-02): +# From Paul Eggert (2022-11-18): # This file contains a table of two-letter country codes. Columns are # separated by a single tab. Lines beginning with '#' are comments. # All text uses UTF-8 encoding. The columns of the table are as follows: # # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 N976 (2018-11-06). See: Updates on ISO 3166-1 +# ISO 3166-1 N1087 (2022-09-02). See: Updates on ISO 3166-1 # https://isotc.iso.org/livelink/livelink/Open/16944257 # 2. The usual English name for the coded region, # chosen so that alphabetic sorting of subsets produces helpful lists. @@ -238,7 +238,7 @@ SY Syria SZ Eswatini (Swaziland) TC Turks & Caicos Is TD Chad -TF French Southern & Antarctic Lands +TF French S. Terr. TG Togo TH Thailand TJ Tajikistan diff --git a/test/zoneinfo/right/Europe/London b/test/zoneinfo/right/Europe/London index 9b8560d2..25a87612 100644 Binary files a/test/zoneinfo/right/Europe/London and b/test/zoneinfo/right/Europe/London differ diff --git a/test/zoneinfo/zone.tab b/test/zoneinfo/zone.tab index 8d056e37..dbcb6179 100644 --- a/test/zoneinfo/zone.tab +++ b/test/zoneinfo/zone.tab @@ -3,7 +3,7 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2018-06-27): +# From Paul Eggert (2021-09-20): # This file is intended as a backward-compatibility aid for older programs. # New programs should use zone1970.tab. This file is like zone1970.tab (see # zone1970.tab's comments), but with the following additional restrictions: @@ -16,6 +16,9 @@ # clocks have agreed since 1970; this is a narrower definition than # that of zone1970.tab. # +# Unlike zone1970.tab, a row's third column can be a Link from +# 'backward' instead of a Zone. +# # This table is intended as an aid for users, to help them select timezones # appropriate for their practical needs. It is not intended to take or # endorse any position on legal or territorial claims. @@ -56,8 +59,7 @@ AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania (most areas) -AU -3956+14352 Australia/Currie Tasmania (King Island) +AU -4253+14719 Australia/Hobart Tasmania AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales (most areas) AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) @@ -112,27 +114,22 @@ CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) -CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) -CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) -CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) -CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) +CA +6344-06828 America/Iqaluit Eastern - NU (most areas) CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba -CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) -CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) -CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) +CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) +CA +6043-13503 America/Whitehorse MST - Yukon (east) +CA +6404-13925 America/Dawson MST - Yukon (west) CA +4916-12307 America/Vancouver Pacific - BC (most areas) -CA +6043-13503 America/Whitehorse Pacific - Yukon (east) -CA +6404-13925 America/Dawson Pacific - Yukon (west) CC -1210+09655 Indian/Cocos CD -0418+01518 Africa/Kinshasa Dem. Rep. of Congo (west) CD -1140+02728 Africa/Lubumbashi Dem. Rep. of Congo (east) @@ -141,7 +138,7 @@ CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most areas) +CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala @@ -153,10 +150,10 @@ CU +2308-08222 America/Havana CV +1455-02331 Atlantic/Cape_Verde CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3510+03322 Asia/Nicosia most of Cyprus CY +3507+03357 Asia/Famagusta Northern Cyprus CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most areas) +DE +5230+01322 Europe/Berlin most of Germany DE +4742+00841 Europe/Busingen Busingen DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen @@ -189,7 +186,7 @@ GF +0456-05220 America/Cayenne GG +492717-0023210 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Nuuk Greenland (most areas) +GL +6411-05144 America/Nuuk most of Greenland GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -229,7 +226,7 @@ KE -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek KH +1133+10455 Asia/Phnom_Penh KI +0125+17300 Pacific/Tarawa Gilbert Islands -KI -0308-17105 Pacific/Enderbury Phoenix Islands +KI -0247-17143 Pacific/Kanton Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KM -1141+04316 Indian/Comoro KN +1718-06243 America/St_Kitts @@ -237,7 +234,7 @@ KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) +KZ +4315+07657 Asia/Almaty most of Kazakhstan KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe @@ -261,12 +258,12 @@ MD +4700+02850 Europe/Chisinau ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) +MH +0709+17112 Pacific/Majuro most of Marshall Islands MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako MM +1647+09610 Asia/Yangon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +221150+1133230 Asia/Macau @@ -278,17 +275,18 @@ MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives MW -1547+03500 Africa/Blantyre -MX +1924-09909 America/Mexico_City Central Time -MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo -MX +2058-08937 America/Merida Central Time - Campeche, Yucatan -MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas) -MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border) -MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) -MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) -MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora -MX +3232-11701 America/Tijuana Pacific Time US - Baja California -MX +2048-10515 America/Bahia_Banderas Central Time - Bahia de Banderas +MX +1924-09909 America/Mexico_City Central Mexico +MX +2105-08646 America/Cancun Quintana Roo +MX +2058-08937 America/Merida Campeche, Yucatan +MX +2540-10019 America/Monterrey Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas) +MX +2550-09730 America/Matamoros Coahuila, Nuevo Leon, Tamaulipas (US border) +MX +2838-10605 America/Chihuahua Chihuahua (most areas) +MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west) +MX +2934-10425 America/Ojinaga Chihuahua (US border - east) +MX +2313-10625 America/Mazatlan Baja California Sur, Nayarit (most areas), Sinaloa +MX +2048-10515 America/Bahia_Banderas Bahia de Banderas +MX +2904-11058 America/Hermosillo Sonora +MX +3232-11701 America/Tijuana Baja California MY +0310+10142 Asia/Kuala_Lumpur Malaysia (peninsula) MY +0133+11020 Asia/Kuching Sabah, Sarawak MZ -2558+03235 Africa/Maputo @@ -303,7 +301,7 @@ NO +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland New Zealand (most areas) +NZ -3652+17446 Pacific/Auckland most of New Zealand NZ -4357-17633 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama @@ -311,7 +309,7 @@ PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) +PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -337,8 +335,8 @@ RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area # Programs should use zone1970.tab instead; see above. UA +4457+03406 Europe/Simferopol Crimea RU +5836+04939 Europe/Kirov MSK+00 - Kirov +RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan -RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd RU +5134+04602 Europe/Saratov MSK+01 - Saratov RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia @@ -357,7 +355,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea RW -0157+03004 Africa/Kigali @@ -392,15 +390,13 @@ TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili TM +3757+05823 Asia/Ashgabat TN +3648+01011 Africa/Tunis -TO -2110-17510 Pacific/Tongatapu +TO -210800-1751200 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kiev Ukraine (most areas) -UA +4837+02218 Europe/Uzhgorod Transcarpathia -UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk +UA +5026+03031 Europe/Kyiv most of Ukraine UG +0019+03225 Africa/Kampala UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island @@ -423,7 +419,7 @@ US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (south); OR (east) -US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) +US +332654-1120424 America/Phoenix MST - AZ (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area @@ -431,7 +427,7 @@ US +571035-1351807 America/Sitka Alaska - Sitka area US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) -US +515248-1763929 America/Adak Aleutian Islands +US +515248-1763929 America/Adak Alaska - western Aleutians US +211825-1575130 Pacific/Honolulu Hawaii UY -345433-0561245 America/Montevideo UZ +3940+06648 Asia/Samarkand Uzbekistan (west) diff --git a/test/zoneinfo/zone1970.tab b/test/zoneinfo/zone1970.tab index 53ee77e8..1f1cecb8 100644 --- a/test/zoneinfo/zone1970.tab +++ b/test/zoneinfo/zone1970.tab @@ -18,7 +18,10 @@ # Please see the theory.html file for how these names are chosen. # If multiple timezones overlap a country, each has a row in the # table, with each column 1 containing the country code. -# 4. Comments; present if and only if a country has multiple timezones. +# 4. Comments; present if and only if countries have multiple timezones, +# and useful only for those countries. For example, the comments +# for the row with countries CH,DE,LI and name Europe/Zurich +# are useful only for DE, since CH and LI have no other timezones. # # If a timezone covers multiple countries, the most-populous city is used, # and that country is listed first in column 1; any other countries @@ -34,21 +37,18 @@ #country- #codes coordinates TZ comments AD +4230+00131 Europe/Andorra -AE,OM +2518+05518 Asia/Dubai +AE,OM,RE,SC,TF +2518+05518 Asia/Dubai Crozet, Scattered Is AF +3431+06912 Asia/Kabul AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan AQ -6617+11031 Antarctica/Casey Casey AQ -6835+07758 Antarctica/Davis Davis -AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville AQ -6736+06253 Antarctica/Mawson Mawson AQ -6448-06406 Antarctica/Palmer Palmer AQ -6734-06808 Antarctica/Rothera Rothera -AQ -690022+0393524 Antarctica/Syowa Syowa AQ -720041+0023206 Antarctica/Troll Troll -AQ -7824+10654 Antarctica/Vostok Vostok AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF) +AR -3124-06411 America/Argentina/Cordoba most areas: CB, CC, CN, ER, FM, MN, SE, SF AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) @@ -59,12 +59,11 @@ AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) AR -3319-06621 America/Argentina/San_Luis San Luis (SL) AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC) AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF) -AS,UM -1416-17042 Pacific/Pago_Pago Samoa, Midway +AS,UM -1416-17042 Pacific/Pago_Pago Midway AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania (most areas) -AU -3956+14352 Australia/Currie Tasmania (King Island) +AU -4253+14719 Australia/Hobart Tasmania AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales (most areas) AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) @@ -77,10 +76,9 @@ AU -3143+12852 Australia/Eucla Western Australia (Eucla) AZ +4023+04951 Asia/Baku BB +1306-05937 America/Barbados BD +2343+09025 Asia/Dhaka -BE +5050+00420 Europe/Brussels +BE,LU,NL +5050+00420 Europe/Brussels BG +4241+02319 Europe/Sofia BM +3217-06446 Atlantic/Bermuda -BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BR -0351-03225 America/Noronha Atlantic islands BR -0127-04829 America/Belem Pará (east); Amapá @@ -98,7 +96,6 @@ BR +0249-06040 America/Boa_Vista Roraima BR -0308-06001 America/Manaus Amazonas (east) BR -0640-06952 America/Eirunepe Amazonas (west) BR -0958-06748 America/Rio_Branco Acre -BS +2505-07721 America/Nassau BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize @@ -107,49 +104,37 @@ CA +4439-06336 America/Halifax Atlantic - NS (most areas); PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) -CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) -CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) -CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) -CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) -CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) -CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) +CA,BS +4339-07923 America/Toronto Eastern - ON, QC (most areas) +CA +6344-06828 America/Iqaluit Eastern - NU (most areas) CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba -CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) -CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) -CA +4906-11631 America/Creston MST - BC (Creston) -CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) +CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) +CA +6043-13503 America/Whitehorse MST - Yukon (east) +CA +6404-13925 America/Dawson MST - Yukon (west) CA +4916-12307 America/Vancouver Pacific - BC (most areas) -CA +6043-13503 America/Whitehorse Pacific - Yukon (east) -CA +6404-13925 America/Dawson Pacific - Yukon (west) -CC -1210+09655 Indian/Cocos -CH,DE,LI +4723+00832 Europe/Zurich Swiss time -CI,BF,GM,GN,ML,MR,SH,SL,SN,TG +0519-00402 Africa/Abidjan +CH,DE,LI +4723+00832 Europe/Zurich Büsingen +CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most areas) +CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CN +3114+12128 Asia/Shanghai Beijing Time -CN +4348+08735 Asia/Urumqi Xinjiang Time +CN,AQ +4348+08735 Asia/Urumqi Xinjiang Time, Vostok CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana CV +1455-02331 Atlantic/Cape_Verde -CW,AW,BQ,SX +1211-06900 America/Curacao -CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3510+03322 Asia/Nicosia most of Cyprus CY +3507+03357 Asia/Famagusta Northern Cyprus CZ,SK +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most areas) -DK +5540+01235 Europe/Copenhagen +DE,DK,NO,SE,SJ +5230+01322 Europe/Berlin most of Germany DO +1828-06954 America/Santo_Domingo DZ +3647+00303 Africa/Algiers EC -0210-07950 America/Guayaquil Ecuador (mainland) @@ -163,17 +148,14 @@ ES +2806-01524 Atlantic/Canary Canary Islands FI,AX +6010+02458 Europe/Helsinki FJ -1808+17825 Pacific/Fiji FK -5142-05751 Atlantic/Stanley -FM +0725+15147 Pacific/Chuuk Chuuk/Truk, Yap -FM +0658+15813 Pacific/Pohnpei Pohnpei/Ponape FM +0519+16259 Pacific/Kosrae Kosrae FO +6201-00646 Atlantic/Faroe -FR +4852+00220 Europe/Paris +FR,MC +4852+00220 Europe/Paris GB,GG,IM,JE +513030-0000731 Europe/London GE +4143+04449 Asia/Tbilisi GF +0456-05220 America/Cayenne -GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Nuuk Greenland (most areas) +GL +6411-05144 America/Nuuk most of Greenland GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -197,19 +179,18 @@ IN +2232+08822 Asia/Kolkata IO -0720+07225 Indian/Chagos IQ +3321+04425 Asia/Baghdad IR +3540+05126 Asia/Tehran -IS +6409-02151 Atlantic/Reykjavik IT,SM,VA +4154+01229 Europe/Rome JM +175805-0764736 America/Jamaica JO +3157+03556 Asia/Amman JP +353916+1394441 Asia/Tokyo KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek -KI +0125+17300 Pacific/Tarawa Gilbert Islands -KI -0308-17105 Pacific/Enderbury Phoenix Islands +KI,MH,TV,UM,WF +0125+17300 Pacific/Tarawa Gilberts, Marshalls, Wake +KI -0247-17143 Pacific/Kanton Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul -KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) +KZ +4315+07657 Asia/Almaty most of Kazakhstan KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay KZ +5017+05710 Asia/Aqtobe Aqtöbe/Aktobe @@ -220,62 +201,57 @@ LB +3353+03530 Asia/Beirut LK +0656+07951 Asia/Colombo LR +0618-01047 Africa/Monrovia LT +5441+02519 Europe/Vilnius -LU +4936+00609 Europe/Luxembourg LV +5657+02406 Europe/Riga LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca -MC +4342+00723 Europe/Monaco MD +4700+02850 Europe/Chisinau -MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) MH +0905+16720 Pacific/Kwajalein Kwajalein -MM +1647+09610 Asia/Yangon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +MM,CC +1647+09610 Asia/Yangon +MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar MO +221150+1133230 Asia/Macau MQ +1436-06105 America/Martinique MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius -MV +0410+07330 Indian/Maldives -MX +1924-09909 America/Mexico_City Central Time -MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo -MX +2058-08937 America/Merida Central Time - Campeche, Yucatán -MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León, Tamaulipas (most areas) -MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas (US border) -MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas) -MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border) -MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora -MX +3232-11701 America/Tijuana Pacific Time US - Baja California -MX +2048-10515 America/Bahia_Banderas Central Time - Bahía de Banderas -MY +0310+10142 Asia/Kuala_Lumpur Malaysia (peninsula) -MY +0133+11020 Asia/Kuching Sabah, Sarawak +MV,TF +0410+07330 Indian/Maldives Kerguelen, St Paul I, Amsterdam I +MX +1924-09909 America/Mexico_City Central Mexico +MX +2105-08646 America/Cancun Quintana Roo +MX +2058-08937 America/Merida Campeche, Yucatán +MX +2540-10019 America/Monterrey Durango; Coahuila, Nuevo León, Tamaulipas (most areas) +MX +2550-09730 America/Matamoros Coahuila, Nuevo León, Tamaulipas (US border) +MX +2838-10605 America/Chihuahua Chihuahua (most areas) +MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west) +MX +2934-10425 America/Ojinaga Chihuahua (US border - east) +MX +2313-10625 America/Mazatlan Baja California Sur, Nayarit (most areas), Sinaloa +MX +2048-10515 America/Bahia_Banderas Bahía de Banderas +MX +2904-11058 America/Hermosillo Sonora +MX +3232-11701 America/Tijuana Baja California +MY,BN +0133+11020 Asia/Kuching Sabah, Sarawak MZ,BI,BW,CD,MW,RW,ZM,ZW -2558+03235 Africa/Maputo Central Africa Time NA -2234+01706 Africa/Windhoek NC -2216+16627 Pacific/Noumea NF -2903+16758 Pacific/Norfolk NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE +0627+00324 Africa/Lagos West Africa Time NI +1209-08617 America/Managua -NL +5222+00454 Europe/Amsterdam -NO,SJ +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue NZ,AQ -3652+17446 Pacific/Auckland New Zealand time NZ -4357-17633 Pacific/Chatham Chatham Islands -PA,KY +0858-07932 America/Panama +PA,CA,KY +0858-07932 America/Panama EST - ON (Atikokan), NU (Coral H) PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) +PG,AQ,FM -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi PL +5215+02100 Europe/Warsaw PM +4703-05620 America/Miquelon PN -2504-13005 Pacific/Pitcairn -PR +182806-0660622 America/Puerto_Rico +PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI +182806-0660622 America/Puerto_Rico AST PS +3130+03428 Asia/Gaza Gaza Strip PS +313200+0350542 Asia/Hebron West Bank PT +3843-00908 Europe/Lisbon Portugal (mainland) @@ -284,7 +260,6 @@ PT +3744-02540 Atlantic/Azores Azores PW +0720+13429 Pacific/Palau PY -2516-05740 America/Asuncion QA,BH +2517+05132 Asia/Qatar -RE,TF -2052+05528 Indian/Reunion Réunion, Crozet, Scattered Islands RO +4426+02606 Europe/Bucharest RS,BA,HR,ME,MK,SI +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad @@ -292,8 +267,8 @@ RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area # Mention RU and UA alphabetically. See "territorial claims" above. RU,UA +4457+03406 Europe/Simferopol Crimea RU +5836+04939 Europe/Kirov MSK+00 - Kirov +RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan -RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd RU +5134+04602 Europe/Saratov MSK+01 - Saratov RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia @@ -312,15 +287,13 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea -SA,KW,YE +2438+04643 Asia/Riyadh -SB -0932+16012 Pacific/Guadalcanal -SC -0440+05528 Indian/Mahe +SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa +SB,FM -0932+16012 Pacific/Guadalcanal Pohnpei SD +1536+03232 Africa/Khartoum -SE +5920+01803 Europe/Stockholm -SG +0117+10351 Asia/Singapore +SG,MY +0117+10351 Asia/Singapore peninsular Malaysia SR +0550-05510 America/Paramaribo SS +0451+03137 Africa/Juba ST +0020+00644 Africa/Sao_Tome @@ -328,22 +301,16 @@ SV +1342-08912 America/El_Salvador SY +3330+03618 Asia/Damascus TC +2128-07108 America/Grand_Turk TD +1207+01503 Africa/Ndjamena -TF -492110+0701303 Indian/Kerguelen Kerguelen, St Paul Island, Amsterdam Island -TH,KH,LA,VN +1345+10031 Asia/Bangkok Indochina (most areas) +TH,CX,KH,LA,VN +1345+10031 Asia/Bangkok north Vietnam TJ +3835+06848 Asia/Dushanbe TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili TM +3757+05823 Asia/Ashgabat TN +3648+01011 Africa/Tunis -TO -2110-17510 Pacific/Tongatapu +TO -210800-1751200 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul -TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI +1039-06131 America/Port_of_Spain -TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei -UA +5026+03031 Europe/Kiev Ukraine (most areas) -UA +4837+02218 Europe/Uzhgorod Transcarpathia -UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk -UM +1917+16637 Pacific/Wake Wake Island +UA +5026+03031 Europe/Kyiv most of Ukraine US +404251-0740023 America/New_York Eastern (most areas) US +421953-0830245 America/Detroit Eastern - MI (most areas) US +381515-0854534 America/Kentucky/Louisville Eastern - KY (Louisville area) @@ -363,7 +330,7 @@ US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) US +433649-1161209 America/Boise Mountain - ID (south); OR (east) -US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) +US,CA +332654-1120424 America/Phoenix MST - AZ (most areas), Creston BC US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area @@ -371,14 +338,37 @@ US +571035-1351807 America/Sitka Alaska - Sitka area US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) -US +515248-1763929 America/Adak Aleutian Islands -US,UM +211825-1575130 Pacific/Honolulu Hawaii +US +515248-1763929 America/Adak Alaska - western Aleutians +US +211825-1575130 Pacific/Honolulu Hawaii UY -345433-0561245 America/Montevideo UZ +3940+06648 Asia/Samarkand Uzbekistan (west) UZ +4120+06918 Asia/Tashkent Uzbekistan (east) VE +1030-06656 America/Caracas -VN +1045+10640 Asia/Ho_Chi_Minh Vietnam (south) +VN +1045+10640 Asia/Ho_Chi_Minh south Vietnam VU -1740+16825 Pacific/Efate -WF -1318-17610 Pacific/Wallis WS -1350-17144 Pacific/Apia ZA,LS,SZ -2615+02800 Africa/Johannesburg +# +# The next section contains experimental tab-separated comments for +# use by user agents like tzselect that identify continents and oceans. +# +# For example, the comment "#@AQAntarctica/" means the country code +# AQ is in the continent Antarctica regardless of the Zone name, +# so Pacific/Auckland should be listed under Antarctica as well as +# under the Pacific because its line's country codes include AQ. +# +# If more than one country code is affected each is listed separated +# by commas, e.g., #@IS,SHAtlantic/". If a country code is in +# more than one continent or ocean, each is listed separated by +# commas, e.g., the second column of "#@CY,TRAsia/,Europe/". +# +# These experimental comments are present only for country codes where +# the continent or ocean is not already obvious from the Zone name. +# For example, there is no such comment for RU since it already +# corresponds to Zone names starting with both "Europe/" and "Asia/". +# +#@AQ Antarctica/ +#@IS,SH Atlantic/ +#@CY,TR Asia/,Europe/ +#@SJ Arctic/ +#@CC,CX,KM,MG,YT Indian/