|
|
05dac3 |
commit 0642dd19c61aa884b5c96c219b586a0c635470b5
|
|
|
05dac3 |
Author: Yoshiki Sato <ysatowse@openjdk.org>
|
|
|
05dac3 |
Date: Wed Apr 5 01:19:00 2023 +0000
|
|
|
05dac3 |
|
|
|
05dac3 |
Backport ed9592c6e81f82e2bf6508ce45ba15aad8232181
|
|
|
05dac3 |
|
|
|
05dac3 |
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
|
|
|
05dac3 |
index 0f328a4a7f..66bd061e8b 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/VERSION
|
|
|
05dac3 |
+++ b/make/data/tzdata/VERSION
|
|
|
05dac3 |
@@ -21,4 +21,4 @@
|
|
|
05dac3 |
# or visit www.oracle.com if you need additional information or have any
|
|
|
05dac3 |
# questions.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-tzdata2022g
|
|
|
05dac3 |
+tzdata2023c
|
|
|
05dac3 |
diff --git a/make/data/tzdata/africa b/make/data/tzdata/africa
|
|
|
05dac3 |
index 830d7d10b7..a73405fdb0 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/africa
|
|
|
05dac3 |
+++ b/make/data/tzdata/africa
|
|
|
05dac3 |
@@ -344,6 +344,14 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
|
|
|
05dac3 |
# From Mina Samuel (2016-07-04):
|
|
|
05dac3 |
# Egyptian government took the decision to cancel the DST,
|
|
|
05dac3 |
|
|
|
05dac3 |
+# From Ahmad ElDardiry (2023-03-01):
|
|
|
05dac3 |
+# Egypt officially announced today that daylight savings will be
|
|
|
05dac3 |
+# applied from last Friday of April to last Thursday of October.
|
|
|
05dac3 |
+# From Paul Eggert (2023-03-01):
|
|
|
05dac3 |
+# Assume transitions are at 00:00 and 24:00 respectively.
|
|
|
05dac3 |
+# From Amir Adib (2023-03-07):
|
|
|
05dac3 |
+# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/
|
|
|
05dac3 |
+
|
|
|
05dac3 |
Rule Egypt 2008 only - Aug lastThu 24:00 0 -
|
|
|
05dac3 |
Rule Egypt 2009 only - Aug 20 24:00 0 -
|
|
|
05dac3 |
Rule Egypt 2010 only - Aug 10 24:00 0 -
|
|
|
05dac3 |
@@ -353,6 +361,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S
|
|
|
05dac3 |
Rule Egypt 2014 only - Jun 26 24:00 0 -
|
|
|
05dac3 |
Rule Egypt 2014 only - Jul 31 24:00 1:00 S
|
|
|
05dac3 |
Rule Egypt 2014 only - Sep lastThu 24:00 0 -
|
|
|
05dac3 |
+Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S
|
|
|
05dac3 |
+Rule Egypt 2023 max - Oct lastThu 24:00 0 -
|
|
|
05dac3 |
|
|
|
05dac3 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
05dac3 |
#STDOFF 2:05:08.9
|
|
|
05dac3 |
@@ -452,7 +462,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May
|
|
|
05dac3 |
# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
|
|
|
05dac3 |
# Monrovia: Executive Mansion.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
|
|
|
05dac3 |
+# Use the abbreviation "MMT" before 1972, as the more accurate numeric
|
|
|
05dac3 |
# abbreviation "-004430" would be one byte over the POSIX limit.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
05dac3 |
@@ -589,8 +599,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920
|
|
|
05dac3 |
# DST the coming summer...
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# Some sources, in French:
|
|
|
05dac3 |
-# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
|
|
|
05dac3 |
-# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
|
|
|
05dac3 |
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-»
|
|
|
05dac3 |
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints-
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# Our wrap-up:
|
|
|
05dac3 |
# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
|
|
|
05dac3 |
@@ -721,7 +731,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
|
|
05dac3 |
# More articles in the press
|
|
|
05dac3 |
# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
|
|
|
05dac3 |
# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
|
|
|
05dac3 |
-# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
|
|
|
05dac3 |
+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Petr Machata (2011-03-30):
|
|
|
05dac3 |
# They have it written in English here:
|
|
|
05dac3 |
@@ -736,7 +746,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
|
|
05dac3 |
# According to Infomédiaire web site from Morocco (infomediaire.ma),
|
|
|
05dac3 |
# on March 9, 2012, (in French) Heure légale:
|
|
|
05dac3 |
# Le Maroc adopte officiellement l'heure d'été
|
|
|
05dac3 |
-# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
|
|
|
05dac3 |
+# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété
|
|
|
05dac3 |
# Governing Council adopted draft decree, that Morocco DST starts on
|
|
|
05dac3 |
# the last Sunday of March (March 25, 2012) and ends on
|
|
|
05dac3 |
# last Sunday of September (September 30, 2012)
|
|
|
05dac3 |
@@ -860,19 +870,28 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
|
|
05dac3 |
# Friday or Saturday (and so the 2 days off are on a weekend), the next time
|
|
|
05dac3 |
# shift will be the next weekend.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-# From Paul Eggert (2020-05-31):
|
|
|
05dac3 |
+# From Milamber (2021-03-31, 2022-03-10):
|
|
|
05dac3 |
+# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
|
|
|
05dac3 |
+# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Milamber (2023-03-14, 2023-03-15):
|
|
|
05dac3 |
+# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m.
|
|
|
05dac3 |
+# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m.
|
|
|
05dac3 |
+# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Paul Eggert (2023-03-14):
|
|
|
05dac3 |
# For now, guess that in the future Morocco will fall back at 03:00
|
|
|
05dac3 |
# the last Sunday before Ramadan, and spring forward at 02:00 the
|
|
|
05dac3 |
-# first Sunday after two days after Ramadan. To implement this,
|
|
|
05dac3 |
+# first Sunday after one day after Ramadan. To implement this,
|
|
|
05dac3 |
# transition dates and times for 2019 through 2087 were determined by
|
|
|
05dac3 |
-# running the following program under GNU Emacs 26.3. (This algorithm
|
|
|
05dac3 |
+# running the following program under GNU Emacs 28.2. (This algorithm
|
|
|
05dac3 |
# also produces the correct transition dates for 2016 through 2018,
|
|
|
05dac3 |
# though the times differ due to Morocco's time zone change in 2018.)
|
|
|
05dac3 |
# (let ((islamic-year 1440))
|
|
|
05dac3 |
# (require 'cal-islam)
|
|
|
05dac3 |
# (while (< islamic-year 1511)
|
|
|
05dac3 |
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
|
|
|
05dac3 |
-# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
|
|
|
05dac3 |
+# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
|
|
|
05dac3 |
# (sunday 0))
|
|
|
05dac3 |
# (while (/= sunday (mod (setq a (1- a)) 7)))
|
|
|
05dac3 |
# (while (/= sunday (mod b 7))
|
|
|
05dac3 |
@@ -886,10 +905,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
|
|
|
05dac3 |
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
|
|
|
05dac3 |
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
|
|
|
05dac3 |
# (setq islamic-year (+ 1 islamic-year))))
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
-# From Milamber (2021-03-31, 2022-03-10), confirming these predictions:
|
|
|
05dac3 |
-# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
|
|
|
05dac3 |
-# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
|
|
|
05dac3 |
|
|
|
05dac3 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
05dac3 |
Rule Morocco 1939 only - Sep 12 0:00 1:00 -
|
|
|
05dac3 |
@@ -942,7 +957,7 @@ Rule Morocco 2021 only - May 16 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2022 only - Mar 27 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2022 only - May 8 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2023 only - Mar 19 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2023 only - Apr 30 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2023 only - Apr 23 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2024 only - Mar 10 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2024 only - Apr 14 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2025 only - Feb 23 3:00 -1:00 -
|
|
|
05dac3 |
@@ -958,7 +973,7 @@ Rule Morocco 2029 only - Feb 18 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2029 only - Dec 30 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2030 only - Feb 10 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2030 only - Dec 22 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2031 only - Feb 2 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2031 only - Jan 26 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2031 only - Dec 14 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2032 only - Jan 18 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2032 only - Nov 28 3:00 -1:00 -
|
|
|
05dac3 |
@@ -974,7 +989,7 @@ Rule Morocco 2036 only - Nov 23 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2037 only - Oct 4 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2037 only - Nov 15 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2038 only - Sep 26 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2038 only - Nov 7 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2038 only - Oct 31 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2039 only - Sep 18 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2039 only - Oct 23 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2040 only - Sep 2 3:00 -1:00 -
|
|
|
05dac3 |
@@ -990,7 +1005,7 @@ Rule Morocco 2044 only - Aug 28 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2045 only - Jul 9 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2045 only - Aug 20 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2046 only - Jul 1 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2046 only - Aug 12 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2046 only - Aug 5 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2047 only - Jun 23 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2047 only - Jul 28 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2048 only - Jun 7 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1006,7 +1021,7 @@ Rule Morocco 2052 only - Jun 2 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2053 only - Apr 13 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2053 only - May 25 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2054 only - Apr 5 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2054 only - May 17 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2054 only - May 10 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2055 only - Mar 28 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2055 only - May 2 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2056 only - Mar 12 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1022,7 +1037,7 @@ Rule Morocco 2060 only - Mar 7 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2061 only - Jan 16 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2061 only - Feb 27 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2062 only - Jan 8 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2062 only - Feb 19 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2062 only - Feb 12 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2062 only - Dec 31 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2063 only - Feb 4 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2063 only - Dec 16 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1038,7 +1053,7 @@ Rule Morocco 2067 only - Dec 11 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2068 only - Oct 21 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2068 only - Dec 2 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2069 only - Oct 13 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2069 only - Nov 24 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2069 only - Nov 17 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2070 only - Oct 5 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2070 only - Nov 9 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2071 only - Sep 20 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1054,7 +1069,7 @@ Rule Morocco 2075 only - Sep 15 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2076 only - Jul 26 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2076 only - Sep 6 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2077 only - Jul 18 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2077 only - Aug 29 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2077 only - Aug 22 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2078 only - Jul 10 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2078 only - Aug 14 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2079 only - Jun 25 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1064,13 +1079,13 @@ Rule Morocco 2080 only - Jul 21 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2081 only - Jun 1 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2081 only - Jul 13 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2082 only - May 24 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2082 only - Jul 5 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2082 only - Jun 28 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2083 only - May 16 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2083 only - Jun 20 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2084 only - Apr 30 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2084 only - Jun 11 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2085 only - Apr 22 3:00 -1:00 -
|
|
|
05dac3 |
-Rule Morocco 2085 only - Jun 3 2:00 0 -
|
|
|
05dac3 |
+Rule Morocco 2085 only - May 27 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2086 only - Apr 14 3:00 -1:00 -
|
|
|
05dac3 |
Rule Morocco 2086 only - May 19 2:00 0 -
|
|
|
05dac3 |
Rule Morocco 2087 only - Mar 30 3:00 -1:00 -
|
|
|
05dac3 |
@@ -1213,15 +1228,15 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
|
|
|
05dac3 |
# From P Chan (2020-12-03):
|
|
|
05dac3 |
# GMT was adopted as the standard time of Lagos on 1905-07-01.
|
|
|
05dac3 |
# Lagos Weekly Record, 1905-06-24, p 3
|
|
|
05dac3 |
-# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235
|
|
|
05dac3 |
+# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235
|
|
|
05dac3 |
# says "It is officially notified that on and after the 1st of July 1905
|
|
|
05dac3 |
-# Greenwich Mean Solar Time will be adopted thought the Colony and
|
|
|
05dac3 |
+# Greenwich Mean Solar Time will be adopted throughout the Colony and
|
|
|
05dac3 |
# Protectorate, and that it will be necessary to put all clocks 13 minutes and
|
|
|
05dac3 |
# 35 seconds back, recording local mean time."
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# It seemed that Lagos returned to LMT on 1908-07-01.
|
|
|
05dac3 |
# [The Lagos Standard], 1908-07-01, p 5
|
|
|
05dac3 |
-# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523
|
|
|
05dac3 |
+# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523
|
|
|
05dac3 |
# says "Scarcely have the people become accustomed to this new time, when
|
|
|
05dac3 |
# another official notice has now appeared announcing that from and after the
|
|
|
05dac3 |
# 1st July next, return will be made to local mean time."
|
|
|
05dac3 |
@@ -1233,7 +1248,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
|
|
|
05dac3 |
# https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27
|
|
|
05dac3 |
# "On January 1st [1914], a universal standard time for Nigeria was adopted,
|
|
|
05dac3 |
# viz., half an hour fast on Greenwich mean time, corresponding to the meridian
|
|
|
05dac3 |
-# 7 [degrees] 30' E. long."
|
|
|
05dac3 |
+# 7° 30' E. long."
|
|
|
05dac3 |
# Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos
|
|
|
05dac3 |
# was the local mean time. On 1st January, 1914, standard time for the whole of
|
|
|
05dac3 |
# Nigeria was introduced ... Lagos time has been advanced about 16 minutes
|
|
|
05dac3 |
@@ -1251,7 +1266,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
|
|
|
05dac3 |
# The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first
|
|
|
05dac3 |
# reading of this Bill by the Legislative Council of the Colony of Nigeria on
|
|
|
05dac3 |
# Thursday 1919-08-28:
|
|
|
05dac3 |
-# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915
|
|
|
05dac3 |
+# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915
|
|
|
05dac3 |
# "The proposal is that the Globe should be divided into twelve zones East and
|
|
|
05dac3 |
# West of Greenwich, of one hour each, Nigeria falling into the zone with a
|
|
|
05dac3 |
# standard of one hour fast on Greenwich Mean Time. Nigeria standard time is
|
|
|
05dac3 |
diff --git a/make/data/tzdata/antarctica b/make/data/tzdata/antarctica
|
|
|
05dac3 |
index 792542b922..3de5e726eb 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/antarctica
|
|
|
05dac3 |
+++ b/make/data/tzdata/antarctica
|
|
|
05dac3 |
@@ -315,7 +315,7 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1
|
|
|
05dac3 |
# but that he found it more convenient to keep GMT+12
|
|
|
05dac3 |
# as supplies for the station were coming from McMurdo Sound,
|
|
|
05dac3 |
# which was on GMT+12 because New Zealand was on GMT+12 all year
|
|
|
05dac3 |
-# at that time (1957). (Source: Siple's book 90 Degrees South.)
|
|
|
05dac3 |
+# at that time (1957). (Source: Siple's book 90° South.)
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# From Susan Smith
|
|
|
05dac3 |
# http://www.cybertours.com/whs/pole10.html
|
|
|
05dac3 |
diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia
|
|
|
05dac3 |
index ff81978bc4..6a048c3ad2 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/asia
|
|
|
05dac3 |
+++ b/make/data/tzdata/asia
|
|
|
05dac3 |
@@ -2714,6 +2714,40 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
|
|
|
05dac3 |
|
|
|
05dac3 |
|
|
|
05dac3 |
# Lebanon
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Saadallah Itani (2023-03-23):
|
|
|
05dac3 |
+# Lebanon ... announced today delay of Spring forward from March 25 to April 20.
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Paul Eggert (2023-03-27):
|
|
|
05dac3 |
+# This announcement was by the Lebanese caretaker prime minister Najib Mikati.
|
|
|
05dac3 |
+# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption
|
|
|
05dac3 |
+# A video was later leaked to the media of parliament speaker Nabih Berri
|
|
|
05dac3 |
+# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting
|
|
|
05dac3 |
+# that this would cause problems such as scheduling airline flights, to which
|
|
|
05dac3 |
+# Berri interjected, "What flights?"
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# The change was controversial and led to a partly-sectarian divide.
|
|
|
05dac3 |
+# Many Lebanese institutions, including the education ministry, the Maronite
|
|
|
05dac3 |
+# church, and two news channels LCBI and MTV, ignored the announcement and
|
|
|
05dac3 |
+# went ahead with the long-scheduled spring-forward on March 25/26, some
|
|
|
05dac3 |
+# arguing that the prime minister had not followed the law because the change
|
|
|
05dac3 |
+# had not been approved by the cabinet. Google went with the announcement;
|
|
|
05dac3 |
+# Apple ignored it. At least one bank followed the announcement for its doors,
|
|
|
05dac3 |
+# but ignored the announcement in internal computer systems.
|
|
|
05dac3 |
+# Beirut international airport listed two times for each departure.
|
|
|
05dac3 |
+# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie."
|
|
|
05dac3 |
+# Eventually the prime minister backed down, said the cabinet had decided to
|
|
|
05dac3 |
+# stick with its 1998 decision, and that DST would begin midnight March 29/30.
|
|
|
05dac3 |
+# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings
|
|
|
05dac3 |
+# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# Although we could model the chaos with two Zones, that would likely cause
|
|
|
05dac3 |
+# more trouble than it would cure. Since so many manual clocks and
|
|
|
05dac3 |
+# computer-based timestamps ignored the announcement, stick with official
|
|
|
05dac3 |
+# cabinet resolutions in the data while recording the prime minister's
|
|
|
05dac3 |
+# announcement as a comment. This is how we treated a similar situation in
|
|
|
05dac3 |
+# Rio de Janeiro in spring 1993.
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
05dac3 |
Rule Lebanon 1920 only - Mar 28 0:00 1:00 S
|
|
|
05dac3 |
Rule Lebanon 1920 only - Oct 25 0:00 0 -
|
|
|
05dac3 |
@@ -2739,6 +2773,10 @@ Rule Lebanon 1992 only - Oct 4 0:00 0 -
|
|
|
05dac3 |
Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S
|
|
|
05dac3 |
Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 -
|
|
|
05dac3 |
Rule Lebanon 1999 max - Oct lastSun 0:00 0 -
|
|
|
05dac3 |
+# This one-time rule, announced by the prime minister first for April 21
|
|
|
05dac3 |
+# then for March 30, is commented out for reasons described above.
|
|
|
05dac3 |
+#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S
|
|
|
05dac3 |
+
|
|
|
05dac3 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
05dac3 |
Zone Asia/Beirut 2:22:00 - LMT 1880
|
|
|
05dac3 |
2:00 Lebanon EE%sT
|
|
|
05dac3 |
@@ -2977,7 +3015,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920
|
|
|
05dac3 |
# 9pm and moving clocks forward by one hour for the next three months. ...."
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html
|
|
|
05dac3 |
-# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
|
|
|
05dac3 |
+# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Arthur David Olson (2008-05-19):
|
|
|
05dac3 |
# XXX--midnight transitions is a guess; 2008 only is a guess.
|
|
|
05dac3 |
@@ -3300,7 +3338,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
05dac3 |
# Some of many sources in Arabic:
|
|
|
05dac3 |
# http://www.samanews.com/index.php?act=Show&id=122638
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
|
|
|
05dac3 |
+# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# Our brief summary:
|
|
|
05dac3 |
# https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
|
|
|
05dac3 |
@@ -3310,7 +3348,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
05dac3 |
# time from midnight on Friday, March 29, 2013" (translated).
|
|
|
05dac3 |
# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
|
|
|
05dac3 |
# http://www.samanews.com/index.php?act=Show&id=154120
|
|
|
05dac3 |
-# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
|
|
|
05dac3 |
+# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Steffen Thorsen (2013-09-24):
|
|
|
05dac3 |
# The Gaza and West Bank are ending DST Thursday at midnight
|
|
|
05dac3 |
@@ -3408,9 +3446,41 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
|
|
05dac3 |
# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
|
|
05dac3 |
# at 2:00 AM ,for the years from 2023 to 2026.
|
|
|
05dac3 |
# (2022-09-05): https://mtit.pna.ps/Site/New/1453
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
-# From Paul Eggert (2022-08-31):
|
|
|
05dac3 |
-# For now, assume that this rule will also be used after 2026.
|
|
|
05dac3 |
+
|
|
|
05dac3 |
+# From Heba Hamad (2023-03-22):
|
|
|
05dac3 |
+# ... summer time will begin in Palestine from Saturday 04-29-2023,
|
|
|
05dac3 |
+# 02:00 AM by 60 minutes forward.
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Paul Eggert (2023-03-22):
|
|
|
05dac3 |
+# For now, guess that spring and fall transitions will normally
|
|
|
05dac3 |
+# continue to use 2022's rules, that during DST Palestine will switch
|
|
|
05dac3 |
+# to standard time at 02:00 the last Saturday before Ramadan and back
|
|
|
05dac3 |
+# to DST at 02:00 the first Saturday after Ramadan, and that
|
|
|
05dac3 |
+# if the normal spring-forward or fall-back transition occurs during
|
|
|
05dac3 |
+# Ramadan the former is delayed and the latter advanced.
|
|
|
05dac3 |
+# To implement this, I predicted Ramadan-oriented transition dates for
|
|
|
05dac3 |
+# 2023 through 2086 by running the following program under GNU Emacs 28.2,
|
|
|
05dac3 |
+# with the results integrated by hand into the table below.
|
|
|
05dac3 |
+# Predictions after 2086 are approximated without Ramadan.
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# (let ((islamic-year 1444))
|
|
|
05dac3 |
+# (require 'cal-islam)
|
|
|
05dac3 |
+# (while (< islamic-year 1510)
|
|
|
05dac3 |
+# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
|
|
|
05dac3 |
+# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
|
|
|
05dac3 |
+# (saturday 6))
|
|
|
05dac3 |
+# (while (/= saturday (mod (setq a (1- a)) 7)))
|
|
|
05dac3 |
+# (while (/= saturday (mod b 7))
|
|
|
05dac3 |
+# (setq b (1+ b)))
|
|
|
05dac3 |
+# (setq a (calendar-gregorian-from-absolute a))
|
|
|
05dac3 |
+# (setq b (calendar-gregorian-from-absolute b))
|
|
|
05dac3 |
+# (insert
|
|
|
05dac3 |
+# (format
|
|
|
05dac3 |
+# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n"
|
|
|
05dac3 |
+# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n")
|
|
|
05dac3 |
+# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
|
|
|
05dac3 |
+# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
|
|
|
05dac3 |
+# (setq islamic-year (+ 1 islamic-year))))
|
|
|
05dac3 |
|
|
|
05dac3 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
05dac3 |
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
|
|
05dac3 |
@@ -3450,8 +3520,86 @@ Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
|
|
05dac3 |
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
|
|
05dac3 |
Rule Palestine 2021 only - Oct 29 1:00 0 -
|
|
|
05dac3 |
Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
|
|
05dac3 |
-Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
|
|
05dac3 |
-Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2023 only - Apr 29 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2024 only - Apr 13 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2025 only - Apr 5 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2036 only - Oct 18 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2037 only - Oct 10 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2038 only - Sep 25 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2039 only - Sep 17 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2039 only - Oct 22 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2040 only - Sep 1 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2040 only - Oct 13 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2041 only - Aug 24 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2041 only - Sep 28 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2042 only - Aug 16 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2042 only - Sep 20 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2043 only - Aug 1 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2043 only - Sep 12 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2044 only - Jul 23 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2044 only - Aug 27 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2045 only - Jul 15 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2045 only - Aug 19 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2046 only - Jun 30 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2046 only - Aug 11 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2047 only - Jun 22 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2047 only - Jul 27 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2048 only - Jun 6 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2048 only - Jul 18 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2049 only - May 29 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2049 only - Jul 3 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2050 only - May 21 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2050 only - Jun 25 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2051 only - May 6 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2051 only - Jun 17 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2052 only - Apr 27 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2052 only - Jun 1 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2053 only - Apr 12 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2053 only - May 24 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2054 only - Apr 4 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2054 only - May 16 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2055 only - May 1 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2056 only - Apr 22 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2057 only - Apr 7 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2068 only - Oct 20 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2069 only - Oct 12 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2070 only - Oct 4 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2071 only - Sep 19 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2072 only - Sep 10 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2072 only - Oct 15 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2073 only - Sep 2 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2073 only - Oct 7 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2074 only - Aug 18 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2074 only - Sep 29 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2075 only - Aug 10 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2075 only - Sep 14 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2075 max - Oct Sat<=30 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2076 only - Jul 25 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2076 only - Sep 5 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2077 only - Jul 17 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2077 only - Aug 28 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2078 only - Jul 9 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2078 only - Aug 13 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2079 only - Jun 24 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2079 only - Aug 5 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2080 only - Jun 15 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2080 only - Jul 20 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2081 only - Jun 7 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2081 only - Jul 12 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2082 only - May 23 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2082 only - Jul 4 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2083 only - May 15 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2083 only - Jun 19 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2084 only - Apr 29 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2084 only - Jun 10 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2085 only - Apr 21 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2085 only - Jun 2 2:00 1:00 S
|
|
|
05dac3 |
+Rule Palestine 2086 only - Apr 13 2:00 0 -
|
|
|
05dac3 |
+Rule Palestine 2086 only - May 18 2:00 1:00 S
|
|
|
05dac3 |
|
|
|
05dac3 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
05dac3 |
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
|
|
05dac3 |
@@ -3655,7 +3803,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1
|
|
|
05dac3 |
# standard time is SLST.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# From Paul Eggert (2016-10-18):
|
|
|
05dac3 |
-# "SLST" seems to be reasonably recent and rarely-used outside time
|
|
|
05dac3 |
+# "SLST" seems to be reasonably recent and rarely used outside time
|
|
|
05dac3 |
# zone nerd sources. I searched Google News and found three uses of
|
|
|
05dac3 |
# it in the International Business Times of India in February and
|
|
|
05dac3 |
# March of this year when discussing cricket match times, but nothing
|
|
|
05dac3 |
diff --git a/make/data/tzdata/australasia b/make/data/tzdata/australasia
|
|
|
05dac3 |
index fbe3b8a6d7..893d7055ea 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/australasia
|
|
|
05dac3 |
+++ b/make/data/tzdata/australasia
|
|
|
05dac3 |
@@ -346,7 +346,7 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Steffen Thorsen (2013-01-10):
|
|
|
05dac3 |
# Fiji will end DST on 2014-01-19 02:00:
|
|
|
05dac3 |
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
|
|
|
05dac3 |
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Ken Rylander (2014-10-20):
|
|
|
05dac3 |
# DST will start Nov. 2 this year.
|
|
|
05dac3 |
@@ -746,7 +746,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# Samoa's Daylight Saving Time Act 2009 is available here, but does not
|
|
|
05dac3 |
# contain any dates:
|
|
|
05dac3 |
-# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
|
|
|
05dac3 |
+# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Laupue Raymond Hughes (2010-10-07):
|
|
|
05dac3 |
# Please see
|
|
|
05dac3 |
@@ -1831,7 +1831,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
|
|
05dac3 |
# period. It would probably be reasonable to assume Guam use GMT+9 during
|
|
|
05dac3 |
# that period of time like the surrounding area.
|
|
|
05dac3 |
|
|
|
05dac3 |
-# From Paul Eggert (2018-11-18):
|
|
|
05dac3 |
+# From Paul Eggert (2023-01-23):
|
|
|
05dac3 |
# Howse writes (p 153) "The Spaniards, on the other hand, reached the
|
|
|
05dac3 |
# Philippines and the Ladrones from America," and implies that the Ladrones
|
|
|
05dac3 |
# (now called the Marianas) kept American date for quite some time.
|
|
|
05dac3 |
@@ -1844,7 +1844,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
|
|
05dac3 |
# they did as that avoids the need for a separate zone due to our 1970 cutoff.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
|
|
|
05dac3 |
-# under the name "Chamorro Standard Time". There is no official abbreviation,
|
|
|
05dac3 |
+# under the name "Chamorro standard time". There is no official abbreviation,
|
|
|
05dac3 |
# but Congressman Robert A. Underwood, author of the bill that became law,
|
|
|
05dac3 |
# wrote in a press release (2000-12-27) that he will seek the use of "ChST".
|
|
|
05dac3 |
|
|
|
05dac3 |
@@ -2222,24 +2222,18 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
|
|
|
05dac3 |
# an international standard, there are some places on the high seas where the
|
|
|
05dac3 |
# correct date is ambiguous.
|
|
|
05dac3 |
|
|
|
05dac3 |
-# From Wikipedia <https://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
|
|
|
05dac3 |
-# Before 1920, all ships kept local apparent time on the high seas by setting
|
|
|
05dac3 |
-# their clocks at night or at the morning sight so that, given the ship's
|
|
|
05dac3 |
-# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
|
|
|
05dac3 |
-# meridian (12 o'clock = local apparent noon). During 1917, at the
|
|
|
05dac3 |
-# Anglo-French Conference on Time-keeping at Sea, it was recommended that all
|
|
|
05dac3 |
-# ships, both military and civilian, should adopt hourly standard time zones
|
|
|
05dac3 |
-# on the high seas. Whenever a ship was within the territorial waters of any
|
|
|
05dac3 |
-# nation it would use that nation's standard time. The captain was permitted
|
|
|
05dac3 |
-# to change his ship's clocks at a time of his choice following his ship's
|
|
|
05dac3 |
-# entry into another zone time - he often chose midnight. These zones were
|
|
|
05dac3 |
-# adopted by all major fleets between 1920 and 1925 but not by many
|
|
|
05dac3 |
-# independent merchant ships until World War II.
|
|
|
05dac3 |
-
|
|
|
05dac3 |
-# From Paul Eggert, using references suggested by Oscar van Vlijmen
|
|
|
05dac3 |
-# (2005-03-20):
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
-# The American Practical Navigator (2002)
|
|
|
05dac3 |
-# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
|
|
|
05dac3 |
-# talks only about the 180-degree meridian with respect to ships in
|
|
|
05dac3 |
-# international waters; it ignores the international date line.
|
|
|
05dac3 |
+# From Wikipedia <https://en.wikipedia.org/wiki/Nautical_time> (2023-01-23):
|
|
|
05dac3 |
+# The nautical time zone system is analogous to the terrestrial time zone
|
|
|
05dac3 |
+# system for use on high seas. Under the system time changes are required for
|
|
|
05dac3 |
+# changes of longitude in one-hour steps. The one-hour step corresponds to a
|
|
|
05dac3 |
+# time zone width of 15° longitude. The 15° gore that is offset from GMT or
|
|
|
05dac3 |
+# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two
|
|
|
05dac3 |
+# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is
|
|
|
05dac3 |
+# implied but not explicitly drawn on time zone maps. It follows the 180th
|
|
|
05dac3 |
+# meridian except where it is interrupted by territorial waters adjacent to
|
|
|
05dac3 |
+# land, forming gaps: it is a pole-to-pole dashed line.
|
|
|
05dac3 |
+
|
|
|
05dac3 |
+# From Paul Eggert (2023-01-23):
|
|
|
05dac3 |
+# The American Practical Navigator <https://msi.nga.mil/Publications/APN>,
|
|
|
05dac3 |
+# 2019 edition, merely says that the International Date Line
|
|
|
05dac3 |
+# "coincides with the 180th meridian over most of its length."
|
|
|
05dac3 |
diff --git a/make/data/tzdata/backward b/make/data/tzdata/backward
|
|
|
05dac3 |
index fa44f65500..c0746d6dd1 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/backward
|
|
|
05dac3 |
+++ b/make/data/tzdata/backward
|
|
|
05dac3 |
@@ -297,6 +297,7 @@ Link America/Argentina/Cordoba America/Rosario
|
|
|
05dac3 |
Link America/Tijuana America/Santa_Isabel
|
|
|
05dac3 |
Link America/Denver America/Shiprock
|
|
|
05dac3 |
Link America/Toronto America/Thunder_Bay
|
|
|
05dac3 |
+Link America/Edmonton America/Yellowknife
|
|
|
05dac3 |
Link Pacific/Auckland Antarctica/South_Pole
|
|
|
05dac3 |
Link Asia/Shanghai Asia/Chongqing
|
|
|
05dac3 |
Link Asia/Shanghai Asia/Harbin
|
|
|
05dac3 |
diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe
|
|
|
05dac3 |
index acc5da3ec7..446d2e1e65 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/europe
|
|
|
05dac3 |
+++ b/make/data/tzdata/europe
|
|
|
05dac3 |
@@ -540,9 +540,7 @@ Zone Europe/London -0:01:15 - LMT 1847 Dec 1
|
|
|
05dac3 |
# other form with a traditional approximation for Irish timestamps
|
|
|
05dac3 |
# after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
|
|
|
05dac3 |
# flags that are reversed, its UTC offsets are correct and this often
|
|
|
05dac3 |
-# suffices. This source file currently uses only nonnegative SAVE
|
|
|
05dac3 |
-# values, but this is intended to change and downstream code should
|
|
|
05dac3 |
-# not rely on it.
|
|
|
05dac3 |
+# suffices....
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# The following is like GB-Eire and EU, except with standard time in
|
|
|
05dac3 |
# summer and negative daylight saving time in winter. It is for when
|
|
|
05dac3 |
@@ -1136,19 +1134,18 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# From Jürgen Appel (2022-11-25):
|
|
|
05dac3 |
# https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
|
|
|
05dac3 |
-# If I understand this correctly, from the next planned switch to
|
|
|
05dac3 |
-# summer time, Greenland will permanently stay at that time, i.e. no
|
|
|
05dac3 |
-# switch back to winter time in 2023 will occur.
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
-# From Paul Eggert (2022-11-28):
|
|
|
05dac3 |
-# The official document in Danish
|
|
|
05dac3 |
-# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3
|
|
|
05dac3 |
-# says standard time for Greenland is -02, that Naalakkersuisut can lay down
|
|
|
05dac3 |
-# rules for DST and can require some areas to use a different time zone,
|
|
|
05dac3 |
-# and that this all takes effect 2023-03-25 22:00. The abovementioned
|
|
|
05dac3 |
-# "bekymringer" URL says the intent is no transition March 25, that
|
|
|
05dac3 |
-# Greenland will not go back to winter time in fall 2023, and that
|
|
|
05dac3 |
-# only America/Nuuk is affected (though further changes may occur).
|
|
|
05dac3 |
+#
|
|
|
05dac3 |
+# From Thomas M. Steenholdt (2022-12-02):
|
|
|
05dac3 |
+# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed.
|
|
|
05dac3 |
+# - The bill to stop observing DST did not (Greenland will stop observing DST
|
|
|
05dac3 |
+# when EU does).
|
|
|
05dac3 |
+# Details on the implementation are here (section 6):
|
|
|
05dac3 |
+# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf
|
|
|
05dac3 |
+# This is how the change will be implemented:
|
|
|
05dac3 |
+# 1. The shift *to* DST in 2023 happens as normal.
|
|
|
05dac3 |
+# 2. The shift *from* DST in 2023 happens as normal, but coincides with the
|
|
|
05dac3 |
+# shift to UTC-02 normaltime (people will not change their clocks here).
|
|
|
05dac3 |
+# 3. After this, DST is still observed, but as -02/-01 instead of -03/-02.
|
|
|
05dac3 |
|
|
|
05dac3 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
05dac3 |
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
|
|
|
05dac3 |
@@ -1172,8 +1169,8 @@ Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
|
|
|
05dac3 |
-1:00 EU -01/+00
|
|
|
05dac3 |
Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb
|
|
|
05dac3 |
-3:00 - -03 1980 Apr 6 2:00
|
|
|
05dac3 |
- -3:00 EU -03/-02 2023 Mar 25 22:00
|
|
|
05dac3 |
- -2:00 - -02
|
|
|
05dac3 |
+ -3:00 EU -03/-02 2023 Oct 29 1:00u
|
|
|
05dac3 |
+ -2:00 EU -02/-01
|
|
|
05dac3 |
Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
|
|
|
05dac3 |
-4:00 Thule A%sT
|
|
|
05dac3 |
|
|
|
05dac3 |
@@ -1509,9 +1506,9 @@ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16
|
|
|
05dac3 |
Rule Germany 1946 only - Apr 14 2:00s 1:00 S
|
|
|
05dac3 |
Rule Germany 1946 only - Oct 7 2:00s 0 -
|
|
|
05dac3 |
Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
|
|
|
05dac3 |
-# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition
|
|
|
05dac3 |
-# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger.
|
|
|
05dac3 |
-# Go with the PTB.
|
|
|
05dac3 |
+# https://www.ptb.de/cms/en/ptb/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany/dst-and-midsummer-dst-in-germany-until-1979.html
|
|
|
05dac3 |
+# says the following transition occurred at 3:00 MEZ, not the 2:00 MEZ
|
|
|
05dac3 |
+# given in Shanks & Pottenger. Go with the PTB.
|
|
|
05dac3 |
Rule Germany 1947 only - Apr 6 3:00s 1:00 S
|
|
|
05dac3 |
Rule Germany 1947 only - May 11 2:00s 2:00 M
|
|
|
05dac3 |
Rule Germany 1947 only - Jun 29 3:00 1:00 S
|
|
|
05dac3 |
@@ -2272,7 +2269,7 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
|
|
|
05dac3 |
# the State Duma has approved ... the draft bill on returning to
|
|
|
05dac3 |
# winter time standard and return Russia 11 time zones. The new
|
|
|
05dac3 |
# regulations will come into effect on October 26, 2014 at 02:00 ...
|
|
|
05dac3 |
-# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02
|
|
|
05dac3 |
+# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=431985-6&02
|
|
|
05dac3 |
# Here is a link where we put together table (based on approved Bill N
|
|
|
05dac3 |
# 431985-6) with proposed 11 Russian time zones and corresponding
|
|
|
05dac3 |
# areas/cities/administrative centers in the Russian Federation (in English):
|
|
|
05dac3 |
@@ -2682,13 +2679,13 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
|
|
|
05dac3 |
3:00 - +03 1930 Jun 21
|
|
|
05dac3 |
4:00 - +04 1961 Nov 11
|
|
|
05dac3 |
4:00 Russia +04/+05 1988 Mar 27 2:00s
|
|
|
05dac3 |
- 3:00 Russia +03/+04 1991 Mar 31 2:00s
|
|
|
05dac3 |
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
|
|
|
05dac3 |
4:00 - +04 1992 Mar 29 2:00s
|
|
|
05dac3 |
- 3:00 Russia +03/+04 2011 Mar 27 2:00s
|
|
|
05dac3 |
- 4:00 - +04 2014 Oct 26 2:00s
|
|
|
05dac3 |
- 3:00 - +03 2018 Oct 28 2:00s
|
|
|
05dac3 |
+ 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
|
|
|
05dac3 |
+ 4:00 - MSK 2014 Oct 26 2:00s
|
|
|
05dac3 |
+ 3:00 - MSK 2018 Oct 28 2:00s
|
|
|
05dac3 |
4:00 - +04 2020 Dec 27 2:00s
|
|
|
05dac3 |
- 3:00 - +03
|
|
|
05dac3 |
+ 3:00 - MSK
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Paul Eggert (2016-11-11):
|
|
|
05dac3 |
# Europe/Saratov covers:
|
|
|
05dac3 |
@@ -2719,11 +2716,11 @@ Zone Europe/Saratov 3:04:18 - LMT 1919 Jul 1 0:00u
|
|
|
05dac3 |
Zone Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0:00u
|
|
|
05dac3 |
3:00 - +03 1930 Jun 21
|
|
|
05dac3 |
4:00 Russia +04/+05 1989 Mar 26 2:00s
|
|
|
05dac3 |
- 3:00 Russia +03/+04 1991 Mar 31 2:00s
|
|
|
05dac3 |
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
|
|
|
05dac3 |
4:00 - +04 1992 Mar 29 2:00s
|
|
|
05dac3 |
- 3:00 Russia +03/+04 2011 Mar 27 2:00s
|
|
|
05dac3 |
- 4:00 - +04 2014 Oct 26 2:00s
|
|
|
05dac3 |
- 3:00 - +03
|
|
|
05dac3 |
+ 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
|
|
|
05dac3 |
+ 4:00 - MSK 2014 Oct 26 2:00s
|
|
|
05dac3 |
+ 3:00 - MSK
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
|
|
|
05dac3 |
# Europe/Samara covers...
|
|
|
05dac3 |
diff --git a/make/data/tzdata/iso3166.tab b/make/data/tzdata/iso3166.tab
|
|
|
05dac3 |
index fbfb74bec4..cea17732dd 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/iso3166.tab
|
|
|
05dac3 |
+++ b/make/data/tzdata/iso3166.tab
|
|
|
05dac3 |
@@ -261,7 +261,7 @@ SY Syria
|
|
|
05dac3 |
SZ Eswatini (Swaziland)
|
|
|
05dac3 |
TC Turks & Caicos Is
|
|
|
05dac3 |
TD Chad
|
|
|
05dac3 |
-TF French Southern Territories
|
|
|
05dac3 |
+TF French S. Terr.
|
|
|
05dac3 |
TG Togo
|
|
|
05dac3 |
TH Thailand
|
|
|
05dac3 |
TJ Tajikistan
|
|
|
05dac3 |
diff --git a/make/data/tzdata/leapseconds b/make/data/tzdata/leapseconds
|
|
|
05dac3 |
index d6fb840f51..89ce8b89cd 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/leapseconds
|
|
|
05dac3 |
+++ b/make/data/tzdata/leapseconds
|
|
|
05dac3 |
@@ -95,11 +95,11 @@ Leap 2016 Dec 31 23:59:60 + S
|
|
|
05dac3 |
# Any additional leap seconds will come after this.
|
|
|
05dac3 |
# This Expires line is commented out for now,
|
|
|
05dac3 |
# so that pre-2020a zic implementations do not reject this file.
|
|
|
05dac3 |
-#Expires 2023 Jun 28 00:00:00
|
|
|
05dac3 |
+#Expires 2023 Dec 28 00:00:00
|
|
|
05dac3 |
|
|
|
05dac3 |
# POSIX timestamps for the data in this file:
|
|
|
05dac3 |
#updated 1467936000 (2016-07-08 00:00:00 UTC)
|
|
|
05dac3 |
-#expires 1687910400 (2023-06-28 00:00:00 UTC)
|
|
|
05dac3 |
+#expires 1703721600 (2023-12-28 00:00:00 UTC)
|
|
|
05dac3 |
|
|
|
05dac3 |
-# Updated through IERS Bulletin C64
|
|
|
05dac3 |
-# File expires on: 28 June 2023
|
|
|
05dac3 |
+# Updated through IERS Bulletin C65
|
|
|
05dac3 |
+# File expires on: 28 December 2023
|
|
|
05dac3 |
diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
|
|
|
05dac3 |
index a5fd701f88..e240cf3510 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/northamerica
|
|
|
05dac3 |
+++ b/make/data/tzdata/northamerica
|
|
|
05dac3 |
@@ -1,4 +1,3 @@
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# This code is free software; you can redistribute it and/or modify it
|
|
|
05dac3 |
@@ -299,9 +298,10 @@ Zone PST8PDT -8:00 US P%sT
|
|
|
05dac3 |
# -10 Standard Alaska Time (AST) Alaska-Hawaii standard time (AHST)
|
|
|
05dac3 |
# -11 (unofficial) Nome (NST) Bering standard time (BST)
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
|
|
|
05dac3 |
-# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
|
|
|
05dac3 |
+# From Paul Eggert (2023-01-23), from a 2001-01-08 heads-up from Rives McDow:
|
|
|
05dac3 |
+# Public law 106-564 (2000-12-23) introduced "Chamorro standard time"
|
|
|
05dac3 |
# for time in Guam and the Northern Marianas. See the file "australasia".
|
|
|
05dac3 |
+# Also see 15 U.S.C. §263 <https://www.law.cornell.edu/uscode/text/15/263>.
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# From Paul Eggert (2015-04-17):
|
|
|
05dac3 |
# HST and HDT are standardized abbreviations for Hawaii-Aleutian
|
|
|
05dac3 |
@@ -618,7 +618,7 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
|
|
05dac3 |
# local times of other Alaskan locations so that they change simultaneously.
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Paul Eggert (2014-07-18):
|
|
|
05dac3 |
-# One opinion of the early-1980s turmoil in Alaska over time zones and
|
|
|
05dac3 |
+# One opinion of the early 1980s turmoil in Alaska over time zones and
|
|
|
05dac3 |
# daylight saving time appeared as graffiti on a Juneau airport wall:
|
|
|
05dac3 |
# "Welcome to Juneau. Please turn your watch back to the 19th century."
|
|
|
05dac3 |
# See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01.
|
|
|
05dac3 |
@@ -690,6 +690,10 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
|
|
05dac3 |
# So they won't be waiting for Alaska to join them on 2019-03-10, but will
|
|
|
05dac3 |
# rather change their clocks twice in seven weeks.
|
|
|
05dac3 |
|
|
|
05dac3 |
+# From Paul Eggert (2023-01-23):
|
|
|
05dac3 |
+# America/Adak is for the Aleutian Islands that are part of Alaska
|
|
|
05dac3 |
+# and are west of 169.5° W.
|
|
|
05dac3 |
+
|
|
|
05dac3 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
05dac3 |
Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
|
|
|
05dac3 |
-8:57:41 - LMT 1900 Aug 20 12:00
|
|
|
05dac3 |
@@ -2148,10 +2152,6 @@ Zone America/Fort_Nelson -8:10:47 - LMT 1884
|
|
|
05dac3 |
# Nunavut ... moved ... to incorporate the whole territory into one time zone.
|
|
|
05dac3 |
# Nunavut moves to single time zone Oct. 31
|
|
|
05dac3 |
# http://www.nunatsiaq.com/nunavut/nvt90903_13.html
|
|
|
05dac3 |
-#
|
|
|
05dac3 |
-# From Antoine Leca (1999-09-06):
|
|
|
05dac3 |
-# We then need to create a new timezone for the Kitikmeot region of Nunavut
|
|
|
05dac3 |
-# to differentiate it from the Yellowknife region.
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Paul Eggert (1999-09-20):
|
|
|
05dac3 |
# Basic Facts: The New Territory
|
|
|
05dac3 |
@@ -2345,9 +2345,6 @@ Zone America/Cambridge_Bay 0 - -00 1920 # trading post est.?
|
|
|
05dac3 |
-5:00 - EST 2000 Nov 5 0:00
|
|
|
05dac3 |
-6:00 - CST 2001 Apr 1 3:00
|
|
|
05dac3 |
-7:00 Canada M%sT
|
|
|
05dac3 |
-Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded?
|
|
|
05dac3 |
- -7:00 NT_YK M%sT 1980
|
|
|
05dac3 |
- -7:00 Canada M%sT
|
|
|
05dac3 |
Zone America/Inuvik 0 - -00 1953 # Inuvik founded
|
|
|
05dac3 |
-8:00 NT_YK P%sT 1979 Apr lastSun 2:00
|
|
|
05dac3 |
-7:00 NT_YK M%sT 1980
|
|
|
05dac3 |
@@ -2584,7 +2581,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
|
|
05dac3 |
# and in addition changes all of Chihuahua to -06 with no DST.
|
|
|
05dac3 |
|
|
|
05dac3 |
# From Heitor David Pinto (2022-11-28):
|
|
|
05dac3 |
-# Now the northern municipalities want to have the same time zone as the
|
|
|
05dac3 |
+# Now the northern [municipios] want to have the same time zone as the
|
|
|
05dac3 |
# respective neighboring cities in the US, for example Juárez in UTC-7 with
|
|
|
05dac3 |
# DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio....
|
|
|
05dac3 |
# the president authorized the publication of the decree for November 29,
|
|
|
05dac3 |
@@ -2621,7 +2618,7 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u
|
|
|
05dac3 |
-5:00 - EST 1982 Dec 2
|
|
|
05dac3 |
-6:00 Mexico C%sT
|
|
|
05dac3 |
# Coahuila, Nuevo León, Tamaulipas (near US border)
|
|
|
05dac3 |
-# This includes the following municipalities:
|
|
|
05dac3 |
+# This includes the following municipios:
|
|
|
05dac3 |
# in Coahuila: Acuña, Allende, Guerrero, Hidalgo, Jiménez, Morelos, Nava,
|
|
|
05dac3 |
# Ocampo, Piedras Negras, Villa Unión, Zaragoza
|
|
|
05dac3 |
# in Nuevo León: Anáhuac
|
|
|
05dac3 |
@@ -2647,8 +2644,8 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
|
|
|
05dac3 |
-6:00 - CST 2002 Feb 20
|
|
|
05dac3 |
-6:00 Mexico C%sT
|
|
|
05dac3 |
# Chihuahua (near US border - western side)
|
|
|
05dac3 |
-# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
|
|
05dac3 |
-# and Práxedis G Guerrero.
|
|
|
05dac3 |
+# This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and
|
|
|
05dac3 |
+# Práxedis G Guerrero.
|
|
|
05dac3 |
# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
|
|
|
05dac3 |
Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u
|
|
|
05dac3 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
05dac3 |
@@ -2662,7 +2659,8 @@ Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u
|
|
|
05dac3 |
-6:00 - CST 2022 Nov 30 0:00
|
|
|
05dac3 |
-7:00 US M%sT
|
|
|
05dac3 |
# Chihuahua (near US border - eastern side)
|
|
|
05dac3 |
-# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
|
|
05dac3 |
+# This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel
|
|
|
05dac3 |
+# Benavides.
|
|
|
05dac3 |
# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
|
|
|
05dac3 |
Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
|
|
|
05dac3 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
05dac3 |
@@ -3083,7 +3081,7 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# He supplied these references:
|
|
|
05dac3 |
#
|
|
|
05dac3 |
-# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
|
|
|
05dac3 |
+# http://www.prensalatina.com.mx/article.asp?ID={4CC32C1B-A9F7-42FB-8A07-8631AFC923AF}&language=ES
|
|
|
05dac3 |
# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
|
|
|
05dac3 |
#
|
|
|
05dac3 |
# From Alex Krivenyshev (2007-10-25):
|
|
|
05dac3 |
diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica
|
|
|
05dac3 |
index 81fdd793df..4024e7180c 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/southamerica
|
|
|
05dac3 |
+++ b/make/data/tzdata/southamerica
|
|
|
05dac3 |
@@ -231,7 +231,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 -
|
|
|
05dac3 |
# Hora de verano para la República Argentina
|
|
|
05dac3 |
# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
|
|
|
05dac3 |
# says that standard time in Argentina from 1894-10-31
|
|
|
05dac3 |
-# to 1920-05-01 was -4:16:48.25. Go with this more-precise value
|
|
|
05dac3 |
+# to 1920-05-01 was -4:16:48.25. Go with this more precise value
|
|
|
05dac3 |
# over Shanks & Pottenger. It is upward compatible with Milne, who
|
|
|
05dac3 |
# says Córdoba time was -4:16:48.2.
|
|
|
05dac3 |
|
|
|
05dac3 |
diff --git a/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab
|
|
|
05dac3 |
index 939432d345..3edb0d61c8 100644
|
|
|
05dac3 |
--- a/make/data/tzdata/zone.tab
|
|
|
05dac3 |
+++ b/make/data/tzdata/zone.tab
|
|
|
05dac3 |
@@ -144,9 +144,8 @@ CA +744144-0944945 America/Resolute Central - NU (Resolute)
|
|
|
05dac3 |
CA +624900-0920459 America/Rankin_Inlet Central - NU (central)
|
|
|
05dac3 |
CA +5024-10439 America/Regina CST - SK (most areas)
|
|
|
05dac3 |
CA +5017-10750 America/Swift_Current CST - SK (midwest)
|
|
|
05dac3 |
-CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W)
|
|
|
05dac3 |
+CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W)
|
|
|
05dac3 |
CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west)
|
|
|
05dac3 |
-CA +6227-11421 America/Yellowknife Mountain - NT (central)
|
|
|
05dac3 |
CA +682059-1334300 America/Inuvik Mountain - NT (west)
|
|
|
05dac3 |
CA +4906-11631 America/Creston MST - BC (Creston)
|
|
|
05dac3 |
CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John)
|
|
|
05dac3 |
@@ -162,7 +161,7 @@ CG -0416+01517 Africa/Brazzaville
|
|
|
05dac3 |
CH +4723+00832 Europe/Zurich
|
|
|
05dac3 |
CI +0519-00402 Africa/Abidjan
|
|
|
05dac3 |
CK -2114-15946 Pacific/Rarotonga
|
|
|
05dac3 |
-CL -3327-07040 America/Santiago Chile (most areas)
|
|
|
05dac3 |
+CL -3327-07040 America/Santiago most of Chile
|
|
|
05dac3 |
CL -5309-07055 America/Punta_Arenas Region of Magallanes
|
|
|
05dac3 |
CL -2709-10926 Pacific/Easter Easter Island
|
|
|
05dac3 |
CM +0403+00942 Africa/Douala
|
|
|
05dac3 |
@@ -174,10 +173,10 @@ CU +2308-08222 America/Havana
|
|
|
05dac3 |
CV +1455-02331 Atlantic/Cape_Verde
|
|
|
05dac3 |
CW +1211-06900 America/Curacao
|
|
|
05dac3 |
CX -1025+10543 Indian/Christmas
|
|
|
05dac3 |
-CY +3510+03322 Asia/Nicosia Cyprus (most areas)
|
|
|
05dac3 |
+CY +3510+03322 Asia/Nicosia most of Cyprus
|
|
|
05dac3 |
CY +3507+03357 Asia/Famagusta Northern Cyprus
|
|
|
05dac3 |
CZ +5005+01426 Europe/Prague
|
|
|
05dac3 |
-DE +5230+01322 Europe/Berlin Germany (most areas)
|
|
|
05dac3 |
+DE +5230+01322 Europe/Berlin most of Germany
|
|
|
05dac3 |
DE +4742+00841 Europe/Busingen Busingen
|
|
|
05dac3 |
DJ +1136+04309 Africa/Djibouti
|
|
|
05dac3 |
DK +5540+01235 Europe/Copenhagen
|
|
|
05dac3 |
@@ -210,7 +209,7 @@ GF +0456-05220 America/Cayenne
|
|
|
05dac3 |
GG +492717-0023210 Europe/Guernsey
|
|
|
05dac3 |
GH +0533-00013 Africa/Accra
|
|
|
05dac3 |
GI +3608-00521 Europe/Gibraltar
|
|
|
05dac3 |
-GL +6411-05144 America/Nuuk Greenland (most areas)
|
|
|
05dac3 |
+GL +6411-05144 America/Nuuk most of Greenland
|
|
|
05dac3 |
GL +7646-01840 America/Danmarkshavn National Park (east coast)
|
|
|
05dac3 |
GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit
|
|
|
05dac3 |
GL +7634-06847 America/Thule Thule/Pituffik
|
|
|
05dac3 |
@@ -258,7 +257,7 @@ KP +3901+12545 Asia/Pyongyang
|
|
|
05dac3 |
KR +3733+12658 Asia/Seoul
|
|
|
05dac3 |
KW +2920+04759 Asia/Kuwait
|
|
|
05dac3 |
KY +1918-08123 America/Cayman
|
|
|
05dac3 |
-KZ +4315+07657 Asia/Almaty Kazakhstan (most areas)
|
|
|
05dac3 |
+KZ +4315+07657 Asia/Almaty most of Kazakhstan
|
|
|
05dac3 |
KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
|
|
|
05dac3 |
KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay
|
|
|
05dac3 |
KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe
|
|
|
05dac3 |
@@ -282,12 +281,12 @@ MD +4700+02850 Europe/Chisinau
|
|
|
05dac3 |
ME +4226+01916 Europe/Podgorica
|
|
|
05dac3 |
MF +1804-06305 America/Marigot
|
|
|
05dac3 |
MG -1855+04731 Indian/Antananarivo
|
|
|
05dac3 |
-MH +0709+17112 Pacific/Majuro Marshall Islands (most areas)
|
|
|
05dac3 |
+MH +0709+17112 Pacific/Majuro most of Marshall Islands
|
|
|
05dac3 |
MH +0905+16720 Pacific/Kwajalein Kwajalein
|
|
|
05dac3 |
MK +4159+02126 Europe/Skopje
|
|
|
05dac3 |
ML +1239-00800 Africa/Bamako
|
|
|
05dac3 |
MM +1647+09610 Asia/Yangon
|
|
|
05dac3 |
-MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
|
|
|
05dac3 |
+MN +4755+10653 Asia/Ulaanbaatar most of Mongolia
|
|
|
05dac3 |
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
|
|
|
05dac3 |
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
|
|
|
05dac3 |
MO +221150+1133230 Asia/Macau
|
|
|
05dac3 |
@@ -325,7 +324,7 @@ NO +5955+01045 Europe/Oslo
|
|
|
05dac3 |
NP +2743+08519 Asia/Kathmandu
|
|
|
05dac3 |
NR -0031+16655 Pacific/Nauru
|
|
|
05dac3 |
NU -1901-16955 Pacific/Niue
|
|
|
05dac3 |
-NZ -3652+17446 Pacific/Auckland New Zealand (most areas)
|
|
|
05dac3 |
+NZ -3652+17446 Pacific/Auckland most of New Zealand
|
|
|
05dac3 |
NZ -4357-17633 Pacific/Chatham Chatham Islands
|
|
|
05dac3 |
OM +2336+05835 Asia/Muscat
|
|
|
05dac3 |
PA +0858-07932 America/Panama
|
|
|
05dac3 |
@@ -333,7 +332,7 @@ PE -1203-07703 America/Lima
|
|
|
05dac3 |
PF -1732-14934 Pacific/Tahiti Society Islands
|
|
|
05dac3 |
PF -0900-13930 Pacific/Marquesas Marquesas Islands
|
|
|
05dac3 |
PF -2308-13457 Pacific/Gambier Gambier Islands
|
|
|
05dac3 |
-PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas)
|
|
|
05dac3 |
+PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea
|
|
|
05dac3 |
PG -0613+15534 Pacific/Bougainville Bougainville
|
|
|
05dac3 |
PH +1435+12100 Asia/Manila
|
|
|
05dac3 |
PK +2452+06703 Asia/Karachi
|
|
|
05dac3 |
@@ -379,7 +378,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River
|
|
|
05dac3 |
RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky
|
|
|
05dac3 |
RU +5934+15048 Asia/Magadan MSK+08 - Magadan
|
|
|
05dac3 |
RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island
|
|
|
05dac3 |
-RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is
|
|
|
05dac3 |
+RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is
|
|
|
05dac3 |
RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka
|
|
|
05dac3 |
RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea
|
|
|
05dac3 |
RW -0157+03004 Africa/Kigali
|
|
|
05dac3 |
@@ -420,7 +419,7 @@ TT +1039-06131 America/Port_of_Spain
|
|
|
05dac3 |
TV -0831+17913 Pacific/Funafuti
|
|
|
05dac3 |
TW +2503+12130 Asia/Taipei
|
|
|
05dac3 |
TZ -0648+03917 Africa/Dar_es_Salaam
|
|
|
05dac3 |
-UA +5026+03031 Europe/Kyiv Ukraine (most areas)
|
|
|
05dac3 |
+UA +5026+03031 Europe/Kyiv most of Ukraine
|
|
|
05dac3 |
UG +0019+03225 Africa/Kampala
|
|
|
05dac3 |
UM +2813-17722 Pacific/Midway Midway Islands
|
|
|
05dac3 |
UM +1917+16637 Pacific/Wake Wake Island
|
|
|
05dac3 |
@@ -443,7 +442,7 @@ US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural)
|
|
|
05dac3 |
US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer)
|
|
|
05dac3 |
US +394421-1045903 America/Denver Mountain (most areas)
|
|
|
05dac3 |
US +433649-1161209 America/Boise Mountain - ID (south); OR (east)
|
|
|
05dac3 |
-US +332654-1120424 America/Phoenix MST - Arizona (except Navajo)
|
|
|
05dac3 |
+US +332654-1120424 America/Phoenix MST - AZ (except Navajo)
|
|
|
05dac3 |
US +340308-1181434 America/Los_Angeles Pacific
|
|
|
05dac3 |
US +611305-1495401 America/Anchorage Alaska (most areas)
|
|
|
05dac3 |
US +581807-1342511 America/Juneau Alaska - Juneau area
|
|
|
05dac3 |
@@ -451,7 +450,7 @@ US +571035-1351807 America/Sitka Alaska - Sitka area
|
|
|
05dac3 |
US +550737-1313435 America/Metlakatla Alaska - Annette Island
|
|
|
05dac3 |
US +593249-1394338 America/Yakutat Alaska - Yakutat
|
|
|
05dac3 |
US +643004-1652423 America/Nome Alaska (west)
|
|
|
05dac3 |
-US +515248-1763929 America/Adak Aleutian Islands
|
|
|
05dac3 |
+US +515248-1763929 America/Adak Alaska - western Aleutians
|
|
|
05dac3 |
US +211825-1575130 Pacific/Honolulu Hawaii
|
|
|
05dac3 |
UY -345433-0561245 America/Montevideo
|
|
|
05dac3 |
UZ +3940+06648 Asia/Samarkand Uzbekistan (west)
|
|
|
05dac3 |
diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
05dac3 |
index a51490767d..9fdc741af9 100644
|
|
|
05dac3 |
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
05dac3 |
+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
|
|
|
05dac3 |
@@ -607,6 +607,17 @@ public final class ZoneInfoFile {
|
|
|
05dac3 |
params[8] = endRule.secondOfDay * 1000;
|
|
|
05dac3 |
params[9] = toSTZTime[endRule.timeDefinition];
|
|
|
05dac3 |
dstSavings = (startRule.offsetAfter - startRule.offsetBefore) * 1000;
|
|
|
05dac3 |
+
|
|
|
05dac3 |
+ // Note: known mismatching -> Africa/Cairo
|
|
|
05dac3 |
+ // ZoneInfo : startDayOfWeek=5 <= Thursday
|
|
|
05dac3 |
+ // startTime=86400000 <= 24:00
|
|
|
05dac3 |
+ // This: startDayOfWeek=6 <= Friday
|
|
|
05dac3 |
+ // startTime=0 <= 0:00
|
|
|
05dac3 |
+ if (zoneId.equals("Africa/Cairo") &&
|
|
|
05dac3 |
+ params[7] == Calendar.FRIDAY && params[8] == 0) {
|
|
|
05dac3 |
+ params[7] = Calendar.THURSDAY;
|
|
|
05dac3 |
+ params[8] = SECONDS_PER_DAY * 1000;
|
|
|
05dac3 |
+ }
|
|
|
05dac3 |
} else if (nTrans > 0) { // only do this if there is something in table already
|
|
|
05dac3 |
if (lastyear < LASTYEAR) {
|
|
|
05dac3 |
// ZoneInfo has an ending entry for 2037
|
|
|
05dac3 |
diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
|
05dac3 |
index bf7918659a..2763ac30ca 100644
|
|
|
05dac3 |
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
|
05dac3 |
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
|
|
|
05dac3 |
@@ -1,5 +1,5 @@
|
|
|
05dac3 |
/*
|
|
|
05dac3 |
- * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
|
|
|
05dac3 |
+ * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
|
|
|
05dac3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
05dac3 |
*
|
|
|
05dac3 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
05dac3 |
@@ -845,9 +845,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
|
|
|
05dac3 |
{"Europe/Jersey", GMTBST},
|
|
|
05dac3 |
{"Europe/Kaliningrad", EET},
|
|
|
05dac3 |
{"Europe/Kiev", EET},
|
|
|
05dac3 |
- {"Europe/Kirov", new String[] {"Kirov Standard Time", "GMT+03:00",
|
|
|
05dac3 |
- "Kirov Daylight Time", "GMT+03:00",
|
|
|
05dac3 |
- "Kirov Time", "GMT+03:00"}},
|
|
|
05dac3 |
+ {"Europe/Kirov", MSK},
|
|
|
05dac3 |
{"Europe/Lisbon", WET},
|
|
|
05dac3 |
{"Europe/Ljubljana", CET},
|
|
|
05dac3 |
{"Europe/London", GMTBST},
|
|
|
05dac3 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
05dac3 |
index 0f66ee12c9..c5483b4851 100644
|
|
|
05dac3 |
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
05dac3 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
05dac3 |
@@ -1 +1 @@
|
|
|
05dac3 |
-tzdata2022g
|
|
|
05dac3 |
+tzdata2023c
|
|
|
05dac3 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
05dac3 |
index d495743b26..07c5edbafe 100644
|
|
|
05dac3 |
--- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
05dac3 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
|
|
05dac3 |
@@ -211,6 +211,7 @@ Link America/Argentina/Cordoba America/Rosario
|
|
|
05dac3 |
Link America/Tijuana America/Santa_Isabel
|
|
|
05dac3 |
Link America/Denver America/Shiprock
|
|
|
05dac3 |
Link America/Toronto America/Thunder_Bay
|
|
|
05dac3 |
+Link America/Edmonton America/Yellowknife
|
|
|
05dac3 |
Link Pacific/Auckland Antarctica/South_Pole
|
|
|
05dac3 |
Link Asia/Shanghai Asia/Chongqing
|
|
|
05dac3 |
Link Asia/Shanghai Asia/Harbin
|
|
|
05dac3 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
05dac3 |
index 44db4dbdb8..03f5305e65 100644
|
|
|
05dac3 |
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
05dac3 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
05dac3 |
@@ -92,7 +92,6 @@ America/Vancouver PST PDT
|
|
|
05dac3 |
America/Whitehorse MST
|
|
|
05dac3 |
America/Winnipeg CST CDT
|
|
|
05dac3 |
America/Yakutat AKST AKDT
|
|
|
05dac3 |
-America/Yellowknife MST MDT
|
|
|
05dac3 |
Antarctica/Macquarie AEST AEDT
|
|
|
05dac3 |
Asia/Beirut EET EEST
|
|
|
05dac3 |
Asia/Famagusta EET EEST
|
|
|
05dac3 |
@@ -144,6 +143,7 @@ Europe/Dublin IST/GMT IST/GMT
|
|
|
05dac3 |
Europe/Gibraltar CET CEST
|
|
|
05dac3 |
Europe/Helsinki EET EEST
|
|
|
05dac3 |
Europe/Kaliningrad EET
|
|
|
05dac3 |
+Europe/Kirov MSK
|
|
|
05dac3 |
Europe/Kyiv EET EEST
|
|
|
05dac3 |
Europe/Lisbon WET WEST
|
|
|
05dac3 |
Europe/London GMT/BST GMT/BST
|
|
|
05dac3 |
@@ -160,6 +160,7 @@ Europe/Tallinn EET EEST
|
|
|
05dac3 |
Europe/Tirane CET CEST
|
|
|
05dac3 |
Europe/Vienna CET CEST
|
|
|
05dac3 |
Europe/Vilnius EET EEST
|
|
|
05dac3 |
+Europe/Volgograd MSK
|
|
|
05dac3 |
Europe/Warsaw CET CEST
|
|
|
05dac3 |
Europe/Zurich CET CEST
|
|
|
05dac3 |
HST HST
|
|
|
05dac3 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneTest.java b/test/jdk/java/util/TimeZone/TimeZoneTest.java
|
|
|
05dac3 |
index d31d1722b7..8e5d403f87 100644
|
|
|
05dac3 |
--- a/test/jdk/java/util/TimeZone/TimeZoneTest.java
|
|
|
05dac3 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneTest.java
|
|
|
05dac3 |
@@ -1,5 +1,5 @@
|
|
|
05dac3 |
/*
|
|
|
05dac3 |
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
|
|
|
05dac3 |
+ * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
|
|
|
05dac3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
05dac3 |
*
|
|
|
05dac3 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
05dac3 |
@@ -25,7 +25,7 @@
|
|
|
05dac3 |
* @test
|
|
|
05dac3 |
* @bug 4028006 4044013 4096694 4107276 4107570 4112869 4130885 7039469 7126465 7158483
|
|
|
05dac3 |
* 8008577 8077685 8098547 8133321 8138716 8148446 8151876 8159684 8166875 8181157
|
|
|
05dac3 |
- * 8228469 8274407
|
|
|
05dac3 |
+ * 8228469 8274407 8305113
|
|
|
05dac3 |
* @modules java.base/sun.util.resources
|
|
|
05dac3 |
* @library /java/text/testlib
|
|
|
05dac3 |
* @summary test TimeZone
|
|
|
05dac3 |
@@ -121,7 +121,7 @@ public class TimeZoneTest extends IntlTest
|
|
|
05dac3 |
new ZoneDescriptor("GMT", 0, false),
|
|
|
05dac3 |
new ZoneDescriptor("UTC", 0, false),
|
|
|
05dac3 |
new ZoneDescriptor("ECT", 60, true),
|
|
|
05dac3 |
- new ZoneDescriptor("ART", 120, false),
|
|
|
05dac3 |
+ new ZoneDescriptor("ART", 120, true),
|
|
|
05dac3 |
new ZoneDescriptor("EET", 120, true),
|
|
|
05dac3 |
new ZoneDescriptor("EAT", 180, false),
|
|
|
05dac3 |
new ZoneDescriptor("MET", 60, true),
|