Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 3
Star 2
Fork 0
D
dragonwell8_jdk

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 c20b107c 编写于 作者: R rpatil
浏览文件
操作

8224560: (tz) Upgrade time-zone data to tzdata2019a 

8215982: (tz) Upgrade time-zone data to tzdata2018i
8225580: tzdata2018i integration causes test failures on jdk-13
Reviewed-by: andrew, naoto
上级 57e49fe2
展开全部 隐藏空白更改
内联 并排
Showing with 1585 addition and 367 deletion
make/data/tzdata/VERSION
浏览文件 @ c20b107c
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any # or visit www.oracle.com if you need additional information or have any
# questions. # questions.
# #
tzdata2018g tzdata2019a
make/data/tzdata/africa
浏览文件 @ c20b107c
...@@ -387,6 +387,11 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct ...@@ -387,6 +387,11 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
# See Africa/Lagos. # See Africa/Lagos.
# Eritrea # Eritrea
# See Africa/Nairobi.
# Eswatini (formerly Swaziland)
# See Africa/Johannesburg.
# Ethiopia # Ethiopia
# See Africa/Nairobi. # See Africa/Nairobi.
# #
...@@ -870,8 +875,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis ...@@ -870,8 +875,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# From Mohamed Essedik Najd (2018-10-26): # From Mohamed Essedik Najd (2018-10-26):
# Today, a Moroccan government council approved the perpetual addition # Today, a Moroccan government council approved the perpetual addition
# of 60 minutes to the regular Moroccan timezone. # of 60 minutes to the regular Moroccan timezone.
# From Brian Inglis (2018-10-26): # From Matt Johnson (2018-10-28):
# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le # http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf
#
# From Maamar Abdelkader (2018-11-01):
# We usually move clocks back the previous week end and come back to the +1
# the week end after.... The government does not announce yet the decision
# about this temporary change. But it s 99% sure that it will be the case,
# as in previous years. An unofficial survey was done these days, showing
# that 64% of asked peopke are ok for moving from +1 to +0 during Ramadan.
# https://leconomiste.com/article/1035870-enquete-l-economiste-sunergia-64-des-marocains-plebiscitent-le-gmt-pendant-ramadan
#
# From Paul Eggert (2018-11-01):
# For now, guess that Morocco will fall back at 03:00 the last Sunday
# before Ramadan, and spring forward at 02:00 the first Sunday after
# Ramadan, as this has been the practice since 2012. To implement this,
# transition dates for 2019 through 2037 were determined by running the
# following program under GNU Emacs 26.1.
# (let ((islamic-year 1440))
# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
# (sunday 0))
# (while (/= sunday (mod (setq a (1- a)) 7)))
# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
# (insert
# (format
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t-1:00\t-\n"
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t0\t-\n")
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 - Rule Morocco 1939 only - Sep 12 0:00 1:00 -
...@@ -903,7 +941,7 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 - ...@@ -903,7 +941,7 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 -
Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00 - Rule Morocco 2013 only - Aug 10 2:00 1:00 -
Rule Morocco 2013 2018 - Oct lastSun 3:00 0 - Rule Morocco 2013 2017 - Oct lastSun 3:00 0 -
Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 - Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 -
Rule Morocco 2014 only - Jun 28 3:00 0 - Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00 - Rule Morocco 2014 only - Aug 2 2:00 1:00 -
...@@ -915,13 +953,53 @@ Rule Morocco 2017 only - May 21 3:00 0 - ...@@ -915,13 +953,53 @@ Rule Morocco 2017 only - May 21 3:00 0 -
Rule Morocco 2017 only - Jul 2 2:00 1:00 - Rule Morocco 2017 only - Jul 2 2:00 1:00 -
Rule Morocco 2018 only - May 13 3:00 0 - Rule Morocco 2018 only - May 13 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 - Rule Morocco 2018 only - Jun 17 2:00 1:00 -
Rule Morocco 2019 only - May 5 3:00 0 -
Rule Morocco 2019 only - Jun 9 2:00 1:00 -
Rule Morocco 2020 only - Apr 19 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 -
Rule Morocco 2021 only - Apr 11 3:00 0 -
Rule Morocco 2021 only - May 16 2:00 1:00 -
Rule Morocco 2022 only - Mar 27 3:00 0 -
Rule Morocco 2022 only - May 8 2:00 1:00 -
Rule Morocco 2023 only - Mar 19 3:00 0 -
Rule Morocco 2023 only - Apr 23 2:00 1:00 -
Rule Morocco 2024 only - Mar 10 3:00 0 -
Rule Morocco 2024 only - Apr 14 2:00 1:00 -
Rule Morocco 2025 only - Feb 23 3:00 0 -
Rule Morocco 2025 only - Apr 6 2:00 1:00 -
Rule Morocco 2026 only - Feb 15 3:00 0 -
Rule Morocco 2026 only - Mar 22 2:00 1:00 -
Rule Morocco 2027 only - Feb 7 3:00 0 -
Rule Morocco 2027 only - Mar 14 2:00 1:00 -
Rule Morocco 2028 only - Jan 23 3:00 0 -
Rule Morocco 2028 only - Feb 27 2:00 1:00 -
Rule Morocco 2029 only - Jan 14 3:00 0 -
Rule Morocco 2029 only - Feb 18 2:00 1:00 -
Rule Morocco 2029 only - Dec 30 3:00 0 -
Rule Morocco 2030 only - Feb 10 2:00 1:00 -
Rule Morocco 2030 only - Dec 22 3:00 0 -
Rule Morocco 2031 only - Jan 26 2:00 1:00 -
Rule Morocco 2031 only - Dec 14 3:00 0 -
Rule Morocco 2032 only - Jan 18 2:00 1:00 -
Rule Morocco 2032 only - Nov 28 3:00 0 -
Rule Morocco 2033 only - Jan 9 2:00 1:00 -
Rule Morocco 2033 only - Nov 20 3:00 0 -
Rule Morocco 2033 only - Dec 25 2:00 1:00 -
Rule Morocco 2034 only - Nov 5 3:00 0 -
Rule Morocco 2034 only - Dec 17 2:00 1:00 -
Rule Morocco 2035 only - Oct 28 3:00 0 -
Rule Morocco 2035 only - Dec 2 2:00 1:00 -
Rule Morocco 2036 only - Oct 19 3:00 0 -
Rule Morocco 2036 only - Nov 23 2:00 1:00 -
Rule Morocco 2037 only - Oct 4 3:00 0 -
Rule Morocco 2037 only - Nov 15 2:00 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 1984 Mar 16 0:00 Morocco +00/+01 1984 Mar 16
1:00 - +01 1986 1:00 - +01 1986
0:00 Morocco +00/+01 2018 Oct 27 0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 - +01 0:00 Morocco +00/+01
# Western Sahara # Western Sahara
# #
...@@ -936,8 +1014,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 ...@@ -936,8 +1014,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
-1:00 - -01 1976 Apr 14 -1:00 - -01 1976 Apr 14
0:00 Morocco +00/+01 2018 Oct 27 0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 - +01 0:00 Morocco +00/+01
# Mozambique # Mozambique
# #
...@@ -1094,10 +1172,20 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis ...@@ -1094,10 +1172,20 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
# the switch is from 01:00 to 02:00 ... [Decree No. 25/2017] # the switch is from 01:00 to 02:00 ... [Decree No. 25/2017]
# http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017 # http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
# From Vadim Nasardinov (2018-12-29):
# São Tomé and Príncipe is about to do the following on Jan 1, 2019:
# https://www.stp-press.st/2018/12/05/governo-jesus-ja-decidiu-repor-hora-legal-sao-tomense/
#
# From Michael Deckers (2018-12-30):
# https://www.legis-palop.org/download.jsp?idFile=102818
# ... [The legal time of the country, which coincides with universal
# coordinated time, will be restituted at 2 o'clock on day 1 of January, 2019.]
Zone Africa/Sao_Tome 0:26:56 - LMT 1884 Zone Africa/Sao_Tome 0:26:56 - LMT 1884
-0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT -0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT
0:00 - GMT 2018 Jan 1 01:00 0:00 - GMT 2018 Jan 1 01:00
1:00 - WAT 1:00 - WAT 2019 Jan 1 02:00
0:00 - GMT
# Senegal # Senegal
# See Africa/Abidjan. # See Africa/Abidjan.
...@@ -1128,7 +1216,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 ...@@ -1128,7 +1216,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar 1:30 - SAST 1903 Mar
2:00 SA SAST 2:00 SA SAST
Link Africa/Johannesburg Africa/Maseru # Lesotho Link Africa/Johannesburg Africa/Maseru # Lesotho
Link Africa/Johannesburg Africa/Mbabane # Swaziland Link Africa/Johannesburg Africa/Mbabane # Eswatini
# #
# Marion and Prince Edward Is # Marion and Prince Edward Is
# scientific station since 1947 # scientific station since 1947
...@@ -1170,9 +1258,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931 ...@@ -1170,9 +1258,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00 2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT 3:00 - EAT
# Swaziland
# See Africa/Johannesburg.
# Tanzania # Tanzania
# See Africa/Nairobi. # See Africa/Nairobi.
......
make/data/tzdata/asia
浏览文件 @ c20b107c
此差异已折叠。
make/data/tzdata/australasia
浏览文件 @ c20b107c
...@@ -425,10 +425,44 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete ...@@ -425,10 +425,44 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
# it is uninhabited. # it is uninhabited.
# Guam # Guam
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savings-Time-May-6-1959.pdf
Rule Guam 1959 only - Jun 27 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-61-5-Revocation-of-Daylight-Saving-Time-and-Restoratio.pdf
Rule Guam 1961 only - Jan 29 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-67-13-Guam-Daylight-Savings-Time.pdf
Rule Guam 1967 only - Sep 1 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-69-2-Repeal-of-Guam-Daylight-Saving-Time.pdf
Rule Guam 1969 only - Jan 26 0:01 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-69-10-Guam-Daylight-Saving-Time.pdf
Rule Guam 1969 only - Jun 22 2:00 1:00 D
Rule Guam 1969 only - Aug 31 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-70-10-Guam-Daylight-Saving-Time.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-70-30-End-of-Guam-Daylight-Saving-Time.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-71-5-Guam-Daylight-Savings-Time.pdf
Rule Guam 1970 1971 - Apr lastSun 2:00 1:00 D
Rule Guam 1970 1971 - Sep Sun>=1 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-73-28.-Guam-Day-light-Saving-Time.pdf
Rule Guam 1973 only - Dec 16 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-74-7-Guam-Daylight-Savings-Time-Rescinded.pdf
Rule Guam 1974 only - Feb 24 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-76-13-Daylight-Savings-Time.pdf
Rule Guam 1976 only - May 26 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-76-25-Revocation-of-E.O.-76-13.pdf
Rule Guam 1976 only - Aug 22 2:01 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-77-4-Daylight-Savings-Time.pdf
Rule Guam 1977 only - Apr 24 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-77-18-Guam-Standard-Time.pdf
Rule Guam 1977 only - Aug 28 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
9:39:00 - LMT 1901 # Agana 9:39:00 - LMT 1901 # Agana
10:00 - GST 2000 Dec 23 # Guam 10:00 - GST 1941 Dec 10 # Guam
9:00 - +09 1944 Jul 31
10:00 Guam G%sT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time 10:00 - ChST # Chamorro Standard Time
Link Pacific/Guam Pacific/Saipan # N Mariana Is Link Pacific/Guam Pacific/Saipan # N Mariana Is
...@@ -450,31 +484,56 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 ...@@ -450,31 +484,56 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
# Marshall Is # Marshall Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Majuro 11:24:48 - LMT 1901 Zone Pacific/Majuro 11:24:48 - LMT 1901
11:00 - +11 1969 Oct 11:00 - +11 1914 Oct
12:00 - +12 9:00 - +09 1919 Feb 1
Zone Pacific/Kwajalein 11:09:20 - LMT 1901 11:00 - +11 1937
11:00 - +11 1969 Oct 10:00 - +10 1941 Apr 1
-12:00 - -12 1993 Aug 20 9:00 - +09 1944 Jan 30
12:00 - +12 11:00 - +11 1969 Oct
12:00 - +12
Zone Pacific/Kwajalein 11:09:20 - LMT 1901
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1944 Feb 6
11:00 - +11 1969 Oct
-12:00 - -12 1993 Aug 20 24:00
12:00 - +12
# Micronesia # Micronesia
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Chuuk 10:07:08 - LMT 1901 Zone Pacific/Chuuk -13:52:52 - LMT 1844 Dec 31
10:00 - +10 10:07:08 - LMT 1901
Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia 10:00 - +10 1914 Oct
11:00 - +11 9:00 - +09 1919 Feb 1
Zone Pacific/Kosrae 10:51:56 - LMT 1901 10:00 - +10 1941 Apr 1
11:00 - +11 1969 Oct 9:00 - +09 1945 Aug
12:00 - +12 1999 10:00 - +10
11:00 - +11 Zone Pacific/Pohnpei -13:27:08 - LMT 1844 Dec 31 # Kolonia
10:32:52 - LMT 1901
11:00 - +11 1914 Oct
9:00 - +09 1919 Feb 1
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1945 Aug
11:00 - +11
Zone Pacific/Kosrae -13:08:04 - LMT 1844 Dec 31
10:51:56 - LMT 1901
11:00 - +11 1914 Oct
9:00 - +09 1919 Feb 1
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1945 Aug
11:00 - +11 1969 Oct
12:00 - +12 1999
11:00 - +11
# Nauru # Nauru
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
11:30 - +1130 1942 Mar 15 11:30 - +1130 1942 Aug 29
9:00 - +09 1944 Aug 15 9:00 - +09 1945 Sep 8
11:30 - +1130 1979 May 11:30 - +1130 1979 Feb 10 2:00
12:00 - +12 12:00 - +12
# New Caledonia # New Caledonia
...@@ -575,8 +634,9 @@ Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston ...@@ -575,8 +634,9 @@ Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
# Palau (Belau) # Palau (Belau)
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Palau 8:57:56 - LMT 1901 # Koror Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror
9:00 - +09 8:57:56 - LMT 1901
9:00 - +09
# Papua New Guinea # Papua New Guinea
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -838,7 +898,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -838,7 +898,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# tz@iana.org for general use in the future). For more, please see # tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution. # the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (2017-02-10): # From Paul Eggert (2018-11-18):
# #
# Unless otherwise specified, the source for data through 1990 is: # Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...@@ -863,6 +923,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -863,6 +923,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# A reliable and entertaining source about time zones is # A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
# #
# I invented the abbreviation marked "*".
# The following abbreviations are from other sources. # The following abbreviations are from other sources.
# Corrections are welcome! # Corrections are welcome!
# std dst # std dst
...@@ -870,7 +931,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -870,7 +931,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# 8:00 AWST AWDT Western Australia # 8:00 AWST AWDT Western Australia
# 9:30 ACST ACDT Central Australia # 9:30 ACST ACDT Central Australia
# 10:00 AEST AEDT Eastern Australia # 10:00 AEST AEDT Eastern Australia
# 10:00 GST Guam through 2000 # 10:00 GST GDT* Guam through 2000
# 10:00 ChST Chamorro # 10:00 ChST Chamorro
# 11:30 NZMT NZST New Zealand through 1945 # 11:30 NZMT NZST New Zealand through 1945
# 12:00 NZST NZDT New Zealand 1946-present # 12:00 NZST NZDT New Zealand 1946-present
...@@ -1569,28 +1630,70 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1569,28 +1630,70 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# Kwajalein # Kwajalein
# In comp.risks 14.87 (26 August 1993), Peter Neumann writes: # From an AP article (1993-08-22):
# I wonder what happened in Kwajalein, where there was NO Friday, # "The nearly 3,000 Americans living on this remote Pacific atoll have a good
# 1993-08-20. Thursday night at midnight Kwajalein switched sides with # excuse for not remembering Saturday night: there wasn't one. Residents were
# respect to the International Date Line, to rejoin its fellow islands, # going to bed Friday night and waking up Sunday morning because at midnight
# going from 11:59 p.m. Thursday to 12:00 m. Saturday in a blink. # -- 8 A.M. Eastern daylight time on Saturday -- Kwajalein was jumping from
# one side of the international date line to the other."
# "In Marshall Islands, Friday is followed by Sunday", NY Times. 1993-08-22.
# https://www.nytimes.com/1993/08/22/world/in-marshall-islands-friday-is-followed-by-sunday.html
# From Phake Nick (2018-10-27):
# <https://wiki.suikawiki.org/n/南洋群島の標準時> ... pointed out that
# currently tzdata say Pacific/Kwajalein switched from GMT+11 to GMT-12 in
# 1969 October without explanation, however an 1993 article from NYT say it
# synchorized its day with US mainland about 40 years ago and thus the switch
# should occur at around 1950s instead.
#
# From Paul Eggert (2018-11-18):
# The NYT (actually, AP) article is vague and possibly wrong about this.
# The article says the earlier switch was "40 years ago when the United States
# Army established a missile test range here". However, the Kwajalein Test
# Center was established on 1960-10-01 and was run by the US Navy. It was
# transferred to the US Army on 1964-07-01. See "Seize the High Ground"
# <https://history.army.mil/html/books/070/70-88-1/cmhPub_70-88-1.pdf>.
# Given that Shanks was right on the money about the 1993 change, I'm inclined
# to take Shanks's word for the 1969 change unless we find better evidence.
# N Mariana Is, Guam # N Mariana Is, Guam
# From Phake Nick (2018-10-27):
# Guam Island was briefly annexed by Japan during ... year 1941-1944 ...
# however there are no detailed information about what time it use during that
# period. It would probably be reasonable to assume Guam use GMT+9 during
# that period of time like the surrounding area.
# From Paul Eggert (2018-11-18):
# Howse writes (p 153) "The Spaniards, on the other hand, reached the # Howse writes (p 153) "The Spaniards, on the other hand, reached the
# Philippines and the Ladrones from America," and implies that the Ladrones # Philippines and the Ladrones from America," and implies that the Ladrones
# (now called the Marianas) kept American date for quite some time. # (now called the Marianas) kept American date for quite some time.
# For now, we assume the Ladrones switched at the same time as the Philippines; # For now, we assume the Ladrones switched at the same time as the Philippines;
# see Asia/Manila. # see Asia/Manila.
#
# Use 1941-12-10 and 1944-07-31 for Guam WWII transitions, as the rough start
# and end of Japanese control of Agana. We don't know whether the Northern
# Marianas followed Guam's DST rules from 1959 through 1977; for now, assume
# they did as that avoids the need for a separate zone due to our 1970 cutoff.
#
# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
# under the name "Chamorro Standard Time". There is no official abbreviation, # under the name "Chamorro Standard Time". There is no official abbreviation,
# but Congressman Robert A. Underwood, author of the bill that became law, # but Congressman Robert A. Underwood, author of the bill that became law,
# wrote in a press release (2000-12-27) that he will seek the use of "ChST". # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
# See also the commentary for Micronesia.
# Micronesia
# Marshall Is
# See the commentary for Micronesia.
# Micronesia (and nearby)
# From Paul Eggert (2018-11-18):
# Like the Ladrones (see Guam commentary), assume the Spanish East Indies
# kept American time until the Philippines switched at the end of 1844.
# Alan Eugene Davis writes (1996-03-16), # Alan Eugene Davis writes (1996-03-16),
# "I am certain, having lived there for the past decade, that 'Truk' # "I am certain, having lived there for the past decade, that 'Truk'
...@@ -1606,6 +1709,95 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1606,6 +1709,95 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# that Truk and Yap are UT +10, and Ponape and Kosrae are +11. # that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
# We don't know when Kosrae switched from +12; assume January 1 for now. # We don't know when Kosrae switched from +12; assume January 1 for now.
# From Phake Nick (2018-10-27):
#
# From a Japanese wiki site https://wiki.suikawiki.org/n/南洋群島の標準時
# ...
# For "Southern Islands" (modern region of Mariana + Palau + Federation of
# Micronesia + Marshall Islands):
#
# A 1906 Japanese magazine shown the Caroline Islands and Mariana Islands
# who was occupied by Germany at the time as GMT+10, together with the like
# of German New Guinea. However there is a marking saying it have not been
# implemented (yet). No further information after that were found.
#
# Japan invaded those islands in 1914, and records shows that they were
# instructed to use JST at the time.
#
# 1915 January telecommunication record on the Jaluit Atoll shows they use
# the meridian of 170E as standard time (GMT+11:20), which is similar to the
# longitude of the atoll.
# 1915 February record say the 170E standard time is to be used until
# February 9 noon, and after February 9 noon they are to use JST.
# However these are time used within the Japanese Military at the time and
# probably does not reflect the time used by local resident at the time (that
# is if they keep their own time back then)
#
# In January 1919 the occupying force issued a command that split the area
# into three different timezone with meridian of 135E, 150E, 165E (JST+0, +1,
# +2), and the command was to become effective from February 1 of the same
# year. Despite the target of the command is still only for the occupying
# force itself, further publication have described the time as the standard
# time for the occupied area and thus it can probably be seen as such.
# * Area that use meridian of 135E: Palau and Yap civil administration area
# (Southern Islands Western Standard Time)
# * Area that use meridian of 150E: Truk (Chuuk) and Saipan civil
# administration area (Southern Islands Central Standard Time)
# * Area that use meridian of 165E: Ponape (Pohnpei) and Jaluit civil
# administration area (Southern Islands Eastern Standard Time).
# * In the next few years Japanese occupation of those islands have been
# formalized via League of Nation Mandate (South Pacific Mandate) and formal
# governance structure have been established, these district [become
# subprefectures] and timezone classification have been inherited as standard
# time of the area.
# * Saipan subprefecture include Mariana islands (exclude Guam which was
# occupied by America at the time), Palau and Yap subprefecture rule the
# Western Caroline Islands with 137E longitude as border, Truk and Ponape
# subprefecture rule the Eastern Caroline Islands with 154E as border, Ponape
# subprefecture also rule part of Marshall Islands to the west of 164E
# starting from (1918?) and Jaluit subprefecture rule the rest of the
# Marshall Islands.
#
# And then in year 1937, an announcement was made to change the time in the
# area into 2 timezones:
# * Area that use meridian of 135E: area administered by Palau, Yap and
# Saipan subprefecture (Southern Islands Western Standard Time)
# * Area that use meridian of 150E: area administered by Truk (Chuuk),
# Ponape (Pohnpei) and Jaluit subprefecture (Southern Islands Eastern
# Standard Time)
#
# Another announcement issued in 1941 say that on April 1 that year,
# standard time of the Southern Islands would be changed to use the meridian
# of 135E (GMT+9), and thus abolishing timezone different within the area.
#
# Then Pacific theater of WWII started and Japan slowly lose control on the
# island. The webpage I linked above contain no information during this
# period of time....
#
# After the end of WWII, in 1946 February, a document written by the
# (former?) Japanese military personnel describe there are 3 hours time
# different between Caroline islands time/Wake island time and the Chungking
# time, which would mean the time being used there at the time was GMT+10.
#
# After that, the area become Trust Territories of the Pacific Islands
# under American administration from year 1947. The site listed some
# American/International books/maps/publications about time used in those
# area during this period of time but they doesn't seems to be reliable
# information so it would be the best if someone know where can more reliable
# information can be found.
#
#
# From Paul Eggert (2018-11-18):
#
# For the above, use vague dates like "1914" and "1945" for transitions that
# plausibly exist but for which the details are not known. The information
# for Wake is too sketchy to act on.
#
# The 1906 GMT+10 info about German-controlled islands might not have been
# done, so omit it from the data for now.
#
# The Jaluit info governs Kwajalein.
# Midway # Midway
...@@ -1623,6 +1815,29 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1623,6 +1815,29 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# started DST on June 3. Possibly DST was observed other years # started DST on June 3. Possibly DST was observed other years
# in Midway, but we have no record of it. # in Midway, but we have no record of it.
# Nauru
# From Phake Nick (2018-10-31):
# Currently, the tz database say Nauru use LMT until 1921, and then
# switched to GMT+11:30 for the next two decades.
# However, a number of timezone map published in America/Japan back then
# showed its timezone as GMT+11 per https://wiki.suikawiki.org/n/ナウルの標準時
# And it would also be nice if the 1921 transition date could be sourced.
# ...
# The "Nauru Standard Time Act 1978 Time Change"
# http://ronlaw.gov.nr/nauru_lpms/files/gazettes/4b23a17d2030150404db7a5fa5872f52.pdf#page=3
# based on "Nauru Standard Time Act 1978 Time Change"
# http://www.paclii.org/nr/legis/num_act/nsta1978207/ defined that "Nauru
# Alternative Time" (GMT+12) should be in effect from 1979 Feb.
#
# From Paul Eggert (2018-11-19):
# The 1921-01-15 introduction of standard time is in Shanks; it is also in
# "Standard Time Throughout the World", US National Bureau of Standards (1935),
# page 3, which does not give the UT offset. In response to a comment by
# Phake Nick I set the Nauru time of occupation by Japan to
# 1942-08-29/1945-09-08 by using dates from:
# https://en.wikipedia.org/wiki/Japanese_occupation_of_Nauru
# Norfolk # Norfolk
# From Alexander Krivenyshev (2015-09-23): # From Alexander Krivenyshev (2015-09-23):
...@@ -1638,6 +1853,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1638,6 +1853,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# other than in 1974/5. See: # other than in 1974/5. See:
# https://www.timeanddate.com/time/australia/norfolk-island.html # https://www.timeanddate.com/time/australia/norfolk-island.html
# Palau
# See commentary for Micronesia.
# Pitcairn # Pitcairn
# From Rives McDow (1999-11-08): # From Rives McDow (1999-11-08):
...@@ -1802,6 +2020,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1802,6 +2020,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# From Paul Eggert (2003-03-23): # From Paul Eggert (2003-03-23):
# We have no other report of DST in Wake Island, so omit this info for now. # We have no other report of DST in Wake Island, so omit this info for now.
# See also the commentary for Micronesia.
############################################################################### ###############################################################################
# The International Date Line # The International Date Line
......
make/data/tzdata/backward
浏览文件 @ c20b107c
...@@ -100,6 +100,7 @@ Link Pacific/Easter Chile/EasterIsland ...@@ -100,6 +100,7 @@ Link Pacific/Easter Chile/EasterIsland
Link America/Havana Cuba Link America/Havana Cuba
Link Africa/Cairo Egypt Link Africa/Cairo Egypt
Link Europe/Dublin Eire Link Europe/Dublin Eire
Link Etc/UTC Etc/UCT
Link Europe/London Europe/Belfast Link Europe/London Europe/Belfast
Link Europe/Chisinau Europe/Tiraspol Link Europe/Chisinau Europe/Tiraspol
Link Europe/London GB Link Europe/London GB
...@@ -134,7 +135,7 @@ Link Asia/Taipei ROC ...@@ -134,7 +135,7 @@ Link Asia/Taipei ROC
Link Asia/Seoul ROK Link Asia/Seoul ROK
Link Asia/Singapore Singapore Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey Link Europe/Istanbul Turkey
Link Etc/UCT UCT Link Etc/UTC UCT
Link America/Anchorage US/Alaska Link America/Anchorage US/Alaska
Link America/Adak US/Aleutian Link America/Adak US/Aleutian
Link America/Phoenix US/Arizona Link America/Phoenix US/Arizona
......
make/data/tzdata/etcetera
浏览文件 @ c20b107c
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
Zone Etc/GMT 0 - GMT Zone Etc/GMT 0 - GMT
Zone Etc/UTC 0 - UTC Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file 'backward', # but it belongs here, not in the file 'backward',
......
make/data/tzdata/europe
浏览文件 @ c20b107c
...@@ -1878,7 +1878,7 @@ Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun ...@@ -1878,7 +1878,7 @@ Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun
1:00 Belgium CE%sT 1977 1:00 Belgium CE%sT 1977
1:00 EU CE%sT 1:00 EU CE%sT
# Macedonia # North Macedonia
# See Europe/Belgrade. # See Europe/Belgrade.
# Malta # Malta
...@@ -3382,7 +3382,7 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884 ...@@ -3382,7 +3382,7 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884
Link Europe/Belgrade Europe/Ljubljana # Slovenia Link Europe/Belgrade Europe/Ljubljana # Slovenia
Link Europe/Belgrade Europe/Podgorica # Montenegro Link Europe/Belgrade Europe/Podgorica # Montenegro
Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina
Link Europe/Belgrade Europe/Skopje # Macedonia Link Europe/Belgrade Europe/Skopje # North Macedonia
Link Europe/Belgrade Europe/Zagreb # Croatia Link Europe/Belgrade Europe/Zagreb # Croatia
# Slovakia # Slovakia
......
make/data/tzdata/iso3166.tab
浏览文件 @ c20b107c
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
# All text uses UTF-8 encoding. The columns of the table are as follows: # 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 # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1 # ISO 3166-1 N976 (2018-11-06). See: Updates on ISO 3166-1
# http://isotc.iso.org/livelink/livelink/Open/16944257 # https://isotc.iso.org/livelink/livelink/Open/16944257
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
...@@ -189,7 +189,7 @@ ME Montenegro ...@@ -189,7 +189,7 @@ ME Montenegro
MF St Martin (French) MF St Martin (French)
MG Madagascar MG Madagascar
MH Marshall Islands MH Marshall Islands
MK Macedonia MK North Macedonia
ML Mali ML Mali
MM Myanmar (Burma) MM Myanmar (Burma)
MN Mongolia MN Mongolia
...@@ -258,7 +258,7 @@ ST Sao Tome & Principe ...@@ -258,7 +258,7 @@ ST Sao Tome & Principe
SV El Salvador SV El Salvador
SX St Maarten (Dutch) SX St Maarten (Dutch)
SY Syria SY Syria
SZ Swaziland SZ Eswatini (Swaziland)
TC Turks & Caicos Is TC Turks & Caicos Is
TD Chad TD Chad
TF French Southern & Antarctic Lands TF French Southern & Antarctic Lands
......
make/data/tzdata/leapseconds
浏览文件 @ c20b107c
...@@ -42,9 +42,12 @@ ...@@ -42,9 +42,12 @@
# See: Levine J. Coordinated Universal Time and the leap second. # See: Levine J. Coordinated Universal Time and the leap second.
# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995 # URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
# <https://ieeexplore.ieee.org/document/7909995>. # <https://ieeexplore.ieee.org/document/7909995>.
# There were no leap seconds before 1972, because the official mechanism # There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation # accounting for the discrepancy between atomic time and the earth's rotation
# did not exist. # did not exist. The first ("1 Jan 1972") data line in leap-seconds.list
# does not denote a leap second; it denotes the start of the current definition
# of UTC.
# The correction (+ or -) is made at the given time, so lines # The correction (+ or -) is made at the given time, so lines
# will typically look like: # will typically look like:
...@@ -83,7 +86,7 @@ Leap 2016 Dec 31 23:59:60 + S ...@@ -83,7 +86,7 @@ Leap 2016 Dec 31 23:59:60 + S
# POSIX timestamps for the data in this file: # POSIX timestamps for the data in this file:
#updated 1467936000 #updated 1467936000
#expires 1561680000 #expires 1577491200
# Updated through IERS Bulletin C56 # Updated through IERS Bulletin C57
# File expires on: 28 June 2019 # File expires on: 28 December 2019
make/data/tzdata/northamerica
浏览文件 @ c20b107c
...@@ -622,6 +622,26 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02 ...@@ -622,6 +622,26 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
# between AKST and AKDT from now on.... # between AKST and AKDT from now on....
# https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/ # https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# From Ryan Stanley (2018-11-06):
# The Metlakatla community in Alaska has decided not to change its
# clock back an hour starting on November 4th, 2018 (day before yesterday).
# They will be gmtoff=-28800 year-round.
# https://www.facebook.com/141055983004923/photos/pb.141055983004923.-2207520000.1541465673./569081370202380/
# From Paul Eggert (2018-12-16):
# In a 2018-12-11 special election, Metlakatla voted to go back to
# Alaska time (including daylight saving time) starting next year.
# https://www.krbd.org/2018/12/12/metlakatla-to-follow-alaska-standard-time-allow-liquor-sales/
#
# From Ryan Stanley (2019-01-11):
# The community will be changing back on the 20th of this month...
# From Tim Parenti (2019-01-11):
# Per an announcement on the Metlakatla community's official Facebook page, the
# "fall back" will be on Sunday 2019-01-20 at 02:00:
# https://www.facebook.com/141055983004923/photos/607150969728753/
# So they won't be waiting for Alaska to join them on 2019-03-10, but will
# rather change their clocks twice in seven weeks.
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32 Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
-8:57:41 - LMT 1900 Aug 20 12:00 -8:57:41 - LMT 1900 Aug 20 12:00
...@@ -648,6 +668,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55 ...@@ -648,6 +668,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55
-8:00 - PST 1969 -8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00 -8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST 2015 Nov 1 2:00 -8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT 2018 Nov 4 2:00
-8:00 - PST 2019 Jan 20 2:00
-9:00 US AK%sT -9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18 Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18
-9:18:55 - LMT 1900 Aug 20 12:00 -9:18:55 - LMT 1900 Aug 20 12:00
...@@ -808,6 +830,22 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 ...@@ -808,6 +830,22 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
# For a map of Indiana's time zone regions, see: # For a map of Indiana's time zone regions, see:
# https://en.wikipedia.org/wiki/Time_in_Indiana # https://en.wikipedia.org/wiki/Time_in_Indiana
# #
# From Paul Eggert (2018-11-30):
# A brief but entertaining history of time in Indiana describes a 1949 debate
# in the Indiana House where city legislators (who favored "fast time")
# tussled with farm legislators (who didn't) over a bill to outlaw DST:
# "Lacking enough votes, the city faction tries to filibuster until time runs
# out on the session at midnight, but rural champion Rep. Herbert Copeland,
# R-Madison, leans over the gallery railing and forces the official clock
# back to 9 p.m., breaking it in the process. The clock sticks on 9 as the
# debate rages on into the night. The filibuster finally dies out and the
# bill passes, while outside the chamber, clocks read 3:30 a.m. In the end,
# it doesn't matter which side won. The law has no enforcement powers and
# is simply ignored by fast-time communities."
# How Indiana went from 'God's time' to split zones and daylight-saving.
# Indianapolis Star. 2018-11-27 14:58 -05.
# https://www.indystar.com/story/news/politics/2018/11/27/indianapolis-indiana-time-zone-history-central-eastern-daylight-savings-time/2126300002/
#
# From Paul Eggert (2007-08-17): # From Paul Eggert (2007-08-17):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis, # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
# with the following exceptions: # with the following exceptions:
......
make/data/tzdata/zone.tab
浏览文件 @ c20b107c
...@@ -262,6 +262,7 @@ KW +2920+04759 Asia/Kuwait ...@@ -262,6 +262,7 @@ KW +2920+04759 Asia/Kuwait
KY +1918-08123 America/Cayman KY +1918-08123 America/Cayman
KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4315+07657 Asia/Almaty Kazakhstan (most areas)
KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay
KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe
KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau
KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev
...@@ -355,9 +356,9 @@ RS +4450+02030 Europe/Belgrade ...@@ -355,9 +356,9 @@ RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
RU +4457+03406 Europe/Simferopol MSK+00 - Crimea RU +4457+03406 Europe/Simferopol MSK+00 - Crimea
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +5836+04939 Europe/Kirov MSK+00 - Kirov RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan 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 +5134+04602 Europe/Saratov MSK+01 - Saratov
RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk
RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
......
src/share/classes/sun/util/calendar/ZoneInfoFile.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -573,8 +573,12 @@ public final class ZoneInfoFile { ...@@ -573,8 +573,12 @@ public final class ZoneInfoFile {
// we can then pass in the dom = -1, dow > 0 into ZoneInfo // we can then pass in the dom = -1, dow > 0 into ZoneInfo
// //
// hacking, assume the >=24 is the result of ZRB optimization for // hacking, assume the >=24 is the result of ZRB optimization for
// "last", it works for now. // "last", it works for now. From tzdata2019a this hacking
if (dom < 0 || dom >= 24) { // will not work for Asia/Gaza and Asia/Hebron which follow
// Palestine DST rules.
if (dom < 0 || dom >= 24 &&
!(zoneId.equals("Asia/Gaza") ||
zoneId.equals("Asia/Hebron"))) {
params[1] = -1; params[1] = -1;
params[2] = toCalendarDOW[dow]; params[2] = toCalendarDOW[dow];
} else { } else {
......
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -370,7 +370,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -370,7 +370,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
...@@ -683,6 +683,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -683,6 +683,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Pontianak", WIT}, {"Asia/Pontianak", WIT},
{"Asia/Pyongyang", KST}, {"Asia/Pyongyang", KST},
{"Asia/Qatar", ARAST}, {"Asia/Qatar", ARAST},
{"Asia/Qostanay", new String[] {"Kostanay Standard Time", "QOST",
"Kostanay Summer Time", "QOSST",
"Kostanay Time", "QOST"}},
{"Asia/Qyzylorda", new String[] {"Qyzylorda Time", "QYZT", {"Asia/Qyzylorda", new String[] {"Qyzylorda Time", "QYZT",
"Qyzylorda Summer Time", "QYZST", "Qyzylorda Summer Time", "QYZST",
"Qyzylorda Time", "QYZT"}}, "Qyzylorda Time", "QYZT"}},
......
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -371,7 +371,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { ...@@ -371,7 +371,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{"Africa/Nouakchott", GMT}, {"Africa/Nouakchott", GMT},
{"Africa/Ouagadougou", GMT}, {"Africa/Ouagadougou", GMT},
{"Africa/Porto-Novo", WAT}, {"Africa/Porto-Novo", WAT},
{"Africa/Sao_Tome", WAT}, {"Africa/Sao_Tome", GMT},
{"Africa/Timbuktu", GMT}, {"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET}, {"Africa/Tripoli", EET},
{"Africa/Tunis", CET}, {"Africa/Tunis", CET},
......
test/sun/util/calendar/zi/TestZoneInfo310.java
浏览文件 @ c20b107c
/* /*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8007572 8008161 8157792 * @bug 8007572 8008161 8157792 8224560
* @summary Test whether the TimeZone generated from JSR310 tzdb is the same * @summary Test whether the TimeZone generated from JSR310 tzdb is the same
* as the one from the tz data from javazic * as the one from the tz data from javazic
* @build BackEnd Checksum DayOfWeek Gen GenDoc Main Mappings Month * @build BackEnd Checksum DayOfWeek Gen GenDoc Main Mappings Month
...@@ -169,6 +169,15 @@ public class TestZoneInfo310 { ...@@ -169,6 +169,15 @@ public class TestZoneInfo310 {
for (String zid : zids_new) { for (String zid : zids_new) {
ZoneInfoOld zi = toZoneInfoOld(TimeZone.getTimeZone(zid)); ZoneInfoOld zi = toZoneInfoOld(TimeZone.getTimeZone(zid));
ZoneInfoOld ziOLD = (ZoneInfoOld)ZoneInfoOld.getTimeZone(zid); ZoneInfoOld ziOLD = (ZoneInfoOld)ZoneInfoOld.getTimeZone(zid);
/*
* Temporary ignoring the failing TimeZones which are having zone
* rules defined till year 2037 and/or above and have negative DST
* save time in IANA tzdata. This bug is tracked via JDK-8223388.
*/
if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun")
|| zid.equals("Asia/Tehran") || zid.equals("Iran")) {
continue;
}
if (! zi.equalsTo(ziOLD)) { if (! zi.equalsTo(ziOLD)) {
System.out.println(zi.diffsTo(ziOLD)); System.out.println(zi.diffsTo(ziOLD));
throw new RuntimeException(" FAILED: " + zid); throw new RuntimeException(" FAILED: " + zid);
......
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @ c20b107c
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any # or visit www.oracle.com if you need additional information or have any
# questions. # questions.
# #
tzdata2018g tzdata2019a
test/sun/util/calendar/zi/tzdata/africa
浏览文件 @ c20b107c
...@@ -387,6 +387,11 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct ...@@ -387,6 +387,11 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
# See Africa/Lagos. # See Africa/Lagos.
# Eritrea # Eritrea
# See Africa/Nairobi.
# Eswatini (formerly Swaziland)
# See Africa/Johannesburg.
# Ethiopia # Ethiopia
# See Africa/Nairobi. # See Africa/Nairobi.
# #
...@@ -870,8 +875,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis ...@@ -870,8 +875,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# From Mohamed Essedik Najd (2018-10-26): # From Mohamed Essedik Najd (2018-10-26):
# Today, a Moroccan government council approved the perpetual addition # Today, a Moroccan government council approved the perpetual addition
# of 60 minutes to the regular Moroccan timezone. # of 60 minutes to the regular Moroccan timezone.
# From Brian Inglis (2018-10-26): # From Matt Johnson (2018-10-28):
# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le # http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf
#
# From Maamar Abdelkader (2018-11-01):
# We usually move clocks back the previous week end and come back to the +1
# the week end after.... The government does not announce yet the decision
# about this temporary change. But it s 99% sure that it will be the case,
# as in previous years. An unofficial survey was done these days, showing
# that 64% of asked peopke are ok for moving from +1 to +0 during Ramadan.
# https://leconomiste.com/article/1035870-enquete-l-economiste-sunergia-64-des-marocains-plebiscitent-le-gmt-pendant-ramadan
#
# From Paul Eggert (2018-11-01):
# For now, guess that Morocco will fall back at 03:00 the last Sunday
# before Ramadan, and spring forward at 02:00 the first Sunday after
# Ramadan, as this has been the practice since 2012. To implement this,
# transition dates for 2019 through 2037 were determined by running the
# following program under GNU Emacs 26.1.
# (let ((islamic-year 1440))
# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
# (sunday 0))
# (while (/= sunday (mod (setq a (1- a)) 7)))
# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
# (insert
# (format
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t-1:00\t-\n"
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t0\t-\n")
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 - Rule Morocco 1939 only - Sep 12 0:00 1:00 -
...@@ -903,7 +941,7 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 - ...@@ -903,7 +941,7 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 -
Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00 - Rule Morocco 2013 only - Aug 10 2:00 1:00 -
Rule Morocco 2013 2018 - Oct lastSun 3:00 0 - Rule Morocco 2013 2017 - Oct lastSun 3:00 0 -
Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 - Rule Morocco 2014 2018 - Mar lastSun 2:00 1:00 -
Rule Morocco 2014 only - Jun 28 3:00 0 - Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00 - Rule Morocco 2014 only - Aug 2 2:00 1:00 -
...@@ -915,13 +953,53 @@ Rule Morocco 2017 only - May 21 3:00 0 - ...@@ -915,13 +953,53 @@ Rule Morocco 2017 only - May 21 3:00 0 -
Rule Morocco 2017 only - Jul 2 2:00 1:00 - Rule Morocco 2017 only - Jul 2 2:00 1:00 -
Rule Morocco 2018 only - May 13 3:00 0 - Rule Morocco 2018 only - May 13 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 - Rule Morocco 2018 only - Jun 17 2:00 1:00 -
Rule Morocco 2019 only - May 5 3:00 0 -
Rule Morocco 2019 only - Jun 9 2:00 1:00 -
Rule Morocco 2020 only - Apr 19 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 -
Rule Morocco 2021 only - Apr 11 3:00 0 -
Rule Morocco 2021 only - May 16 2:00 1:00 -
Rule Morocco 2022 only - Mar 27 3:00 0 -
Rule Morocco 2022 only - May 8 2:00 1:00 -
Rule Morocco 2023 only - Mar 19 3:00 0 -
Rule Morocco 2023 only - Apr 23 2:00 1:00 -
Rule Morocco 2024 only - Mar 10 3:00 0 -
Rule Morocco 2024 only - Apr 14 2:00 1:00 -
Rule Morocco 2025 only - Feb 23 3:00 0 -
Rule Morocco 2025 only - Apr 6 2:00 1:00 -
Rule Morocco 2026 only - Feb 15 3:00 0 -
Rule Morocco 2026 only - Mar 22 2:00 1:00 -
Rule Morocco 2027 only - Feb 7 3:00 0 -
Rule Morocco 2027 only - Mar 14 2:00 1:00 -
Rule Morocco 2028 only - Jan 23 3:00 0 -
Rule Morocco 2028 only - Feb 27 2:00 1:00 -
Rule Morocco 2029 only - Jan 14 3:00 0 -
Rule Morocco 2029 only - Feb 18 2:00 1:00 -
Rule Morocco 2029 only - Dec 30 3:00 0 -
Rule Morocco 2030 only - Feb 10 2:00 1:00 -
Rule Morocco 2030 only - Dec 22 3:00 0 -
Rule Morocco 2031 only - Jan 26 2:00 1:00 -
Rule Morocco 2031 only - Dec 14 3:00 0 -
Rule Morocco 2032 only - Jan 18 2:00 1:00 -
Rule Morocco 2032 only - Nov 28 3:00 0 -
Rule Morocco 2033 only - Jan 9 2:00 1:00 -
Rule Morocco 2033 only - Nov 20 3:00 0 -
Rule Morocco 2033 only - Dec 25 2:00 1:00 -
Rule Morocco 2034 only - Nov 5 3:00 0 -
Rule Morocco 2034 only - Dec 17 2:00 1:00 -
Rule Morocco 2035 only - Oct 28 3:00 0 -
Rule Morocco 2035 only - Dec 2 2:00 1:00 -
Rule Morocco 2036 only - Oct 19 3:00 0 -
Rule Morocco 2036 only - Nov 23 2:00 1:00 -
Rule Morocco 2037 only - Oct 4 3:00 0 -
Rule Morocco 2037 only - Nov 15 2:00 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco +00/+01 1984 Mar 16 0:00 Morocco +00/+01 1984 Mar 16
1:00 - +01 1986 1:00 - +01 1986
0:00 Morocco +00/+01 2018 Oct 27 0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 - +01 0:00 Morocco +00/+01
# Western Sahara # Western Sahara
# #
...@@ -936,8 +1014,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 ...@@ -936,8 +1014,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
-1:00 - -01 1976 Apr 14 -1:00 - -01 1976 Apr 14
0:00 Morocco +00/+01 2018 Oct 27 0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 - +01 0:00 Morocco +00/+01
# Mozambique # Mozambique
# #
...@@ -1094,10 +1172,20 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis ...@@ -1094,10 +1172,20 @@ Zone Indian/Reunion 3:41:52 - LMT 1911 Jun # Saint-Denis
# the switch is from 01:00 to 02:00 ... [Decree No. 25/2017] # the switch is from 01:00 to 02:00 ... [Decree No. 25/2017]
# http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017 # http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
# From Vadim Nasardinov (2018-12-29):
# São Tomé and Príncipe is about to do the following on Jan 1, 2019:
# https://www.stp-press.st/2018/12/05/governo-jesus-ja-decidiu-repor-hora-legal-sao-tomense/
#
# From Michael Deckers (2018-12-30):
# https://www.legis-palop.org/download.jsp?idFile=102818
# ... [The legal time of the country, which coincides with universal
# coordinated time, will be restituted at 2 o'clock on day 1 of January, 2019.]
Zone Africa/Sao_Tome 0:26:56 - LMT 1884 Zone Africa/Sao_Tome 0:26:56 - LMT 1884
-0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT -0:36:45 - LMT 1912 Jan 1 00:00u # Lisbon MT
0:00 - GMT 2018 Jan 1 01:00 0:00 - GMT 2018 Jan 1 01:00
1:00 - WAT 1:00 - WAT 2019 Jan 1 02:00
0:00 - GMT
# Senegal # Senegal
# See Africa/Abidjan. # See Africa/Abidjan.
...@@ -1128,7 +1216,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 ...@@ -1128,7 +1216,7 @@ Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar 1:30 - SAST 1903 Mar
2:00 SA SAST 2:00 SA SAST
Link Africa/Johannesburg Africa/Maseru # Lesotho Link Africa/Johannesburg Africa/Maseru # Lesotho
Link Africa/Johannesburg Africa/Mbabane # Swaziland Link Africa/Johannesburg Africa/Mbabane # Eswatini
# #
# Marion and Prince Edward Is # Marion and Prince Edward Is
# scientific station since 1947 # scientific station since 1947
...@@ -1170,9 +1258,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931 ...@@ -1170,9 +1258,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00 2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT 3:00 - EAT
# Swaziland
# See Africa/Johannesburg.
# Tanzania # Tanzania
# See Africa/Nairobi. # See Africa/Nairobi.
......
test/sun/util/calendar/zi/tzdata/australasia
浏览文件 @ c20b107c
...@@ -425,10 +425,44 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete ...@@ -425,10 +425,44 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
# it is uninhabited. # it is uninhabited.
# Guam # Guam
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-59-7-Guam-Daylight-Savings-Time-May-6-1959.pdf
Rule Guam 1959 only - Jun 27 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-61-5-Revocation-of-Daylight-Saving-Time-and-Restoratio.pdf
Rule Guam 1961 only - Jan 29 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-67-13-Guam-Daylight-Savings-Time.pdf
Rule Guam 1967 only - Sep 1 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-69-2-Repeal-of-Guam-Daylight-Saving-Time.pdf
Rule Guam 1969 only - Jan 26 0:01 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-69-10-Guam-Daylight-Saving-Time.pdf
Rule Guam 1969 only - Jun 22 2:00 1:00 D
Rule Guam 1969 only - Aug 31 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-70-10-Guam-Daylight-Saving-Time.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-70-30-End-of-Guam-Daylight-Saving-Time.pdf
# http://documents.guam.gov/wp-content/uploads/E.O.-71-5-Guam-Daylight-Savings-Time.pdf
Rule Guam 1970 1971 - Apr lastSun 2:00 1:00 D
Rule Guam 1970 1971 - Sep Sun>=1 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-73-28.-Guam-Day-light-Saving-Time.pdf
Rule Guam 1973 only - Dec 16 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-74-7-Guam-Daylight-Savings-Time-Rescinded.pdf
Rule Guam 1974 only - Feb 24 2:00 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-76-13-Daylight-Savings-Time.pdf
Rule Guam 1976 only - May 26 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-76-25-Revocation-of-E.O.-76-13.pdf
Rule Guam 1976 only - Aug 22 2:01 0 S
# http://documents.guam.gov/wp-content/uploads/E.O.-77-4-Daylight-Savings-Time.pdf
Rule Guam 1977 only - Apr 24 2:00 1:00 D
# http://documents.guam.gov/wp-content/uploads/E.O.-77-18-Guam-Standard-Time.pdf
Rule Guam 1977 only - Aug 28 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
9:39:00 - LMT 1901 # Agana 9:39:00 - LMT 1901 # Agana
10:00 - GST 2000 Dec 23 # Guam 10:00 - GST 1941 Dec 10 # Guam
9:00 - +09 1944 Jul 31
10:00 Guam G%sT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time 10:00 - ChST # Chamorro Standard Time
Link Pacific/Guam Pacific/Saipan # N Mariana Is Link Pacific/Guam Pacific/Saipan # N Mariana Is
...@@ -450,31 +484,56 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 ...@@ -450,31 +484,56 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
# Marshall Is # Marshall Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Majuro 11:24:48 - LMT 1901 Zone Pacific/Majuro 11:24:48 - LMT 1901
11:00 - +11 1969 Oct 11:00 - +11 1914 Oct
12:00 - +12 9:00 - +09 1919 Feb 1
Zone Pacific/Kwajalein 11:09:20 - LMT 1901 11:00 - +11 1937
11:00 - +11 1969 Oct 10:00 - +10 1941 Apr 1
-12:00 - -12 1993 Aug 20 9:00 - +09 1944 Jan 30
12:00 - +12 11:00 - +11 1969 Oct
12:00 - +12
Zone Pacific/Kwajalein 11:09:20 - LMT 1901
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1944 Feb 6
11:00 - +11 1969 Oct
-12:00 - -12 1993 Aug 20 24:00
12:00 - +12
# Micronesia # Micronesia
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Chuuk 10:07:08 - LMT 1901 Zone Pacific/Chuuk -13:52:52 - LMT 1844 Dec 31
10:00 - +10 10:07:08 - LMT 1901
Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia 10:00 - +10 1914 Oct
11:00 - +11 9:00 - +09 1919 Feb 1
Zone Pacific/Kosrae 10:51:56 - LMT 1901 10:00 - +10 1941 Apr 1
11:00 - +11 1969 Oct 9:00 - +09 1945 Aug
12:00 - +12 1999 10:00 - +10
11:00 - +11 Zone Pacific/Pohnpei -13:27:08 - LMT 1844 Dec 31 # Kolonia
10:32:52 - LMT 1901
11:00 - +11 1914 Oct
9:00 - +09 1919 Feb 1
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1945 Aug
11:00 - +11
Zone Pacific/Kosrae -13:08:04 - LMT 1844 Dec 31
10:51:56 - LMT 1901
11:00 - +11 1914 Oct
9:00 - +09 1919 Feb 1
11:00 - +11 1937
10:00 - +10 1941 Apr 1
9:00 - +09 1945 Aug
11:00 - +11 1969 Oct
12:00 - +12 1999
11:00 - +11
# Nauru # Nauru
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe Zone Pacific/Nauru 11:07:40 - LMT 1921 Jan 15 # Uaobe
11:30 - +1130 1942 Mar 15 11:30 - +1130 1942 Aug 29
9:00 - +09 1944 Aug 15 9:00 - +09 1945 Sep 8
11:30 - +1130 1979 May 11:30 - +1130 1979 Feb 10 2:00
12:00 - +12 12:00 - +12
# New Caledonia # New Caledonia
...@@ -575,8 +634,9 @@ Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston ...@@ -575,8 +634,9 @@ Zone Pacific/Norfolk 11:11:52 - LMT 1901 # Kingston
# Palau (Belau) # Palau (Belau)
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Palau 8:57:56 - LMT 1901 # Koror Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror
9:00 - +09 8:57:56 - LMT 1901
9:00 - +09
# Papua New Guinea # Papua New Guinea
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -838,7 +898,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -838,7 +898,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# tz@iana.org for general use in the future). For more, please see # tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution. # the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (2017-02-10): # From Paul Eggert (2018-11-18):
# #
# Unless otherwise specified, the source for data through 1990 is: # Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...@@ -863,6 +923,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -863,6 +923,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# A reliable and entertaining source about time zones is # A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
# #
# I invented the abbreviation marked "*".
# The following abbreviations are from other sources. # The following abbreviations are from other sources.
# Corrections are welcome! # Corrections are welcome!
# std dst # std dst
...@@ -870,7 +931,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -870,7 +931,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# 8:00 AWST AWDT Western Australia # 8:00 AWST AWDT Western Australia
# 9:30 ACST ACDT Central Australia # 9:30 ACST ACDT Central Australia
# 10:00 AEST AEDT Eastern Australia # 10:00 AEST AEDT Eastern Australia
# 10:00 GST Guam through 2000 # 10:00 GST GDT* Guam through 2000
# 10:00 ChST Chamorro # 10:00 ChST Chamorro
# 11:30 NZMT NZST New Zealand through 1945 # 11:30 NZMT NZST New Zealand through 1945
# 12:00 NZST NZDT New Zealand 1946-present # 12:00 NZST NZDT New Zealand 1946-present
...@@ -1569,28 +1630,70 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1569,28 +1630,70 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# Kwajalein # Kwajalein
# In comp.risks 14.87 (26 August 1993), Peter Neumann writes: # From an AP article (1993-08-22):
# I wonder what happened in Kwajalein, where there was NO Friday, # "The nearly 3,000 Americans living on this remote Pacific atoll have a good
# 1993-08-20. Thursday night at midnight Kwajalein switched sides with # excuse for not remembering Saturday night: there wasn't one. Residents were
# respect to the International Date Line, to rejoin its fellow islands, # going to bed Friday night and waking up Sunday morning because at midnight
# going from 11:59 p.m. Thursday to 12:00 m. Saturday in a blink. # -- 8 A.M. Eastern daylight time on Saturday -- Kwajalein was jumping from
# one side of the international date line to the other."
# "In Marshall Islands, Friday is followed by Sunday", NY Times. 1993-08-22.
# https://www.nytimes.com/1993/08/22/world/in-marshall-islands-friday-is-followed-by-sunday.html
# From Phake Nick (2018-10-27):
# <https://wiki.suikawiki.org/n/南洋群島の標準時> ... pointed out that
# currently tzdata say Pacific/Kwajalein switched from GMT+11 to GMT-12 in
# 1969 October without explanation, however an 1993 article from NYT say it
# synchorized its day with US mainland about 40 years ago and thus the switch
# should occur at around 1950s instead.
#
# From Paul Eggert (2018-11-18):
# The NYT (actually, AP) article is vague and possibly wrong about this.
# The article says the earlier switch was "40 years ago when the United States
# Army established a missile test range here". However, the Kwajalein Test
# Center was established on 1960-10-01 and was run by the US Navy. It was
# transferred to the US Army on 1964-07-01. See "Seize the High Ground"
# <https://history.army.mil/html/books/070/70-88-1/cmhPub_70-88-1.pdf>.
# Given that Shanks was right on the money about the 1993 change, I'm inclined
# to take Shanks's word for the 1969 change unless we find better evidence.
# N Mariana Is, Guam # N Mariana Is, Guam
# From Phake Nick (2018-10-27):
# Guam Island was briefly annexed by Japan during ... year 1941-1944 ...
# however there are no detailed information about what time it use during that
# period. It would probably be reasonable to assume Guam use GMT+9 during
# that period of time like the surrounding area.
# From Paul Eggert (2018-11-18):
# Howse writes (p 153) "The Spaniards, on the other hand, reached the # Howse writes (p 153) "The Spaniards, on the other hand, reached the
# Philippines and the Ladrones from America," and implies that the Ladrones # Philippines and the Ladrones from America," and implies that the Ladrones
# (now called the Marianas) kept American date for quite some time. # (now called the Marianas) kept American date for quite some time.
# For now, we assume the Ladrones switched at the same time as the Philippines; # For now, we assume the Ladrones switched at the same time as the Philippines;
# see Asia/Manila. # see Asia/Manila.
#
# Use 1941-12-10 and 1944-07-31 for Guam WWII transitions, as the rough start
# and end of Japanese control of Agana. We don't know whether the Northern
# Marianas followed Guam's DST rules from 1959 through 1977; for now, assume
# they did as that avoids the need for a separate zone due to our 1970 cutoff.
#
# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
# under the name "Chamorro Standard Time". There is no official abbreviation, # under the name "Chamorro Standard Time". There is no official abbreviation,
# but Congressman Robert A. Underwood, author of the bill that became law, # but Congressman Robert A. Underwood, author of the bill that became law,
# wrote in a press release (2000-12-27) that he will seek the use of "ChST". # wrote in a press release (2000-12-27) that he will seek the use of "ChST".
# See also the commentary for Micronesia.
# Micronesia
# Marshall Is
# See the commentary for Micronesia.
# Micronesia (and nearby)
# From Paul Eggert (2018-11-18):
# Like the Ladrones (see Guam commentary), assume the Spanish East Indies
# kept American time until the Philippines switched at the end of 1844.
# Alan Eugene Davis writes (1996-03-16), # Alan Eugene Davis writes (1996-03-16),
# "I am certain, having lived there for the past decade, that 'Truk' # "I am certain, having lived there for the past decade, that 'Truk'
...@@ -1606,6 +1709,95 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1606,6 +1709,95 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# that Truk and Yap are UT +10, and Ponape and Kosrae are +11. # that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
# We don't know when Kosrae switched from +12; assume January 1 for now. # We don't know when Kosrae switched from +12; assume January 1 for now.
# From Phake Nick (2018-10-27):
#
# From a Japanese wiki site https://wiki.suikawiki.org/n/南洋群島の標準時
# ...
# For "Southern Islands" (modern region of Mariana + Palau + Federation of
# Micronesia + Marshall Islands):
#
# A 1906 Japanese magazine shown the Caroline Islands and Mariana Islands
# who was occupied by Germany at the time as GMT+10, together with the like
# of German New Guinea. However there is a marking saying it have not been
# implemented (yet). No further information after that were found.
#
# Japan invaded those islands in 1914, and records shows that they were
# instructed to use JST at the time.
#
# 1915 January telecommunication record on the Jaluit Atoll shows they use
# the meridian of 170E as standard time (GMT+11:20), which is similar to the
# longitude of the atoll.
# 1915 February record say the 170E standard time is to be used until
# February 9 noon, and after February 9 noon they are to use JST.
# However these are time used within the Japanese Military at the time and
# probably does not reflect the time used by local resident at the time (that
# is if they keep their own time back then)
#
# In January 1919 the occupying force issued a command that split the area
# into three different timezone with meridian of 135E, 150E, 165E (JST+0, +1,
# +2), and the command was to become effective from February 1 of the same
# year. Despite the target of the command is still only for the occupying
# force itself, further publication have described the time as the standard
# time for the occupied area and thus it can probably be seen as such.
# * Area that use meridian of 135E: Palau and Yap civil administration area
# (Southern Islands Western Standard Time)
# * Area that use meridian of 150E: Truk (Chuuk) and Saipan civil
# administration area (Southern Islands Central Standard Time)
# * Area that use meridian of 165E: Ponape (Pohnpei) and Jaluit civil
# administration area (Southern Islands Eastern Standard Time).
# * In the next few years Japanese occupation of those islands have been
# formalized via League of Nation Mandate (South Pacific Mandate) and formal
# governance structure have been established, these district [become
# subprefectures] and timezone classification have been inherited as standard
# time of the area.
# * Saipan subprefecture include Mariana islands (exclude Guam which was
# occupied by America at the time), Palau and Yap subprefecture rule the
# Western Caroline Islands with 137E longitude as border, Truk and Ponape
# subprefecture rule the Eastern Caroline Islands with 154E as border, Ponape
# subprefecture also rule part of Marshall Islands to the west of 164E
# starting from (1918?) and Jaluit subprefecture rule the rest of the
# Marshall Islands.
#
# And then in year 1937, an announcement was made to change the time in the
# area into 2 timezones:
# * Area that use meridian of 135E: area administered by Palau, Yap and
# Saipan subprefecture (Southern Islands Western Standard Time)
# * Area that use meridian of 150E: area administered by Truk (Chuuk),
# Ponape (Pohnpei) and Jaluit subprefecture (Southern Islands Eastern
# Standard Time)
#
# Another announcement issued in 1941 say that on April 1 that year,
# standard time of the Southern Islands would be changed to use the meridian
# of 135E (GMT+9), and thus abolishing timezone different within the area.
#
# Then Pacific theater of WWII started and Japan slowly lose control on the
# island. The webpage I linked above contain no information during this
# period of time....
#
# After the end of WWII, in 1946 February, a document written by the
# (former?) Japanese military personnel describe there are 3 hours time
# different between Caroline islands time/Wake island time and the Chungking
# time, which would mean the time being used there at the time was GMT+10.
#
# After that, the area become Trust Territories of the Pacific Islands
# under American administration from year 1947. The site listed some
# American/International books/maps/publications about time used in those
# area during this period of time but they doesn't seems to be reliable
# information so it would be the best if someone know where can more reliable
# information can be found.
#
#
# From Paul Eggert (2018-11-18):
#
# For the above, use vague dates like "1914" and "1945" for transitions that
# plausibly exist but for which the details are not known. The information
# for Wake is too sketchy to act on.
#
# The 1906 GMT+10 info about German-controlled islands might not have been
# done, so omit it from the data for now.
#
# The Jaluit info governs Kwajalein.
# Midway # Midway
...@@ -1623,6 +1815,29 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1623,6 +1815,29 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# started DST on June 3. Possibly DST was observed other years # started DST on June 3. Possibly DST was observed other years
# in Midway, but we have no record of it. # in Midway, but we have no record of it.
# Nauru
# From Phake Nick (2018-10-31):
# Currently, the tz database say Nauru use LMT until 1921, and then
# switched to GMT+11:30 for the next two decades.
# However, a number of timezone map published in America/Japan back then
# showed its timezone as GMT+11 per https://wiki.suikawiki.org/n/ナウルの標準時
# And it would also be nice if the 1921 transition date could be sourced.
# ...
# The "Nauru Standard Time Act 1978 Time Change"
# http://ronlaw.gov.nr/nauru_lpms/files/gazettes/4b23a17d2030150404db7a5fa5872f52.pdf#page=3
# based on "Nauru Standard Time Act 1978 Time Change"
# http://www.paclii.org/nr/legis/num_act/nsta1978207/ defined that "Nauru
# Alternative Time" (GMT+12) should be in effect from 1979 Feb.
#
# From Paul Eggert (2018-11-19):
# The 1921-01-15 introduction of standard time is in Shanks; it is also in
# "Standard Time Throughout the World", US National Bureau of Standards (1935),
# page 3, which does not give the UT offset. In response to a comment by
# Phake Nick I set the Nauru time of occupation by Japan to
# 1942-08-29/1945-09-08 by using dates from:
# https://en.wikipedia.org/wiki/Japanese_occupation_of_Nauru
# Norfolk # Norfolk
# From Alexander Krivenyshev (2015-09-23): # From Alexander Krivenyshev (2015-09-23):
...@@ -1638,6 +1853,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1638,6 +1853,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# other than in 1974/5. See: # other than in 1974/5. See:
# https://www.timeanddate.com/time/australia/norfolk-island.html # https://www.timeanddate.com/time/australia/norfolk-island.html
# Palau
# See commentary for Micronesia.
# Pitcairn # Pitcairn
# From Rives McDow (1999-11-08): # From Rives McDow (1999-11-08):
...@@ -1802,6 +2020,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 ...@@ -1802,6 +2020,9 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# From Paul Eggert (2003-03-23): # From Paul Eggert (2003-03-23):
# We have no other report of DST in Wake Island, so omit this info for now. # We have no other report of DST in Wake Island, so omit this info for now.
# See also the commentary for Micronesia.
############################################################################### ###############################################################################
# The International Date Line # The International Date Line
......
test/sun/util/calendar/zi/tzdata/backward
浏览文件 @ c20b107c
...@@ -100,6 +100,7 @@ Link Pacific/Easter Chile/EasterIsland ...@@ -100,6 +100,7 @@ Link Pacific/Easter Chile/EasterIsland
Link America/Havana Cuba Link America/Havana Cuba
Link Africa/Cairo Egypt Link Africa/Cairo Egypt
Link Europe/Dublin Eire Link Europe/Dublin Eire
Link Etc/UTC Etc/UCT
Link Europe/London Europe/Belfast Link Europe/London Europe/Belfast
Link Europe/Chisinau Europe/Tiraspol Link Europe/Chisinau Europe/Tiraspol
Link Europe/London GB Link Europe/London GB
...@@ -134,7 +135,7 @@ Link Asia/Taipei ROC ...@@ -134,7 +135,7 @@ Link Asia/Taipei ROC
Link Asia/Seoul ROK Link Asia/Seoul ROK
Link Asia/Singapore Singapore Link Asia/Singapore Singapore
Link Europe/Istanbul Turkey Link Europe/Istanbul Turkey
Link Etc/UCT UCT Link Etc/UTC UCT
Link America/Anchorage US/Alaska Link America/Anchorage US/Alaska
Link America/Adak US/Aleutian Link America/Adak US/Aleutian
Link America/Phoenix US/Arizona Link America/Phoenix US/Arizona
......
test/sun/util/calendar/zi/tzdata/etcetera
浏览文件 @ c20b107c
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
Zone Etc/GMT 0 - GMT Zone Etc/GMT 0 - GMT
Zone Etc/UTC 0 - UTC Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file 'backward', # but it belongs here, not in the file 'backward',
......
test/sun/util/calendar/zi/tzdata/europe
浏览文件 @ c20b107c
...@@ -1878,7 +1878,7 @@ Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun ...@@ -1878,7 +1878,7 @@ Zone Europe/Luxembourg 0:24:36 - LMT 1904 Jun
1:00 Belgium CE%sT 1977 1:00 Belgium CE%sT 1977
1:00 EU CE%sT 1:00 EU CE%sT
# Macedonia # North Macedonia
# See Europe/Belgrade. # See Europe/Belgrade.
# Malta # Malta
...@@ -3382,7 +3382,7 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884 ...@@ -3382,7 +3382,7 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884
Link Europe/Belgrade Europe/Ljubljana # Slovenia Link Europe/Belgrade Europe/Ljubljana # Slovenia
Link Europe/Belgrade Europe/Podgorica # Montenegro Link Europe/Belgrade Europe/Podgorica # Montenegro
Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina
Link Europe/Belgrade Europe/Skopje # Macedonia Link Europe/Belgrade Europe/Skopje # North Macedonia
Link Europe/Belgrade Europe/Zagreb # Croatia Link Europe/Belgrade Europe/Zagreb # Croatia
# Slovakia # Slovakia
......
test/sun/util/calendar/zi/tzdata/iso3166.tab
浏览文件 @ c20b107c
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
# All text uses UTF-8 encoding. The columns of the table are as follows: # 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 # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1 # ISO 3166-1 N976 (2018-11-06). See: Updates on ISO 3166-1
# http://isotc.iso.org/livelink/livelink/Open/16944257 # https://isotc.iso.org/livelink/livelink/Open/16944257
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
...@@ -189,7 +189,7 @@ ME Montenegro ...@@ -189,7 +189,7 @@ ME Montenegro
MF St Martin (French) MF St Martin (French)
MG Madagascar MG Madagascar
MH Marshall Islands MH Marshall Islands
MK Macedonia MK North Macedonia
ML Mali ML Mali
MM Myanmar (Burma) MM Myanmar (Burma)
MN Mongolia MN Mongolia
...@@ -258,7 +258,7 @@ ST Sao Tome & Principe ...@@ -258,7 +258,7 @@ ST Sao Tome & Principe
SV El Salvador SV El Salvador
SX St Maarten (Dutch) SX St Maarten (Dutch)
SY Syria SY Syria
SZ Swaziland SZ Eswatini (Swaziland)
TC Turks & Caicos Is TC Turks & Caicos Is
TD Chad TD Chad
TF French Southern & Antarctic Lands TF French Southern & Antarctic Lands
......
test/sun/util/calendar/zi/tzdata/leapseconds
浏览文件 @ c20b107c
...@@ -42,9 +42,12 @@ ...@@ -42,9 +42,12 @@
# See: Levine J. Coordinated Universal Time and the leap second. # See: Levine J. Coordinated Universal Time and the leap second.
# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995 # URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
# <https://ieeexplore.ieee.org/document/7909995>. # <https://ieeexplore.ieee.org/document/7909995>.
# There were no leap seconds before 1972, because the official mechanism # There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation # accounting for the discrepancy between atomic time and the earth's rotation
# did not exist. # did not exist. The first ("1 Jan 1972") data line in leap-seconds.list
# does not denote a leap second; it denotes the start of the current definition
# of UTC.
# The correction (+ or -) is made at the given time, so lines # The correction (+ or -) is made at the given time, so lines
# will typically look like: # will typically look like:
...@@ -83,7 +86,7 @@ Leap 2016 Dec 31 23:59:60 + S ...@@ -83,7 +86,7 @@ Leap 2016 Dec 31 23:59:60 + S
# POSIX timestamps for the data in this file: # POSIX timestamps for the data in this file:
#updated 1467936000 #updated 1467936000
#expires 1561680000 #expires 1577491200
# Updated through IERS Bulletin C56 # Updated through IERS Bulletin C57
# File expires on: 28 June 2019 # File expires on: 28 December 2019
test/sun/util/calendar/zi/tzdata/northamerica
浏览文件 @ c20b107c
...@@ -622,6 +622,26 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02 ...@@ -622,6 +622,26 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
# between AKST and AKDT from now on.... # between AKST and AKDT from now on....
# https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/ # https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# From Ryan Stanley (2018-11-06):
# The Metlakatla community in Alaska has decided not to change its
# clock back an hour starting on November 4th, 2018 (day before yesterday).
# They will be gmtoff=-28800 year-round.
# https://www.facebook.com/141055983004923/photos/pb.141055983004923.-2207520000.1541465673./569081370202380/
# From Paul Eggert (2018-12-16):
# In a 2018-12-11 special election, Metlakatla voted to go back to
# Alaska time (including daylight saving time) starting next year.
# https://www.krbd.org/2018/12/12/metlakatla-to-follow-alaska-standard-time-allow-liquor-sales/
#
# From Ryan Stanley (2019-01-11):
# The community will be changing back on the 20th of this month...
# From Tim Parenti (2019-01-11):
# Per an announcement on the Metlakatla community's official Facebook page, the
# "fall back" will be on Sunday 2019-01-20 at 02:00:
# https://www.facebook.com/141055983004923/photos/607150969728753/
# So they won't be waiting for Alaska to join them on 2019-03-10, but will
# rather change their clocks twice in seven weeks.
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32 Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
-8:57:41 - LMT 1900 Aug 20 12:00 -8:57:41 - LMT 1900 Aug 20 12:00
...@@ -648,6 +668,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55 ...@@ -648,6 +668,8 @@ Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55
-8:00 - PST 1969 -8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00 -8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST 2015 Nov 1 2:00 -8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT 2018 Nov 4 2:00
-8:00 - PST 2019 Jan 20 2:00
-9:00 US AK%sT -9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18 Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18
-9:18:55 - LMT 1900 Aug 20 12:00 -9:18:55 - LMT 1900 Aug 20 12:00
...@@ -808,6 +830,22 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 ...@@ -808,6 +830,22 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
# For a map of Indiana's time zone regions, see: # For a map of Indiana's time zone regions, see:
# https://en.wikipedia.org/wiki/Time_in_Indiana # https://en.wikipedia.org/wiki/Time_in_Indiana
# #
# From Paul Eggert (2018-11-30):
# A brief but entertaining history of time in Indiana describes a 1949 debate
# in the Indiana House where city legislators (who favored "fast time")
# tussled with farm legislators (who didn't) over a bill to outlaw DST:
# "Lacking enough votes, the city faction tries to filibuster until time runs
# out on the session at midnight, but rural champion Rep. Herbert Copeland,
# R-Madison, leans over the gallery railing and forces the official clock
# back to 9 p.m., breaking it in the process. The clock sticks on 9 as the
# debate rages on into the night. The filibuster finally dies out and the
# bill passes, while outside the chamber, clocks read 3:30 a.m. In the end,
# it doesn't matter which side won. The law has no enforcement powers and
# is simply ignored by fast-time communities."
# How Indiana went from 'God's time' to split zones and daylight-saving.
# Indianapolis Star. 2018-11-27 14:58 -05.
# https://www.indystar.com/story/news/politics/2018/11/27/indianapolis-indiana-time-zone-history-central-eastern-daylight-savings-time/2126300002/
#
# From Paul Eggert (2007-08-17): # From Paul Eggert (2007-08-17):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis, # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
# with the following exceptions: # with the following exceptions:
......
test/sun/util/calendar/zi/tzdata/zone.tab
浏览文件 @ c20b107c
...@@ -262,6 +262,7 @@ KW +2920+04759 Asia/Kuwait ...@@ -262,6 +262,7 @@ KW +2920+04759 Asia/Kuwait
KY +1918-08123 America/Cayman KY +1918-08123 America/Cayman
KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4315+07657 Asia/Almaty Kazakhstan (most areas)
KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay
KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe
KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau
KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev
...@@ -355,9 +356,9 @@ RS +4450+02030 Europe/Belgrade ...@@ -355,9 +356,9 @@ RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
RU +4457+03406 Europe/Simferopol MSK+00 - Crimea RU +4457+03406 Europe/Simferopol MSK+00 - Crimea
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +5836+04939 Europe/Kirov MSK+00 - Kirov RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan 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 +5134+04602 Europe/Saratov MSK+01 - Saratov
RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk
RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或