From 0c2c44b88038729271dbbe6156fc4ade31379b77 Mon Sep 17 00:00:00 2001 From: Phil Ross Date: Sun, 28 Sep 2014 20:44:56 +0100 Subject: [PATCH] Update to tzdata version 2014h. http://mm.icann.org/pipermail/tz-announce/2014-September/000025.html --- data/NEWS | 61 +++++++++++++++ data/SOURCE | 2 +- data/Theory | 4 +- data/africa | 57 +++++--------- data/asia | 4 + data/backzone | 75 +++++++++++++++---- data/checktab.awk | 9 --- data/europe | 3 +- data/northamerica | 19 ++++- data/zone1970.tab | 2 +- .../data/definitions/Africa/Blantyre.rb | 7 +- .../data/definitions/Africa/Bujumbura.rb | 7 +- .../data/definitions/Africa/Gaborone.rb | 12 +-- lib/tzinfo/data/definitions/Africa/Harare.rb | 7 +- lib/tzinfo/data/definitions/Africa/Kigali.rb | 7 +- .../data/definitions/Africa/Lubumbashi.rb | 7 +- lib/tzinfo/data/definitions/Africa/Lusaka.rb | 7 +- lib/tzinfo/data/definitions/Africa/Maseru.rb | 10 +-- lib/tzinfo/data/definitions/Africa/Mbabane.rb | 7 +- .../data/definitions/America/Jamaica.rb | 2 +- .../data/definitions/Asia/Novokuznetsk.rb | 4 +- lib/tzinfo/data/indexes/timezones.rb | 18 ++--- lib/tzinfo/data/version.rb | 2 +- tzinfo-data.gemspec | 2 +- 24 files changed, 193 insertions(+), 142 deletions(-) diff --git a/data/NEWS b/data/NEWS index 8ddd0916..5e33102e 100644 --- a/data/NEWS +++ b/data/NEWS @@ -1,5 +1,66 @@ News for the tz database +Release 2014h - 2014-09-25 18:59:03 -0700 + + Changes affecting past time stamps + + America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. + + Shanks says Asia/Novokuznetsk switched from LMT (not "NMT") on 1924-05-01, + not 1920-01-06. The old entry was based on a misinterpretation of Shanks. + + Some more zones have been turned into links, when they differed + from existing zones only for older time stamps. As usual, + these changes affect UTC offsets in pre-1970 time stamps only. + Their old contents have been moved to the 'backzone' file. + The affected zones are: Africa/Blantyre, Africa/Bujumbura, + Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, + Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. + + Changes affecting code + + zdump -V and -v now output gmtoff= values on all platforms, + not merely on platforms defining TM_GMTOFF. + + The tz library's localtime and mktime functions now set tzname to a value + appropriate for the requested time stamp, and zdump now uses this + on platforms not defining TM_ZONE, fixing a 2014g regression. + (Thanks to Tim Parenti for reporting the problem.) + + The tz library no longer sets tzname if localtime or mktime fails. + + zdump -c no longer mishandles transitions near year boundaries. + (Thanks to Tim Parenti for reporting the problem.) + + An access to uninitalized data has been fixed. + (Thanks to Jörg Richter for reporting the problem.) + + When THREAD_SAFE is defined, the code ports to the C11 memory model. + A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined + and two threads race to initialize data used by gmtime-like functions. + (Thanks to Andy Heninger for reporting the problems.) + + Changes affecting build procedure + + 'make check' now checks better for properly-sorted data. + + Changes affecting documentation and commentary + + zdump's gmtoff=N output is now documented, and its isdst=D output + is now documented to possibly output D values other than 0 or 1. + + zdump -c's treatment of years is now documented to use the + Gregorian calendar and Universal Time without leap seconds, + and its behavior at cutoff boundaries is now documented better. + (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.) + + Programs are now documented to use the proleptic Gregorian calendar. + (Thanks to Alan Barrett for the suggestion.) + + Fractional-second GMT offsets have been documented for civil time + in 19th-century Chennai, Jakarta, and New York. + + Release 2014g - 2014-08-28 12:31:23 -0700 Changes affecting future time stamps diff --git a/data/SOURCE b/data/SOURCE index 610e7278..6362a0a8 100644 --- a/data/SOURCE +++ b/data/SOURCE @@ -1,2 +1,2 @@ The files in this directory were obtained from the IANA Time Zone Database -http://www.iana.org/time-zones, version 2014g. +http://www.iana.org/time-zones, version 2014h. diff --git a/data/Theory b/data/Theory index a16ce3e1..e9be7154 100644 --- a/data/Theory +++ b/data/Theory @@ -103,7 +103,7 @@ POSIX has the following properties and limitations. signed time_t values stop working after 2038-01-19 03:14:07 UTC, so new implementations these days typically use a signed 64-bit integer. Unsigned 32-bit integers are used on one or two platforms, - and 36-bit integers are also used occasionally. + and 36-bit and 40-bit integers are also used occasionally. Although earlier POSIX versions allowed time_t to be a floating-point type, this was not supported by any practical systems, and POSIX.1-2013 and the tz code both require time_t @@ -318,7 +318,7 @@ Errors in the tz database arise from many sources: way to specify Easter, these exceptional years are entered as separate tz Rule lines, even though the legal rules did not change. - * The tz database models pre-standard time using the Gregorian + * The tz database models pre-standard time using the proleptic Gregorian calendar and local mean time (LMT), but many people used other calendars and other timescales. For example, the Roman Empire used the Julian calendar, and had 12 varying-length daytime hours with a diff --git a/data/africa b/data/africa index 6f7ad7a0..b17c62b7 100644 --- a/data/africa +++ b/data/africa @@ -110,23 +110,13 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 # See Africa/Lagos. # Botswana -# From Paul Eggert (2013-02-21): -# Milne says they were regulated by the Cape Town Signal in 1899; -# assume they switched to 2:00 when Cape Town did. -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Gaborone 1:43:40 - LMT 1885 - 1:30 - SAST 1903 Mar - 2:00 - CAT 1943 Sep 19 2:00 - 2:00 1:00 CAST 1944 Mar 19 2:00 - 2:00 - CAT +# See Africa/Maputo. # Burkina Faso # See Africa/Abidjan. # Burundi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bujumbura 1:57:28 - LMT 1890 - 2:00 - CAT +# See Africa/Maputo. # Cameroon # See Africa/Lagos. @@ -161,10 +151,7 @@ Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro 3:00 - EAT # Democratic Republic of the Congo -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 - 2:00 - CAT -# The above is for the eastern part; see Africa/Lagos for the western part. +# See Africa/Lagos for the western part and Africa/Maputo for the eastern. # Republic of the Congo # See Africa/Lagos. @@ -316,7 +303,7 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # Egypt is to change back to Daylight system on May 15 # http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx -# From Gunther Vermier (2015-05-13): +# From Gunther Vermier (2014-05-13): # our Egypt office confirms that the change will be at 15 May "midnight" (24:00) # From Imed Chihi (2014-06-04): @@ -466,11 +453,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul 3:00 - EAT # Lesotho -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Maseru 1:50:00 - LMT 1903 Mar - 2:00 - SAST 1943 Sep 19 2:00 - 2:00 1:00 SAST 1944 Mar 19 2:00 - 2:00 - SAST +# See Africa/Johannesburg. # Liberia # From Paul Eggert (2006-03-22): @@ -552,9 +535,7 @@ Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul 3:00 - EAT # Malawi -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. # Mali # Mauritania @@ -964,6 +945,13 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Maputo 2:10:20 - LMT 1903 Mar 2:00 - CAT +Link Africa/Maputo Africa/Blantyre # Malawi +Link Africa/Maputo Africa/Bujumbura # Burundi +Link Africa/Maputo Africa/Gaborone # Botswana +Link Africa/Maputo Africa/Harare # Zimbabwe +Link Africa/Maputo Africa/Kigali # Rwanda +Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo +Link Africa/Maputo Africa/Lusaka # Zambia # Namibia # The 1994-04-03 transition is from Shanks & Pottenger. @@ -1031,9 +1019,7 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis # Tromelin - inhabited until at least 1958 # Rwanda -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Kigali 2:00:16 - LMT 1935 Jun - 2:00 - CAT +# See Africa/Maputo. # St Helena # See Africa/Abidjan. @@ -1077,6 +1063,9 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 1:30 - SAST 1903 Mar 2:00 SA SAST +Link Africa/Johannesburg Africa/Maseru # Lesotho +Link Africa/Johannesburg Africa/Mbabane # Swaziland +# # Marion and Prince Edward Is # scientific station since 1947 # no information @@ -1104,9 +1093,7 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 Link Africa/Khartoum Africa/Juba # Swaziland -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar - 2:00 - SAST +# See Africa/Johannesburg. # Tanzania # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1227,11 +1214,5 @@ Zone Africa/Kampala 2:09:40 - LMT 1928 Jul 3:00 - EAT # Zambia -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar - 2:00 - CAT - # Zimbabwe -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Harare 2:04:12 - LMT 1903 Mar - 2:00 - CAT +# See Africa/Maputo. diff --git a/data/asia b/data/asia index 806a8c72..0be896b1 100644 --- a/data/asia +++ b/data/asia @@ -893,6 +893,10 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata # Indonesia # +# From Paul Eggert (2014-09-06): +# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia +# civil time was 7:07:12.5; round to even for Jakarta. +# # From Gwillim Law (2001-05-28), overriding Shanks & Pottenger: # http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime # says that Indonesia's time zones changed on 1988-01-01. Looking at some diff --git a/data/backzone b/data/backzone index d9183cdd..f464131a 100644 --- a/data/backzone +++ b/data/backzone @@ -57,10 +57,18 @@ Zone Africa/Banjul -1:06:36 - LMT 1912 -1:00 - WAT 1964 0:00 - GMT +# Malawi +Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar + 2:00 - CAT + # Republic of the Congo Zone Africa/Brazzaville 1:01:08 - LMT 1912 1:00 - WAT +# Burundi +Zone Africa/Bujumbura 1:57:28 - LMT 1890 + 2:00 - CAT + # Guinea Zone Africa/Conakry -0:54:52 - LMT 1912 0:00 - GMT 1934 Feb 26 @@ -92,11 +100,29 @@ Zone Africa/Freetown -0:53:00 - LMT 1882 -1:00 SL %s 1957 0:00 SL %s +# Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. +Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30 - SAST 1903 Mar + 2:00 - CAT 1943 Sep 19 2:00 + 2:00 1:00 CAST 1944 Mar 19 2:00 + 2:00 - CAT + +# Zimbabwe +Zone Africa/Harare 2:04:12 - LMT 1903 Mar + 2:00 - CAT + # South Sudan Zone Africa/Juba 2:06:24 - LMT 1931 2:00 Sudan CA%sT 2000 Jan 15 12:00 3:00 - EAT +# Rwanda +Zone Africa/Kigali 2:00:16 - LMT 1935 Jun + 2:00 - CAT + # Democratic Republic of the Congo (west) Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 1:00 - WAT @@ -105,6 +131,10 @@ Zone Africa/Kinshasa 1:01:12 - LMT 1897 Nov 9 Zone Africa/Libreville 0:37:48 - LMT 1912 1:00 - WAT +# Togo +Zone Africa/Lome 0:04:52 - LMT 1893 + 0:00 - GMT + # Angola # # Shanks gives 1911-05-26 for the transition to WAT, @@ -116,9 +146,13 @@ Zone Africa/Luanda 0:52:56 - LMT 1892 0:52:04 - AOT 1912 Jan 1 # Angola Time 1:00 - WAT -# Togo -Zone Africa/Lome 0:04:52 - LMT 1893 - 0:00 - GMT +# Democratic Republic of the Congo (east) +Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9 + 2:00 - CAT + +# Zambia +Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar + 2:00 - CAT # Equatorial Guinea # @@ -131,6 +165,16 @@ Zone Africa/Malabo 0:35:08 - LMT 1912 0:00 - GMT 1963 Dec 15 1:00 - WAT +# Lesotho +Zone Africa/Maseru 1:50:00 - LMT 1903 Mar + 2:00 - SAST 1943 Sep 19 2:00 + 2:00 1:00 SAST 1944 Mar 19 2:00 + 2:00 - SAST + +# Swaziland +Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar + 2:00 - SAST + # Niger Zone Africa/Niamey 0:08:28 - LMT 1912 -1:00 - WAT 1934 Feb 26 @@ -262,6 +306,11 @@ Zone Antarctica/McMurdo 0 - zzz 1956 Link Antarctica/McMurdo Antarctica/South_Pole # India +# +# From Paul Eggert (2014-09-06): +# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras +# civil time was 5:20:57.3. +# # From Paul Eggert (2014-08-21): # In tomorrow's The Hindu, Nitya Menon reports that India had two civil time # zones starting in 1884, one in Bombay and one in Calcutta, and that railways @@ -270,16 +319,6 @@ Link Antarctica/McMurdo Antarctica/South_Pole # http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece #Zone Asia/Chennai [not enough info to complete] -# China -# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) -# Heilongjiang (except Mohe county), Jilin -Zone Asia/Harbin 8:26:44 - LMT 1928 # or Haerbin - 8:30 - CHAT 1932 Mar # Changbai Time - 8:00 - CST 1940 - 9:00 - CHAT 1966 May - 8:30 - CHAT 1980 May - 8:00 PRC C%sT - # China # Long-shu Time (probably due to Long and Shu being two names of that area) # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan; @@ -291,6 +330,16 @@ Zone Asia/Chongqing 7:06:20 - LMT 1928 # or Chungking 8:00 PRC C%sT Link Asia/Chongqing Asia/Chungking +# China +# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) +# Heilongjiang (except Mohe county), Jilin +Zone Asia/Harbin 8:26:44 - LMT 1928 # or Haerbin + 8:30 - CHAT 1932 Mar # Changbai Time + 8:00 - CST 1940 + 9:00 - CHAT 1966 May + 8:30 - CHAT 1980 May + 8:00 PRC C%sT + # far west China Zone Asia/Kashgar 5:03:56 - LMT 1928 # or Kashi or Kaxgar 5:30 - KAST 1940 # Kashgar Time diff --git a/data/checktab.awk b/data/checktab.awk index 0f113f48..84c49ffa 100644 --- a/data/checktab.awk +++ b/data/checktab.awk @@ -17,18 +17,9 @@ BEGIN { if (zone_table == "zone1970.tab") { tztab["Africa/Addis_Ababa"] = 1 tztab["Africa/Asmara"] = 1 - tztab["Africa/Blantyre"] = 1 - tztab["Africa/Bujumbura"] = 1 tztab["Africa/Dar_es_Salaam"] = 1 tztab["Africa/Djibouti"] = 1 - tztab["Africa/Gaborone"] = 1 - tztab["Africa/Harare"] = 1 tztab["Africa/Kampala"] = 1 - tztab["Africa/Kigali"] = 1 - tztab["Africa/Lubumbashi"] = 1 - tztab["Africa/Lusaka"] = 1 - tztab["Africa/Maseru"] = 1 - tztab["Africa/Mbabane"] = 1 tztab["Africa/Mogadishu"] = 1 tztab["America/Antigua"] = 1 tztab["America/Cayman"] = 1 diff --git a/data/europe b/data/europe index 0130552d..6b20b928 100644 --- a/data/europe +++ b/data/europe @@ -68,6 +68,7 @@ # 0:00 WET WEST WEMT Western Europe # 0:19:32.13 AMT NST Amsterdam, Netherlands Summer (1835-1937)* # 0:20 NET NEST Netherlands (1937-1940)* +# 1:00 BST British Standard (1968-1971) # 1:00 CET CEST CEMT Central Europe # 1:00:14 SET Swedish (1879-1899)* # 2:00 EET EEST Eastern Europe @@ -2501,7 +2502,7 @@ Zone Asia/Novosibirsk 5:31:40 - LMT 1919 Dec 14 6:00 # The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus # realigning itself with KRAT. -Zone Asia/Novokuznetsk 5:48:48 - NMT 1920 Jan 6 +Zone Asia/Novokuznetsk 5:48:48 - LMT 1924 May 1 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time 7:00 Russia KRA%sT 1991 Mar 31 2:00s 6:00 Russia KRA%sT 1992 Jan 19 2:00s diff --git a/data/northamerica b/data/northamerica index ebfe5e3f..3d725055 100644 --- a/data/northamerica +++ b/data/northamerica @@ -277,6 +277,12 @@ Zone PST8PDT -8:00 US P%sT # time zone, but we do go by the Eastern time zone because so many people work # in Columbus." +# From Paul Eggert (2014-09-06): +# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208 +# says that New York City Hall time was 3 minutes 58.4 seconds fast of +# Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the +# nearest second. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER Rule NYC 1920 only - Mar lastSun 2:00 1:00 D Rule NYC 1920 only - Oct lastSun 2:00 0 S @@ -2985,10 +2991,21 @@ Zone America/Tegucigalpa -5:48:52 - LMT 1921 Apr # Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an # unspecified official document, and says "This time is used throughout the # island". Go with Milne. Round to the nearest second as required by zic. +# +# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but +# Lance Neita writes that Prime Minister Michael Manley decreed it January 5. +# Assume Neita meant Jan 6 02:00, the same as the US. Neita also writes that +# Manley's supporters associated this act with Manley's nickname "Joshua" +# (recall that in the Bible the sun stood still at Joshua's request), +# and with the Rod of Correction which Manley said he had received from +# Haile Selassie, Emperor of Ethiopia. See: +# Neita L. The politician in all of us. Jamaica Observer 2014-09-20 +# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647 +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST 1974 Apr 28 2:00 + -5:00 - EST 1974 -5:00 US E%sT 1984 -5:00 - EST diff --git a/data/zone1970.tab b/data/zone1970.tab index 03c50d89..f0e38f1d 100644 --- a/data/zone1970.tab +++ b/data/zone1970.tab @@ -323,7 +323,7 @@ TM +3757+05823 Asia/Ashgabat TN +3648+01011 Africa/Tunis TO -2110-17510 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul -TT,AG,AI,BL,DM,GD,GP,MF,LC,KN,MS,VC,VG,VI +1039-06131 America/Port_of_Spain +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 most locations diff --git a/lib/tzinfo/data/definitions/Africa/Blantyre.rb b/lib/tzinfo/data/definitions/Africa/Blantyre.rb index 3768a833..047717df 100644 --- a/lib/tzinfo/data/definitions/Africa/Blantyre.rb +++ b/lib/tzinfo/data/definitions/Africa/Blantyre.rb @@ -10,12 +10,7 @@ module Africa module Blantyre include TimezoneDefinition - timezone 'Africa/Blantyre' do |tz| - tz.offset :o0, 8400, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1903, 2, :o1, -2109291600, 173964557, 72 - end + linked_timezone 'Africa/Blantyre', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Bujumbura.rb b/lib/tzinfo/data/definitions/Africa/Bujumbura.rb index de454847..0e673333 100644 --- a/lib/tzinfo/data/definitions/Africa/Bujumbura.rb +++ b/lib/tzinfo/data/definitions/Africa/Bujumbura.rb @@ -10,12 +10,7 @@ module Africa module Bujumbura include TimezoneDefinition - timezone 'Africa/Bujumbura' do |tz| - tz.offset :o0, 7048, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1889, 12, :o1, -2524528648, 26042778919, 10800 - end + linked_timezone 'Africa/Bujumbura', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Gaborone.rb b/lib/tzinfo/data/definitions/Africa/Gaborone.rb index 41c6d2da..2c77d80b 100644 --- a/lib/tzinfo/data/definitions/Africa/Gaborone.rb +++ b/lib/tzinfo/data/definitions/Africa/Gaborone.rb @@ -10,17 +10,7 @@ module Africa module Gaborone include TimezoneDefinition - timezone 'Africa/Gaborone' do |tz| - tz.offset :o0, 6220, 0, :LMT - tz.offset :o1, 5400, 0, :SAST - tz.offset :o2, 7200, 0, :CAT - tz.offset :o3, 7200, 3600, :CAST - - tz.transition 1884, 12, :o1, -2682294220, 10409223289, 4320 - tz.transition 1903, 2, :o2, -2109288600, 38658791, 16 - tz.transition 1943, 9, :o3, -829526400, 4861973, 2 - tz.transition 1944, 3, :o2, -813805200, 58348043, 24 - end + linked_timezone 'Africa/Gaborone', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Harare.rb b/lib/tzinfo/data/definitions/Africa/Harare.rb index 9b87ae44..d37acfc3 100644 --- a/lib/tzinfo/data/definitions/Africa/Harare.rb +++ b/lib/tzinfo/data/definitions/Africa/Harare.rb @@ -10,12 +10,7 @@ module Africa module Harare include TimezoneDefinition - timezone 'Africa/Harare' do |tz| - tz.offset :o0, 7452, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1903, 2, :o1, -2109290652, 1932939531, 800 - end + linked_timezone 'Africa/Harare', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Kigali.rb b/lib/tzinfo/data/definitions/Africa/Kigali.rb index 61c5fcdc..3eebce3a 100644 --- a/lib/tzinfo/data/definitions/Africa/Kigali.rb +++ b/lib/tzinfo/data/definitions/Africa/Kigali.rb @@ -10,12 +10,7 @@ module Africa module Kigali include TimezoneDefinition - timezone 'Africa/Kigali' do |tz| - tz.offset :o0, 7216, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1935, 5, :o1, -1091498416, 13110953849, 5400 - end + linked_timezone 'Africa/Kigali', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Lubumbashi.rb b/lib/tzinfo/data/definitions/Africa/Lubumbashi.rb index 40f2b9b0..e11fc5cf 100644 --- a/lib/tzinfo/data/definitions/Africa/Lubumbashi.rb +++ b/lib/tzinfo/data/definitions/Africa/Lubumbashi.rb @@ -10,12 +10,7 @@ module Africa module Lubumbashi include TimezoneDefinition - timezone 'Africa/Lubumbashi' do |tz| - tz.offset :o0, 6592, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1897, 11, :o1, -2276646592, 1629610261, 675 - end + linked_timezone 'Africa/Lubumbashi', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Lusaka.rb b/lib/tzinfo/data/definitions/Africa/Lusaka.rb index 0fecfc53..d3f5de40 100644 --- a/lib/tzinfo/data/definitions/Africa/Lusaka.rb +++ b/lib/tzinfo/data/definitions/Africa/Lusaka.rb @@ -10,12 +10,7 @@ module Africa module Lusaka include TimezoneDefinition - timezone 'Africa/Lusaka' do |tz| - tz.offset :o0, 6788, 0, :LMT - tz.offset :o1, 7200, 0, :CAT - - tz.transition 1903, 2, :o1, -2109289988, 52189367503, 21600 - end + linked_timezone 'Africa/Lusaka', 'Africa/Maputo' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Maseru.rb b/lib/tzinfo/data/definitions/Africa/Maseru.rb index 33c2a0e9..c2bceb13 100644 --- a/lib/tzinfo/data/definitions/Africa/Maseru.rb +++ b/lib/tzinfo/data/definitions/Africa/Maseru.rb @@ -10,15 +10,7 @@ module Africa module Maseru include TimezoneDefinition - timezone 'Africa/Maseru' do |tz| - tz.offset :o0, 6600, 0, :LMT - tz.offset :o1, 7200, 0, :SAST - tz.offset :o2, 7200, 3600, :SAST - - tz.transition 1903, 2, :o1, -2109289800, 347929117, 144 - tz.transition 1943, 9, :o2, -829526400, 4861973, 2 - tz.transition 1944, 3, :o1, -813805200, 58348043, 24 - end + linked_timezone 'Africa/Maseru', 'Africa/Johannesburg' end end end diff --git a/lib/tzinfo/data/definitions/Africa/Mbabane.rb b/lib/tzinfo/data/definitions/Africa/Mbabane.rb index e483cb9e..3dcebd92 100644 --- a/lib/tzinfo/data/definitions/Africa/Mbabane.rb +++ b/lib/tzinfo/data/definitions/Africa/Mbabane.rb @@ -10,12 +10,7 @@ module Africa module Mbabane include TimezoneDefinition - timezone 'Africa/Mbabane' do |tz| - tz.offset :o0, 7464, 0, :LMT - tz.offset :o1, 7200, 0, :SAST - - tz.transition 1903, 2, :o1, -2109290664, 8698227889, 3600 - end + linked_timezone 'Africa/Mbabane', 'Africa/Johannesburg' end end end diff --git a/lib/tzinfo/data/definitions/America/Jamaica.rb b/lib/tzinfo/data/definitions/America/Jamaica.rb index f976d619..3656c888 100644 --- a/lib/tzinfo/data/definitions/America/Jamaica.rb +++ b/lib/tzinfo/data/definitions/America/Jamaica.rb @@ -18,7 +18,7 @@ module Jamaica tz.transition 1890, 1, :o1, -2524503169, 208342256831, 86400 tz.transition 1912, 2, :o2, -1827687169, 209039072831, 86400 - tz.transition 1974, 4, :o3, 136364400 + tz.transition 1974, 1, :o3, 126687600 tz.transition 1974, 10, :o2, 152085600 tz.transition 1975, 2, :o3, 162370800 tz.transition 1975, 10, :o2, 183535200 diff --git a/lib/tzinfo/data/definitions/Asia/Novokuznetsk.rb b/lib/tzinfo/data/definitions/Asia/Novokuznetsk.rb index 44861c34..fb97adde 100644 --- a/lib/tzinfo/data/definitions/Asia/Novokuznetsk.rb +++ b/lib/tzinfo/data/definitions/Asia/Novokuznetsk.rb @@ -11,7 +11,7 @@ module Novokuznetsk include TimezoneDefinition timezone 'Asia/Novokuznetsk' do |tz| - tz.offset :o0, 20928, 0, :NMT + tz.offset :o0, 20928, 0, :LMT tz.offset :o1, 21600, 0, :KRAT tz.offset :o2, 25200, 0, :KRAT tz.offset :o3, 25200, 3600, :KRAST @@ -20,7 +20,7 @@ module Novokuznetsk tz.offset :o6, 21600, 0, :NOVT tz.offset :o7, 25200, 0, :NOVT - tz.transition 1920, 1, :o1, -1577512128, 545024083, 225 + tz.transition 1924, 4, :o1, -1441259328, 545378908, 225 tz.transition 1930, 6, :o2, -1247551200, 9704593, 4 tz.transition 1981, 3, :o3, 354906000 tz.transition 1981, 9, :o2, 370713600 diff --git a/lib/tzinfo/data/indexes/timezones.rb b/lib/tzinfo/data/indexes/timezones.rb index 0039bd13..b9e643f1 100644 --- a/lib/tzinfo/data/indexes/timezones.rb +++ b/lib/tzinfo/data/indexes/timezones.rb @@ -19,9 +19,9 @@ module Timezones linked_timezone 'Africa/Bangui' linked_timezone 'Africa/Banjul' timezone 'Africa/Bissau' - timezone 'Africa/Blantyre' + linked_timezone 'Africa/Blantyre' linked_timezone 'Africa/Brazzaville' - timezone 'Africa/Bujumbura' + linked_timezone 'Africa/Bujumbura' timezone 'Africa/Cairo' timezone 'Africa/Casablanca' timezone 'Africa/Ceuta' @@ -32,24 +32,24 @@ module Timezones linked_timezone 'Africa/Douala' timezone 'Africa/El_Aaiun' linked_timezone 'Africa/Freetown' - timezone 'Africa/Gaborone' - timezone 'Africa/Harare' + linked_timezone 'Africa/Gaborone' + linked_timezone 'Africa/Harare' timezone 'Africa/Johannesburg' linked_timezone 'Africa/Juba' timezone 'Africa/Kampala' timezone 'Africa/Khartoum' - timezone 'Africa/Kigali' + linked_timezone 'Africa/Kigali' linked_timezone 'Africa/Kinshasa' timezone 'Africa/Lagos' linked_timezone 'Africa/Libreville' linked_timezone 'Africa/Lome' linked_timezone 'Africa/Luanda' - timezone 'Africa/Lubumbashi' - timezone 'Africa/Lusaka' + linked_timezone 'Africa/Lubumbashi' + linked_timezone 'Africa/Lusaka' linked_timezone 'Africa/Malabo' timezone 'Africa/Maputo' - timezone 'Africa/Maseru' - timezone 'Africa/Mbabane' + linked_timezone 'Africa/Maseru' + linked_timezone 'Africa/Mbabane' timezone 'Africa/Mogadishu' timezone 'Africa/Monrovia' timezone 'Africa/Nairobi' diff --git a/lib/tzinfo/data/version.rb b/lib/tzinfo/data/version.rb index c9e7de1e..ab35b2c4 100644 --- a/lib/tzinfo/data/version.rb +++ b/lib/tzinfo/data/version.rb @@ -8,7 +8,7 @@ module Version # The version of the {IANA Time Zone Database}[http://www.iana.org/time-zones] # used to generate this version of TZInfo::Data. - TZDATA = '2014g' + TZDATA = '2014h' end end end diff --git a/tzinfo-data.gemspec b/tzinfo-data.gemspec index 54efe2dd..cdc80f11 100644 --- a/tzinfo-data.gemspec +++ b/tzinfo-data.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'tzinfo-data' - s.version = '1.2014.7' + s.version = '1.2014.8' s.summary = 'Timezone Data for TZInfo' s.description = 'TZInfo::Data contains data from the IANA Time Zone database packaged as Ruby modules for use with TZInfo.' s.author = 'Philip Ross'