Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc51da69

Browse files
committed
Update time zone data files to tzdata release 2014e.
DST law changes in Crimea, Egypt, Morocco. New zone Antarctica/Trollfor Norwegian base in Queen Maud Land.
1 parente0a2337 commitc51da69

File tree

7 files changed

+238
-138
lines changed

7 files changed

+238
-138
lines changed

‎src/timezone/data/africa

Lines changed: 149 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,13 @@ RuleEgypt19901994-May 11:001:00S
239239
# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
240240
# </a>
241241
RuleEgypt19952010-AprlastFri 0:00s1:00S
242-
RuleEgypt19952005-SeplastThu23:00s0-
242+
RuleEgypt19952005-SeplastThu24:000-
243243
# From Steffen Thorsen (2006-09-19):
244244
# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
245245
# Egypt will turn back clocks by one hour at the midnight of Thursday
246246
# after observing the daylight saving time since May.
247247
# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
248-
RuleEgypt2006only-Sep2123:00s0-
248+
RuleEgypt2006only-Sep2124:000-
249249
# From Dirk Losch (2007-08-14):
250250
# I received a mail from an airline which says that the daylight
251251
# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ RuleEgypt2006only-Sep2123:00s0-
254254
# http://www.timeanddate.com/worldclock/city.html?n=53
255255
# From Steffen Thorsen (2007-09-04): The official information...:
256256
# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
257-
RuleEgypt2007only-SepThu>=123:00s0-
257+
RuleEgypt2007only-SepThu>=124:000-
258258
# From Abdelrahman Hassan (2007-09-06):
259259
# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
260260
# than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -335,11 +335,85 @@ RuleEgypt2007only-SepThu>=123:00s0-
335335
# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
336336
# </a>
337337

338-
RuleEgypt2008only-AuglastThu23:00s0-
339-
RuleEgypt2009only-Aug2023:00s0-
340-
RuleEgypt2010only-Aug110:000-
341-
RuleEgypt2010only-Sep100:001:00S
342-
RuleEgypt2010only-SeplastThu23:00s0-
338+
# From Ahmad El-Dardiry (2014-05-07):
339+
# Egypt is to change back to Daylight system on May 15
340+
# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
341+
342+
# From Gunther Vermier (2015-05-13):
343+
# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
344+
345+
# From Imed Chihi (2014-06-04):
346+
# We have finally "located" a precise official reference about the DST changes
347+
# in Egypt. The Ministers Cabinet decision is explained at
348+
# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
349+
# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
350+
# translates into: "With regard to daylight saving time, it is scheduled to
351+
# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
352+
# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
353+
# and re-established again at the end of the month of Ramadan, at twelve
354+
# o'clock on the evening of Thursday, 31 JUL 2014." This statement has been
355+
# reproduced by other (more accessible) sites[, e.g.,]...
356+
# http://elgornal.net/news/news.aspx?id=4699258
357+
358+
# From Paul Eggert (2014-06-04):
359+
# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
360+
# the change is because of blackouts in Cairo, even though Ahram Online (cited
361+
# above) says DST had no affect on electricity consumption. There is
362+
# no information about when DST will end this fall. See:
363+
# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
364+
#
365+
# For now, guess that later spring and fall transitions will use
366+
# 2010's rules, and guess that Egypt will switch to standard time at
367+
# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
368+
# first Friday after Ramadan. To implement this,
369+
# transition dates for 2015 through 2037 were determined by running
370+
# the following program under GNU Emacs 24.3, with the results integrated
371+
# by hand into the table below. Ramadan again intrudes on the guessed
372+
# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
373+
# (let ((islamic-year 1436))
374+
# (while (< islamic-year 1460)
375+
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
376+
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
377+
# (friday 5))
378+
# (while (/= friday (mod a 7))
379+
# (setq a (1- a)))
380+
# (while (/= friday (mod b 7))
381+
# (setq b (1+ b)))
382+
# (setq a (1- a))
383+
# (setq b (1- b))
384+
# (setq a (calendar-gregorian-from-absolute a))
385+
# (setq b (calendar-gregorian-from-absolute b))
386+
# (insert
387+
# (format
388+
# (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
389+
# "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
390+
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
391+
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
392+
# (setq islamic-year (+ 1 islamic-year))))
393+
RuleEgypt2008only-AuglastThu24:000-
394+
RuleEgypt2009only-Aug2024:000-
395+
RuleEgypt2010only-Aug1024:000-
396+
RuleEgypt2010only-Sep 924:001:00S
397+
RuleEgypt2010only-SeplastThu24:000-
398+
RuleEgypt2014only-May1524:001:00S
399+
RuleEgypt2014only-Jun2624:000-
400+
RuleEgypt2014only-Jul3124:001:00S
401+
RuleEgypt2014max-SeplastThu24:000-
402+
RuleEgypt20152019-AprlastFri 0:00s1:00S
403+
RuleEgypt2015only-Jun1124:000-
404+
RuleEgypt2015only-Jul2324:001:00S
405+
RuleEgypt2016only-Jun 224:000-
406+
RuleEgypt2016only-Jul 724:001:00S
407+
RuleEgypt2017only-May2524:000-
408+
RuleEgypt2017only-Jun2924:001:00S
409+
RuleEgypt2018only-May1024:000-
410+
RuleEgypt2018only-Jun1424:001:00S
411+
RuleEgypt2019only-May 224:000-
412+
RuleEgypt2019only-Jun 624:001:00S
413+
RuleEgypt2020only-May2824:001:00S
414+
RuleEgypt2021only-May1324:001:00S
415+
RuleEgypt2022only-May 524:001:00S
416+
RuleEgypt2023max-AprlastFri 0:00s1:00S
343417

344418
# ZoneNAMEGMTOFFRULESFORMAT[UNTIL]
345419
ZoneAfrica/Cairo2:05:09 -LMT1900 Oct
@@ -868,39 +942,39 @@ ZoneIndian/Mayotte3:00:56 -LMT1911 Jul# Mamoutzou
868942
# Another source (specifying the time for start and end in the decree):
869943
# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
870944

871-
# From Paul Eggert (2013-10-03):
872-
# To estimate what the Moroccan government will do in future years,
873-
# transition dates for 2014 through 2038 were determined by running
874-
# the following program under GNU Emacs 24.3:
875-
#
876-
# (let ((islamic-year 1435))
877-
# (while (< islamic-year 1461)
878-
# (let ((a
879-
# (calendar-gregorian-from-absolute
880-
# (calendar-islamic-to-absolute (list 9 1 islamic-year))))
881-
# (b
882-
# (calendar-gregorian-from-absolute
883-
# (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
884-
#(insert
885-
# (format
886-
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
887-
# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
888-
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
889-
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
945+
# From Sebastien Willemijns (2014-03-18):
946+
# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
947+
948+
# From Milamber Space Network (2014-06-05):
949+
# The Moroccan government has recently announced that the country will return
950+
# to standard time at 03:00 on Saturday, June 28, 2014 local time.... DST
951+
# will resume again at 02:00 on Saturday, August 2, 2014....
952+
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
953+
954+
# From Paul Eggert (2014-06-05):
955+
# For now, guess that later spring and fall transitions will use 2014's rules,
956+
# and guess that Morocco will switch to standard time at 03:00 the last
957+
# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
958+
# Ramadan. To implement this, transition dates for 2015 through 2037 were
959+
# determined by running the following program under GNU Emacs 24.3, with the
960+
# results integrated by hand into the table below.
961+
# (let ((islamic-year 1436))
962+
# (while (< islamic-year 1460)
963+
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
964+
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
965+
# (saturday 6))
966+
# (while (/= saturday (mod (setq a (1- a)) 7)))
967+
# (while (/= saturday (mod b 7))
968+
# (setq b (1+ b)))
969+
# (setq a (calendar-gregorian-from-absolute a))
970+
# (setq b (calendar-gregorian-from-absolute b))
971+
# (insert
972+
# (format
973+
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
974+
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
975+
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
976+
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
890977
# (setq islamic-year (+ 1 islamic-year))))
891-
#
892-
# with spring-forward transitions removed for 2023-2025, when the
893-
# normal spring-forward date falls during the estimated Ramadan; with
894-
# all transitions removed for 2026-2035, where the estimated Ramadan
895-
# falls entirely outside daylight-saving time; and with fall-back
896-
# transitions removed for 2036-2037, where the normal fall-back
897-
# date falls during the estimated Ramadan. Normally, the table would
898-
# stop after 2037 because 32-bit time_t values roll around early in 2038,
899-
# but that would imply a prediction of perpetual DST after March 2038
900-
# due to the year-2037 glitches. So, this table instead stops after
901-
# 2038, the first non-glitchy year after the 32-bit rollover.
902-
# An advantage of stopping after 2038 is that it lets zic guess
903-
# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
904978

905979
# RULENAMEFROMTOTYPEINONATSAVELETTER/S
906980

@@ -922,46 +996,44 @@ RuleMorocco1978only-Aug 4 0:000-
922996
RuleMorocco2008only-Jun 1 0:001:00S
923997
RuleMorocco2008only-Sep 1 0:000-
924998
RuleMorocco2009only-Jun 1 0:001:00S
925-
RuleMorocco2009only-Aug21 0:000-
999+
RuleMorocco2009only-Aug21 0:000-
9261000
RuleMorocco2010only-May 2 0:001:00S
9271001
RuleMorocco2010only-Aug 8 0:000-
9281002
RuleMorocco2011only-Apr 3 0:001:00S
929-
RuleMorocco2011only-Jul 31 00-
930-
RuleMorocco20122013-Apr lastSun 2:001:00S
931-
RuleMorocco2012only-Sep 30 3:000-
932-
RuleMorocco2012only-Jul 20 3:000-
933-
RuleMorocco2012only-Aug 20 2:001:00S
934-
RuleMorocco2013only-Jul 7 3:000-
935-
RuleMorocco2013only-Aug 10 2:001:00S
936-
RuleMorocco20132035-Oct lastSun 3:000-
937-
RuleMorocco20142022-Mar lastSun 2:001:00S
938-
RuleMorocco2014only-Jun 29 3:000-
939-
RuleMorocco2014only-Jul 29 2:001:00S
940-
RuleMorocco2015only-Jun 18 3:000-
941-
RuleMorocco2015only-Jul 18 2:001:00S
942-
RuleMorocco2016only-Jun 7 3:000-
943-
RuleMorocco2016only-Jul 7 2:001:00S
944-
RuleMorocco2017only-May 27 3:000-
945-
RuleMorocco2017only-Jun 26 2:001:00S
946-
RuleMorocco2018only-May 16 3:000-
947-
RuleMorocco2018only-Jun 15 2:001:00S
948-
RuleMorocco2019only-May 6 3:000-
949-
RuleMorocco2019only-Jun 5 2:001:00S
950-
RuleMorocco2020only-Apr 24 3:000-
951-
RuleMorocco2020only-May 24 2:001:00S
952-
RuleMorocco2021only-Apr 13 3:000-
953-
RuleMorocco2021only-May 13 2:001:00S
954-
RuleMorocco2022only-Apr 3 3:000-
955-
RuleMorocco2022only-May 3 2:001:00S
956-
RuleMorocco2023only-Apr 22 2:001:00S
957-
RuleMorocco2024only-Apr 10 2:001:00S
958-
RuleMorocco2025only-Mar 31 2:001:00S
959-
RuleMorocco2026max-Mar lastSun 2:001:00S
960-
RuleMorocco2036only-Oct 21 3:000-
961-
RuleMorocco2037only-Oct 11 3:000-
962-
RuleMorocco2038only-Sep 30 3:000-
963-
RuleMorocco2038only-Oct 30 2:001:00S
964-
RuleMorocco2038max-Oct lastSun 3:000-
1003+
RuleMorocco2011only-Jul31 00-
1004+
RuleMorocco20122013-AprlastSun 2:001:00S
1005+
RuleMorocco2012only-Sep30 3:000-
1006+
RuleMorocco2012only-Jul20 3:000-
1007+
RuleMorocco2012only-Aug20 2:001:00S
1008+
RuleMorocco2013only-Jul 7 3:000-
1009+
RuleMorocco2013only-Aug10 2:001:00S
1010+
RuleMorocco2013max-OctlastSun 3:000-
1011+
RuleMorocco20142022-MarlastSun 2:001:00S
1012+
RuleMorocco2014only-Jun28 3:000-
1013+
RuleMorocco2014only-Aug 2 2:001:00S
1014+
RuleMorocco2015only-Jun13 3:000-
1015+
RuleMorocco2015only-Jul18 2:001:00S
1016+
RuleMorocco2016only-Jun 4 3:000-
1017+
RuleMorocco2016only-Jul 9 2:001:00S
1018+
RuleMorocco2017only-May20 3:000-
1019+
RuleMorocco2017only-Jul 1 2:001:00S
1020+
RuleMorocco2018only-May12 3:000-
1021+
RuleMorocco2018only-Jun16 2:001:00S
1022+
RuleMorocco2019only-May 4 3:000-
1023+
RuleMorocco2019only-Jun 8 2:001:00S
1024+
RuleMorocco2020only-Apr18 3:000-
1025+
RuleMorocco2020only-May30 2:001:00S
1026+
RuleMorocco2021only-Apr10 3:000-
1027+
RuleMorocco2021only-May15 2:001:00S
1028+
RuleMorocco2022only-Apr 2 3:000-
1029+
RuleMorocco2022only-May 7 2:001:00S
1030+
RuleMorocco2023only-Apr22 2:001:00S
1031+
RuleMorocco2024only-Apr13 2:001:00S
1032+
RuleMorocco2025only-Apr 5 2:001:00S
1033+
RuleMorocco2026max-MarlastSun 2:001:00S
1034+
RuleMorocco2035only-Oct27 3:000-
1035+
RuleMorocco2036only-Oct18 3:000-
1036+
RuleMorocco2037only-Oct10 3:000-
9651037

9661038
# ZoneNAMEGMTOFFRULESFORMAT[UNTIL]
9671039
Zone Africa/Casablanca-0:30:20 -LMT1913 Oct 26

‎src/timezone/data/antarctica

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,24 +230,41 @@ Zone Antarctica/Syowa0-zzz1957 Jan 29
230230
# year-round base
231231
# Scott Base, Ross Island, since 1957-01.
232232
# See Pacific/Auckland.
233-
#
234-
# These rules for New Zealand are stolen from the 'australasia' file.
235-
# RuleNAMEFROMTOTYPEINONATSAVELETTER/S
236-
RuleNZAQ1974only-Nov 32:00s1:00D
237-
RuleNZAQ19751988-OctlastSun2:00s1:00D
238-
RuleNZAQ1989only-Oct 82:00s1:00D
239-
RuleNZAQ19902006-OctSun>=12:00s1:00D
240-
RuleNZAQ1975only-Feb232:00s0S
241-
RuleNZAQ19761989-MarSun>=12:00s0S
242-
RuleNZAQ19902007-MarSun>=152:00s0S
243-
RuleNZAQ2007max-SeplastSun2:00s1:00D
244-
RuleNZAQ2008max-AprSun>=12:00s0S
245233

246234
# Norway - territories
247235
# Bouvet (never inhabited)
248236
#
249237
# claims
250238
# Peter I Island (never inhabited)
239+
#
240+
# year-round base
241+
# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
242+
#
243+
# From Paul-Inge Flakstad (2014-03-10):
244+
# I recently had a long dialog about this with the developer of timegenie.com.
245+
# In the absence of specific dates, he decided to choose some likely ones:
246+
# GMT +1 - From March 1 to the last Sunday in March
247+
# GMT +2 - From the last Sunday in March until the last Sunday in October
248+
# GMT +1 - From the last Sunday in October until November 7
249+
# GMT +0 - From November 7 until March 1
250+
# The dates for switching to and from UTC+0 will probably not be absolutely
251+
# correct, but they should be quite close to the actual dates.
252+
#
253+
# From Paul Eggert (2014-03-21):
254+
# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
255+
# suggested by Bengt-Inge Larsson comment them out for now, and approximate
256+
# with only UTC and CEST. Uncomment them when 2014b is more prevalent.
257+
#
258+
# RuleNAMEFROMTOTYPEINONATSAVELETTER/S
259+
#RuleTroll2005max-Mar 11:00u1:00CET
260+
RuleTroll2005max-MarlastSun1:00u2:00CEST
261+
#RuleTroll2005max-OctlastSun1:00u1:00CET
262+
#RuleTroll2004max-Nov 71:00u0:00UTC
263+
# Remove the following line when uncommenting the above '#Rule' lines.
264+
RuleTroll2004max-OctlastSun1:00u0:00UTC
265+
# ZoneNAMEGMTOFFRULESFORMAT[UNTIL]
266+
Zone Antarctica/Troll0-zzz2005 Feb 12
267+
0:00Troll%s
251268

252269
# Poland - year-round base
253270
# Arctowski, King George Island, -620945-0582745, since 1977

‎src/timezone/data/asia

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,22 +1347,6 @@ ZoneAsia/Tokyo9:18:59-LMT1887 Dec 31 15:00u
13471347
# "Jordan will switch to winter time on Friday, October 27".
13481348
#
13491349

1350-
# From Phil Pizzey (2009-04-02):
1351-
# ...I think I may have spotted an error in the timezone data for
1352-
# Jordan.
1353-
# The current (2009d) asia file shows Jordan going to daylight
1354-
# saving
1355-
# time on the last Thursday in March.
1356-
#
1357-
# Rule Jordan 2000 max- Mar lastThu 0:00s 1:00 S
1358-
#
1359-
# However timeanddate.com, which I usually find reliable, shows Jordan
1360-
# going to daylight saving time on the last Friday in March since 2002.
1361-
# Please see
1362-
# <a href="http://www.timeanddate.com/worldclock/timezone.html?n=11">
1363-
# http://www.timeanddate.com/worldclock/timezone.html?n=11
1364-
# </a>
1365-
13661350
# From Steffen Thorsen (2009-04-02):
13671351
# This single one might be good enough, (2009-03-24, Arabic):
13681352
# <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279">

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp