Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 87684bf9 编写于 作者: A aefimov
浏览文件
操作

8075667: (tz) Support tzdata2015b 

Reviewed-by: okutsu
上级 bfbe1817
隐藏空白更改
内联 并排
Showing with 131 addition and 100 deletion
make/data/tzdata/VERSION
浏览文件 @ 87684bf9
...@@ -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.
# #
tzdata2015a tzdata2015b
make/data/tzdata/asia
浏览文件 @ 87684bf9
...@@ -1927,6 +1927,13 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Male ...@@ -1927,6 +1927,13 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Male
# was at the start of 2008-03-31 (the day of Steffen Thorsen's report); # was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
# this is almost surely wrong. # this is almost surely wrong.
# From Ganbold Tsagaankhuu (2015-03-10):
# It seems like yesterday Mongolian Government meeting has concluded to use
# daylight saving time in Mongolia.... Starting at 2:00AM of last Saturday of
# March 2015, daylight saving time starts. And 00:00AM of last Saturday of
# September daylight saving time ends. Source:
# http://zasag.mn/news/view/8969
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S
Rule Mongol 1983 only - Oct 1 0:00 0 - Rule Mongol 1983 only - Oct 1 0:00 0 -
...@@ -1947,6 +1954,8 @@ Rule Mongol 1984 1998 - Sep lastSun 0:00 0 - ...@@ -1947,6 +1954,8 @@ Rule Mongol 1984 1998 - Sep lastSun 0:00 0 -
Rule Mongol 2001 only - Apr lastSat 2:00 1:00 S Rule Mongol 2001 only - Apr lastSat 2:00 1:00 S
Rule Mongol 2001 2006 - Sep lastSat 2:00 0 - Rule Mongol 2001 2006 - Sep lastSat 2:00 0 -
Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 S Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 S
Rule Mongol 2015 max - Mar lastSat 2:00 1:00 S
Rule Mongol 2015 max - Sep lastSat 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
...@@ -2365,13 +2374,19 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 ...@@ -2365,13 +2374,19 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# official source...: # official source...:
# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 # http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
# From Paul Eggert (2013-09-24): # From Steffen Thorsen (2015-03-03):
# For future dates, guess the last Thursday in March at 24:00 through # Sources such as http://www.alquds.com/news/article/view/id/548257
# the first Friday on or after September 21 at 00:00. This is consistent with # and http://www.raya.ps/ar/news/890705.html say Palestine areas will
# the predictions in today's editions of the following URLs, # start DST on 2015-03-28 00:00 which is one day later than expected.
# which are for Gaza and Hebron respectively: #
# http://www.timeanddate.com/worldclock/timezone.html?n=702 # From Paul Eggert (2015-03-03):
# http://www.timeanddate.com/worldclock/timezone.html?n=2364 # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
# says that the fall 2014 transition was Oct 23 at 24:00.
# For future dates, guess the last Friday in March at 24:00 through
# the first Friday on or after October 21 at 00:00. This is consistent with
# the predictions in today's editions of the following URLs:
# http://www.timeanddate.com/time/change/gaza-strip/gaza
# http://www.timeanddate.com/time/change/west-bank/hebron
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
...@@ -2397,9 +2412,11 @@ Rule Palestine 2011 only - Apr 1 0:01 1:00 S ...@@ -2397,9 +2412,11 @@ Rule Palestine 2011 only - Apr 1 0:01 1:00 S
Rule Palestine 2011 only - Aug 1 0:00 0 - Rule Palestine 2011 only - Aug 1 0:00 0 -
Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Aug 30 0:00 1:00 S
Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2011 only - Sep 30 0:00 0 -
Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S Rule Palestine 2012 2014 - Mar lastThu 24:00 1:00 S
Rule Palestine 2012 only - Sep 21 1:00 0 - Rule Palestine 2012 only - Sep 21 1:00 0 -
Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - Rule Palestine 2013 only - Sep Fri>=21 0:00 0 -
Rule Palestine 2014 max - Oct Fri>=21 0:00 0 -
Rule Palestine 2015 max - Mar lastFri 24:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
......
make/data/tzdata/australasia
浏览文件 @ 87684bf9
...@@ -396,6 +396,7 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 ...@@ -396,6 +396,7 @@ 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 2000 Dec 23 # Guam
10:00 - ChST # Chamorro Standard Time 10:00 - ChST # Chamorro Standard Time
Link Pacific/Guam Pacific/Saipan # N Mariana Is
# Kiribati # Kiribati
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -411,12 +412,7 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 ...@@ -411,12 +412,7 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
14:00 - LINT 14:00 - LINT
# N Mariana Is # N Mariana Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See Pacific/Guam.
Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31
9:43:00 - LMT 1901
9:00 - MPT 1969 Oct # N Mariana Is Time
10:00 - MPT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time
# Marshall Is # Marshall Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -586,6 +582,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 ...@@ -586,6 +582,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
-11:00 - NST 1967 Apr # N=Nome -11:00 - NST 1967 Apr # N=Nome
-11:00 - BST 1983 Nov 30 # B=Bering -11:00 - BST 1983 Nov 30 # B=Bering
-11:00 - SST # S=Samoa -11:00 - SST # S=Samoa
Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
# Samoa (formerly and also known as Western Samoa) # Samoa (formerly and also known as Western Samoa)
...@@ -767,23 +764,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 ...@@ -767,23 +764,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901
# uninhabited # uninhabited
# Midway # Midway
# # See Pacific/Pago_Pago.
# From Mark Brader (2005-01-23):
# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
# reproduced a Pan American Airways timetable from 1936, for their weekly
# "Orient Express" flights between San Francisco and Manila, and connecting
# flights to Chicago and the US East Coast. As it uses some time zone
# designations that I've never seen before:....
# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I. H.L.T. Ar. 5:30P Sun.
# " 3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A "
#
Zone Pacific/Midway -11:49:28 - LMT 1901
-11:00 - NST 1956 Jun 3
-11:00 1:00 NDT 1956 Sep 2
-11:00 - NST 1967 Apr # N=Nome
-11:00 - BST 1983 Nov 30 # B=Bering
-11:00 - SST # S=Samoa
# Palmyra # Palmyra
# uninhabited since World War II; was probably like Pacific/Kiritimati # uninhabited since World War II; was probably like Pacific/Kiritimati
......
make/data/tzdata/europe
浏览文件 @ 87684bf9
...@@ -2423,7 +2423,7 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 ...@@ -2423,7 +2423,7 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T 4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T
3:00 Russia VOL%sT 1991 Mar 31 2:00s 3:00 Russia VOL%sT 1991 Mar 31 2:00s
4:00 - VOLT 1992 Mar 29 2:00s 4:00 - VOLT 1992 Mar 29 2:00s
3:00 Russia MSK 2011 Mar 27 2:00s 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
4:00 - MSK 2014 Oct 26 2:00s 4:00 - MSK 2014 Oct 26 2:00s
3:00 - MSK 3:00 - MSK
......
make/data/tzdata/northamerica
浏览文件 @ 87684bf9
...@@ -2335,8 +2335,24 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 ...@@ -2335,8 +2335,24 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# "...the new time zone will come into effect at two o'clock on the first Sunday # "...the new time zone will come into effect at two o'clock on the first Sunday
# of February, when we will have to advance the clock one hour from its current # of February, when we will have to advance the clock one hour from its current
# time..." # time..."
#
# Also, the new zone will not use DST. # Also, the new zone will not use DST.
#
# From Carlos Raúl Perasso (2015-02-02):
# The decree that modifies the Mexican Hour System Law has finally
# been published at the Diario Oficial de la Federación
# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
# It establishes 5 zones for Mexico:
# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
# includes most of Mexico, excluding what's mentioned below.
# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
# states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
# de Banderas which lies in Central Zone); Sinaloa and Sonora.
# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
# state of Baja California.
# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
# of Quintana Roo.
# 5- The islands, reefs and keys shall take their timezone from the
# longitude they are located at.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mexico 1939 only - Feb 5 0:00 1:00 D Rule Mexico 1939 only - Feb 5 0:00 1:00 D
...@@ -2531,13 +2547,8 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32 ...@@ -2531,13 +2547,8 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
############################################################################### ###############################################################################
# Anguilla # Anguilla
# See America/Port_of_Spain.
# Antigua and Barbuda # Antigua and Barbuda
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See America/Port_of_Spain.
Zone America/Antigua -4:07:12 - LMT 1912 Mar 2
-5:00 - EST 1951
-4:00 - AST
# Bahamas # Bahamas
# #
...@@ -2604,10 +2615,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton ...@@ -2604,10 +2615,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 US A%sT -4:00 US A%sT
# Cayman Is # Cayman Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See America/Panama.
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST
# Costa Rica # Costa Rica
...@@ -3130,6 +3138,7 @@ Zone America/Managua -5:45:08 - LMT 1890 ...@@ -3130,6 +3138,7 @@ Zone America/Managua -5:45:08 - LMT 1890
Zone America/Panama -5:18:08 - LMT 1890 Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST -5:00 - EST
Link America/Panama America/Cayman
# Puerto Rico # Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
......
make/data/tzdata/southamerica
浏览文件 @ 87684bf9
...@@ -1229,10 +1229,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 ...@@ -1229,10 +1229,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC) # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
# From Juan Correa (2015-01-28): # From Eduardo Romero Urra (2015-03-03):
# ... today the Ministry of Energy announced that Chile will drop DST, will keep # Today has been published officially that Chile will use the DST time
# "summer time" (UTC -3 / UTC -5) all year round.... # permanently until March 25 of 2017
# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html # http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
#
# From Paul Eggert (2015-03-03):
# For now, assume that the extension will persist indefinitely.
# NOTE: ChileAQ rules for Antarctic bases are stored separately in the # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
# 'antarctica' file. # 'antarctica' file.
...@@ -1291,7 +1294,7 @@ Zone America/Santiago -4:42:46 - LMT 1890 ...@@ -1291,7 +1294,7 @@ Zone America/Santiago -4:42:46 - LMT 1890
-3:00 - CLT -3:00 - CLT
Zone Pacific/Easter -7:17:44 - LMT 1890 Zone Pacific/Easter -7:17:44 - LMT 1890
-7:17:28 - EMT 1932 Sep # Easter Mean Time -7:17:28 - EMT 1932 Sep # Easter Mean Time
-7:00 Chile EAS%sT 1982 Mar 13 3:00u # Easter Time -7:00 Chile EAS%sT 1982 Mar 14 3:00u # Easter Time
-6:00 Chile EAS%sT 2015 Apr 26 3:00u -6:00 Chile EAS%sT 2015 Apr 26 3:00u
-5:00 - EAST -5:00 - EAST
# #
...@@ -1626,6 +1629,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 ...@@ -1626,6 +1629,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
# These all agree with Trinidad and Tobago since 1970. # These all agree with Trinidad and Tobago since 1970.
Link America/Port_of_Spain America/Anguilla Link America/Port_of_Spain America/Anguilla
Link America/Port_of_Spain America/Antigua
Link America/Port_of_Spain America/Dominica Link America/Port_of_Spain America/Dominica
Link America/Port_of_Spain America/Grenada Link America/Port_of_Spain America/Grenada
Link America/Port_of_Spain America/Guadeloupe Link America/Port_of_Spain America/Guadeloupe
......
src/share/classes/sun/util/calendar/ZoneInfoFile.java
浏览文件 @ 87684bf9
...@@ -625,6 +625,15 @@ public final class ZoneInfoFile { ...@@ -625,6 +625,15 @@ public final class ZoneInfoFile {
params[2] = 5; params[2] = 5;
params[3] = 86400000; params[3] = 86400000;
} }
// Additional check for startDayOfWeek=6 and starTime=86400000
// is needed for Asia/Amman; Asia/Gasa and Asia/Hebron
if (params[2] == 7 && params[3] == 0 &&
(zoneId.equals("Asia/Amman") ||
zoneId.equals("Asia/Gaza") ||
zoneId.equals("Asia/Hebron"))) {
params[2] = 6; // Friday
params[3] = 86400000; // 24h
}
//endDayOfWeek and endTime workaround //endDayOfWeek and endTime workaround
if (params[7] == 6 && params[8] == 0 && if (params[7] == 6 && params[8] == 0 &&
(zoneId.equals("Africa/Cairo"))) { (zoneId.equals("Africa/Cairo"))) {
......
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @ 87684bf9
...@@ -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.
# #
tzdata2015a tzdata2015b
test/sun/util/calendar/zi/tzdata/asia
浏览文件 @ 87684bf9
...@@ -1927,6 +1927,13 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Male ...@@ -1927,6 +1927,13 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Male
# was at the start of 2008-03-31 (the day of Steffen Thorsen's report); # was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
# this is almost surely wrong. # this is almost surely wrong.
# From Ganbold Tsagaankhuu (2015-03-10):
# It seems like yesterday Mongolian Government meeting has concluded to use
# daylight saving time in Mongolia.... Starting at 2:00AM of last Saturday of
# March 2015, daylight saving time starts. And 00:00AM of last Saturday of
# September daylight saving time ends. Source:
# http://zasag.mn/news/view/8969
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S
Rule Mongol 1983 only - Oct 1 0:00 0 - Rule Mongol 1983 only - Oct 1 0:00 0 -
...@@ -1947,6 +1954,8 @@ Rule Mongol 1984 1998 - Sep lastSun 0:00 0 - ...@@ -1947,6 +1954,8 @@ Rule Mongol 1984 1998 - Sep lastSun 0:00 0 -
Rule Mongol 2001 only - Apr lastSat 2:00 1:00 S Rule Mongol 2001 only - Apr lastSat 2:00 1:00 S
Rule Mongol 2001 2006 - Sep lastSat 2:00 0 - Rule Mongol 2001 2006 - Sep lastSat 2:00 0 -
Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 S Rule Mongol 2002 2006 - Mar lastSat 2:00 1:00 S
Rule Mongol 2015 max - Mar lastSat 2:00 1:00 S
Rule Mongol 2015 max - Sep lastSat 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta # Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
...@@ -2365,13 +2374,19 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 ...@@ -2365,13 +2374,19 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# official source...: # official source...:
# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 # http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
# From Paul Eggert (2013-09-24): # From Steffen Thorsen (2015-03-03):
# For future dates, guess the last Thursday in March at 24:00 through # Sources such as http://www.alquds.com/news/article/view/id/548257
# the first Friday on or after September 21 at 00:00. This is consistent with # and http://www.raya.ps/ar/news/890705.html say Palestine areas will
# the predictions in today's editions of the following URLs, # start DST on 2015-03-28 00:00 which is one day later than expected.
# which are for Gaza and Hebron respectively: #
# http://www.timeanddate.com/worldclock/timezone.html?n=702 # From Paul Eggert (2015-03-03):
# http://www.timeanddate.com/worldclock/timezone.html?n=2364 # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
# says that the fall 2014 transition was Oct 23 at 24:00.
# For future dates, guess the last Friday in March at 24:00 through
# the first Friday on or after October 21 at 00:00. This is consistent with
# the predictions in today's editions of the following URLs:
# http://www.timeanddate.com/time/change/gaza-strip/gaza
# http://www.timeanddate.com/time/change/west-bank/hebron
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
...@@ -2397,9 +2412,11 @@ Rule Palestine 2011 only - Apr 1 0:01 1:00 S ...@@ -2397,9 +2412,11 @@ Rule Palestine 2011 only - Apr 1 0:01 1:00 S
Rule Palestine 2011 only - Aug 1 0:00 0 - Rule Palestine 2011 only - Aug 1 0:00 0 -
Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Aug 30 0:00 1:00 S
Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2011 only - Sep 30 0:00 0 -
Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S Rule Palestine 2012 2014 - Mar lastThu 24:00 1:00 S
Rule Palestine 2012 only - Sep 21 1:00 0 - Rule Palestine 2012 only - Sep 21 1:00 0 -
Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - Rule Palestine 2013 only - Sep Fri>=21 0:00 0 -
Rule Palestine 2014 max - Oct Fri>=21 0:00 0 -
Rule Palestine 2015 max - Mar lastFri 24:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
......
test/sun/util/calendar/zi/tzdata/australasia
浏览文件 @ 87684bf9
...@@ -396,6 +396,7 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 ...@@ -396,6 +396,7 @@ 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 2000 Dec 23 # Guam
10:00 - ChST # Chamorro Standard Time 10:00 - ChST # Chamorro Standard Time
Link Pacific/Guam Pacific/Saipan # N Mariana Is
# Kiribati # Kiribati
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -411,12 +412,7 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 ...@@ -411,12 +412,7 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
14:00 - LINT 14:00 - LINT
# N Mariana Is # N Mariana Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See Pacific/Guam.
Zone Pacific/Saipan -14:17:00 - LMT 1844 Dec 31
9:43:00 - LMT 1901
9:00 - MPT 1969 Oct # N Mariana Is Time
10:00 - MPT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time
# Marshall Is # Marshall Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
...@@ -586,6 +582,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5 ...@@ -586,6 +582,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
-11:00 - NST 1967 Apr # N=Nome -11:00 - NST 1967 Apr # N=Nome
-11:00 - BST 1983 Nov 30 # B=Bering -11:00 - BST 1983 Nov 30 # B=Bering
-11:00 - SST # S=Samoa -11:00 - SST # S=Samoa
Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
# Samoa (formerly and also known as Western Samoa) # Samoa (formerly and also known as Western Samoa)
...@@ -767,23 +764,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901 ...@@ -767,23 +764,7 @@ Zone Pacific/Funafuti 11:56:52 - LMT 1901
# uninhabited # uninhabited
# Midway # Midway
# # See Pacific/Pago_Pago.
# From Mark Brader (2005-01-23):
# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
# reproduced a Pan American Airways timetable from 1936, for their weekly
# "Orient Express" flights between San Francisco and Manila, and connecting
# flights to Chicago and the US East Coast. As it uses some time zone
# designations that I've never seen before:....
# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I. H.L.T. Ar. 5:30P Sun.
# " 3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A "
#
Zone Pacific/Midway -11:49:28 - LMT 1901
-11:00 - NST 1956 Jun 3
-11:00 1:00 NDT 1956 Sep 2
-11:00 - NST 1967 Apr # N=Nome
-11:00 - BST 1983 Nov 30 # B=Bering
-11:00 - SST # S=Samoa
# Palmyra # Palmyra
# uninhabited since World War II; was probably like Pacific/Kiritimati # uninhabited since World War II; was probably like Pacific/Kiritimati
......
test/sun/util/calendar/zi/tzdata/europe
浏览文件 @ 87684bf9
...@@ -2423,7 +2423,7 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 ...@@ -2423,7 +2423,7 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T 4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T
3:00 Russia VOL%sT 1991 Mar 31 2:00s 3:00 Russia VOL%sT 1991 Mar 31 2:00s
4:00 - VOLT 1992 Mar 29 2:00s 4:00 - VOLT 1992 Mar 29 2:00s
3:00 Russia MSK 2011 Mar 27 2:00s 3:00 Russia MSK/MSD 2011 Mar 27 2:00s
4:00 - MSK 2014 Oct 26 2:00s 4:00 - MSK 2014 Oct 26 2:00s
3:00 - MSK 3:00 - MSK
......
test/sun/util/calendar/zi/tzdata/northamerica
浏览文件 @ 87684bf9
...@@ -2335,8 +2335,24 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 ...@@ -2335,8 +2335,24 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
# "...the new time zone will come into effect at two o'clock on the first Sunday # "...the new time zone will come into effect at two o'clock on the first Sunday
# of February, when we will have to advance the clock one hour from its current # of February, when we will have to advance the clock one hour from its current
# time..." # time..."
#
# Also, the new zone will not use DST. # Also, the new zone will not use DST.
#
# From Carlos Raúl Perasso (2015-02-02):
# The decree that modifies the Mexican Hour System Law has finally
# been published at the Diario Oficial de la Federación
# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
# It establishes 5 zones for Mexico:
# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
# includes most of Mexico, excluding what's mentioned below.
# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
# states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
# de Banderas which lies in Central Zone); Sinaloa and Sonora.
# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
# state of Baja California.
# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
# of Quintana Roo.
# 5- The islands, reefs and keys shall take their timezone from the
# longitude they are located at.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mexico 1939 only - Feb 5 0:00 1:00 D Rule Mexico 1939 only - Feb 5 0:00 1:00 D
...@@ -2531,13 +2547,8 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32 ...@@ -2531,13 +2547,8 @@ Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
############################################################################### ###############################################################################
# Anguilla # Anguilla
# See America/Port_of_Spain.
# Antigua and Barbuda # Antigua and Barbuda
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See America/Port_of_Spain.
Zone America/Antigua -4:07:12 - LMT 1912 Mar 2
-5:00 - EST 1951
-4:00 - AST
# Bahamas # Bahamas
# #
...@@ -2604,10 +2615,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton ...@@ -2604,10 +2615,7 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton
-4:00 US A%sT -4:00 US A%sT
# Cayman Is # Cayman Is
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # See America/Panama.
Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST
# Costa Rica # Costa Rica
...@@ -3130,6 +3138,7 @@ Zone America/Managua -5:45:08 - LMT 1890 ...@@ -3130,6 +3138,7 @@ Zone America/Managua -5:45:08 - LMT 1890
Zone America/Panama -5:18:08 - LMT 1890 Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST -5:00 - EST
Link America/Panama America/Cayman
# Puerto Rico # Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
......
test/sun/util/calendar/zi/tzdata/southamerica
浏览文件 @ 87684bf9
...@@ -1229,10 +1229,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 ...@@ -1229,10 +1229,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC) # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
# From Juan Correa (2015-01-28): # From Eduardo Romero Urra (2015-03-03):
# ... today the Ministry of Energy announced that Chile will drop DST, will keep # Today has been published officially that Chile will use the DST time
# "summer time" (UTC -3 / UTC -5) all year round.... # permanently until March 25 of 2017
# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html # http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
#
# From Paul Eggert (2015-03-03):
# For now, assume that the extension will persist indefinitely.
# NOTE: ChileAQ rules for Antarctic bases are stored separately in the # NOTE: ChileAQ rules for Antarctic bases are stored separately in the
# 'antarctica' file. # 'antarctica' file.
...@@ -1291,7 +1294,7 @@ Zone America/Santiago -4:42:46 - LMT 1890 ...@@ -1291,7 +1294,7 @@ Zone America/Santiago -4:42:46 - LMT 1890
-3:00 - CLT -3:00 - CLT
Zone Pacific/Easter -7:17:44 - LMT 1890 Zone Pacific/Easter -7:17:44 - LMT 1890
-7:17:28 - EMT 1932 Sep # Easter Mean Time -7:17:28 - EMT 1932 Sep # Easter Mean Time
-7:00 Chile EAS%sT 1982 Mar 13 3:00u # Easter Time -7:00 Chile EAS%sT 1982 Mar 14 3:00u # Easter Time
-6:00 Chile EAS%sT 2015 Apr 26 3:00u -6:00 Chile EAS%sT 2015 Apr 26 3:00u
-5:00 - EAST -5:00 - EAST
# #
...@@ -1626,6 +1629,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 ...@@ -1626,6 +1629,7 @@ Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2
# These all agree with Trinidad and Tobago since 1970. # These all agree with Trinidad and Tobago since 1970.
Link America/Port_of_Spain America/Anguilla Link America/Port_of_Spain America/Anguilla
Link America/Port_of_Spain America/Antigua
Link America/Port_of_Spain America/Dominica Link America/Port_of_Spain America/Dominica
Link America/Port_of_Spain America/Grenada Link America/Port_of_Spain America/Grenada
Link America/Port_of_Spain America/Guadeloupe Link America/Port_of_Spain America/Guadeloupe
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或