Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

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

8049343: (tz) Support tzdata2014g 

Reviewed-by: mfang, okutsu
上级 0241f76e
展开全部 显示空白变更内容
内联 并排
Showing with 5997 addition and 5961 deletion
make/data/tzdata/VERSION
浏览文件 @ fc7790e6
...@@ -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.
# #
tzdata2014c tzdata2014g
make/data/tzdata/africa
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/antarctica
浏览文件 @ fc7790e6
...@@ -21,19 +21,16 @@ ...@@ -21,19 +21,16 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# From Paul Eggert (1999-11-15): # From Paul Eggert (1999-11-15):
# To keep things manageable, we list only locations occupied year-round; see # To keep things manageable, we list only locations occupied year-round; see
# <a href="http://www.comnap.aq/comnap/comnap.nsf/P/Stations/">
# COMNAP - Stations and Bases # COMNAP - Stations and Bases
# </a> # http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
# and # and
# <a href="http://www.spri.cam.ac.uk/bob/periant.htm">
# Summary of the Peri-Antarctic Islands (1998-07-23) # Summary of the Peri-Antarctic Islands (1998-07-23)
# </a> # http://www.spri.cam.ac.uk/bob/periant.htm
# for information. # for information.
# Unless otherwise specified, we have no time zone information. # Unless otherwise specified, we have no time zone information.
# #
...@@ -78,19 +75,19 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S ...@@ -78,19 +75,19 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# Argentina - year-round bases # Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
# Esperanza, San Martin Land, -6323-05659, since 1952-12-17 # Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
# Jubany, Potter Peninsula, King George Island, -6414-0602320, since 1982-01 # Esperanza, Hope Bay, -6323-05659, since 1952-12-17
# Marambio, Seymour I, -6414-05637, since 1969-10-29 # Marambio, -6414-05637, since 1969-10-29
# Orcadas, Laurie I, -6016-04444, since 1904-02-22 # Orcadas, Laurie I, -6016-04444, since 1904-02-22
# San Martin, Debenham I, -6807-06708, since 1951-03-21 # San Martín, Barry I, -6808-06706, since 1951-03-21
# (except 1960-03 / 1976-03-21) # (except 1960-03 / 1976-03-21)
# Australia - territories # Australia - territories
# Heard Island, McDonald Islands (uninhabited) # Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered # previously sealers and scientific personnel wintered
# <a href="http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html">
# Margaret Turner reports # Margaret Turner reports
# </a> (1999-09-30) that they're UTC+5, with no DST; # http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
# (1999-09-30) that they're UTC+5, with no DST;
# presumably this is when they have visitors. # presumably this is when they have visitors.
# #
# year-round bases # year-round bases
...@@ -107,14 +104,10 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S ...@@ -107,14 +104,10 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# The changes occurred on 2009-10-18 at 02:00 (local times). # The changes occurred on 2009-10-18 at 02:00 (local times).
# #
# Government source: (Australian Antarctic Division) # Government source: (Australian Antarctic Division)
# <a href="http://www.aad.gov.au/default.asp?casid=37079">
# http://www.aad.gov.au/default.asp?casid=37079 # http://www.aad.gov.au/default.asp?casid=37079
# </a>
# #
# We have more background information here: # We have more background information here:
# <a href="http://www.timeanddate.com/news/time/antarctica-new-times.html">
# http://www.timeanddate.com/news/time/antarctica-new-times.html # http://www.timeanddate.com/news/time/antarctica-new-times.html
# </a>
# From Steffen Thorsen (2010-03-10): # From Steffen Thorsen (2010-03-10):
# We got these changes from the Australian Antarctic Division: ... # We got these changes from the Australian Antarctic Division: ...
...@@ -129,19 +122,16 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S ...@@ -129,19 +122,16 @@ Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S
# - Mawson station stays on UTC+5. # - Mawson station stays on UTC+5.
# #
# Background: # Background:
# <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html">
# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Casey 0 - zzz 1969 Zone Antarctica/Casey 0 - zzz 1969
8:00 - WST 2009 Oct 18 2:00 8:00 - AWST 2009 Oct 18 2:00
# Western (Aus) Standard Time # Australian Western Std Time
11:00 - CAST 2010 Mar 5 2:00 11:00 - CAST 2010 Mar 5 2:00 # Casey Time
# Casey Time 8:00 - AWST 2011 Oct 28 2:00
8:00 - WST 2011 Oct 28 2:00
11:00 - CAST 2012 Feb 21 17:00u 11:00 - CAST 2012 Feb 21 17:00u
8:00 - WST 8:00 - AWST
Zone Antarctica/Davis 0 - zzz 1957 Jan 13 Zone Antarctica/Davis 0 - zzz 1957 Jan 13
7:00 - DAVT 1964 Nov # Davis Time 7:00 - DAVT 1964 Nov # Davis Time
0 - zzz 1969 Feb 0 - zzz 1969 Feb
...@@ -151,28 +141,30 @@ Zone Antarctica/Davis 0 - zzz 1957 Jan 13 ...@@ -151,28 +141,30 @@ Zone Antarctica/Davis 0 - zzz 1957 Jan 13
5:00 - DAVT 2012 Feb 21 20:00u 5:00 - DAVT 2012 Feb 21 20:00u
7:00 - DAVT 7:00 - DAVT
Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
6:00 - MAWT 2009 Oct 18 2:00 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time
# Mawson Time
5:00 - MAWT 5:00 - MAWT
# References: # References:
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
# Casey Weather (1998-02-26) # Casey Weather (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html">
# Davis Station, Antarctica (1998-02-26) # Davis Station, Antarctica (1998-02-26)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
# <a href="http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html">
# Mawson Station, Antarctica (1998-02-25) # Mawson Station, Antarctica (1998-02-25)
# </a> # http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
# Belgium - year-round base
# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
# Brazil - year-round base # Brazil - year-round base
# Comandante Ferraz, King George Island, -6205+05824, since 1983/4 # Ferraz, King George Island, -6205+05824, since 1983/4
# Bulgaria - year-round base
# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
# Chile - year-round bases and towns # Chile - year-round bases and towns
# Escudero, South Shetland Is, -621157-0585735, since 1994 # Escudero, South Shetland Is, -621157-0585735, since 1994
# Presidente Eduadro Frei, King George Island, -6214-05848, since 1969-03-07 # Frei Montalva, King George Island, -6214-05848, since 1969-03-07
# General Bernardo O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02 # O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
# Capitan Arturo Prat, -6230-05941 # Prat, -6230-05941
# Villa Las Estrellas (a town), around the Frei base, since 1984-04-09 # Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
# These locations have always used Santiago time; use TZ='America/Santiago'. # These locations have always used Santiago time; use TZ='America/Santiago'.
...@@ -180,31 +172,35 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 ...@@ -180,31 +172,35 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 13
# Great Wall, King George Island, -6213-05858, since 1985-02-20 # Great Wall, King George Island, -6213-05858, since 1985-02-20
# Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26 # Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
# France - year-round bases # France - year-round bases (also see "France & Italy")
# #
# From Antoine Leca (1997-01-20): # From Antoine Leca (1997-01-20):
# Time data are from Nicole Pailleau at the IFRTP # Time data entries are from Nicole Pailleau at the IFRTP
# (French Institute for Polar Research and Technology). # (French Institute for Polar Research and Technology).
# She confirms that French Southern Territories and Terre Adelie bases # She confirms that French Southern Territories and Terre Adélie bases
# don't observe daylight saving time, even if Terre Adelie supplies came # don't observe daylight saving time, even if Terre Adélie supplies came
# from Tasmania. # from Tasmania.
# #
# French Southern Territories with year-round inhabitants # French Southern Territories with year-round inhabitants
# #
# Martin-de-Vivies Base, Amsterdam Island, -374105+0773155, since 1950 # Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
# Alfred-Faure Base, Crozet Islands, -462551+0515152, since 1964 # sealing & whaling stations operated variously 1802/1911+;
# Port-aux-Francais, Kerguelen Islands, -492110+0701303, since 1951; # see Indian/Reunion.
#
# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
# whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956 # whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
# #
# St Paul Island - near Amsterdam, uninhabited # St Paul Island - near Amsterdam, uninhabited
# fishing stations operated variously 1819/1931 # fishing stations operated variously 1819/1931
# #
# Zone NAME GMTOFF RULES FORMAT [UNTIL] # Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Francais Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français
5:00 - TFT # ISO code TF Time 5:00 - TFT # ISO code TF Time
# #
# year-round base in the main continent # year-round base in the main continent
# Dumont-d'Urville, Ile des Petrels, -6640+14001, since 1956-11 # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
# #
# Another base at Port-Martin, 50km east, began operation in 1947. # Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14. # It was destroyed by fire on 1952-01-14.
...@@ -214,20 +210,22 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947 ...@@ -214,20 +210,22 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
10:00 - PMT 1952 Jan 14 # Port-Martin Time 10:00 - PMT 1952 Jan 14 # Port-Martin Time
0 - zzz 1956 Nov 0 - zzz 1956 Nov
10:00 - DDUT # Dumont-d'Urville Time 10:00 - DDUT # Dumont-d'Urville Time
# Reference:
# <a href="http://en.wikipedia.org/wiki/Dumont_d'Urville_Station"> # France & Italy - year-round base
# Dumont d'Urville Station (2005-12-05) # Concordia, -750600+1232000, since 2005
# </a>
# Germany - year-round base # Germany - year-round base
# Georg von Neumayer, -7039-00815 # Neumayer III, -704080-0081602, since 2009
# India - year-round base # India - year-round bases
# Dakshin Gangotri, -7005+01200 # Bharati, -692428+0761114, since 2012
# Maitri, -704558+0114356, since 1989
# Italy - year-round base (also see "France & Italy")
# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
# Japan - year-round bases # Japan - year-round bases
# Dome Fuji, -7719+03942 # Syowa (also known as Showa), -690022+0393524, since 1957
# Syowa, -690022+0393524
# #
# From Hideyuki Suzuki (1999-02-06): # From Hideyuki Suzuki (1999-02-06):
# In all Japanese stations, +0300 is used as the standard time. # In all Japanese stations, +0300 is used as the standard time.
...@@ -239,11 +237,11 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947 ...@@ -239,11 +237,11 @@ Zone Antarctica/DumontDUrville 0 - zzz 1947
Zone Antarctica/Syowa 0 - zzz 1957 Jan 29 Zone Antarctica/Syowa 0 - zzz 1957 Jan 29
3:00 - SYOT # Syowa Time 3:00 - SYOT # Syowa Time
# See: # See:
# <a href="http://www.nipr.ac.jp/english/ara01.html">
# NIPR Antarctic Research Activities (1999-08-17) # NIPR Antarctic Research Activities (1999-08-17)
# </a> # http://www.nipr.ac.jp/english/ara01.html
# S Korea - year-round base # S Korea - year-round base
# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
# King Sejong, King George Island, -6213-05847, since 1988 # King Sejong, King George Island, -6213-05847, since 1988
# New Zealand - claims # New Zealand - claims
...@@ -292,6 +290,9 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12 ...@@ -292,6 +290,9 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# Poland - year-round base # Poland - year-round base
# Arctowski, King George Island, -620945-0582745, since 1977 # Arctowski, King George Island, -620945-0582745, since 1977
# Romania - year-bound base
# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
# Russia - year-round bases # Russia - year-round bases
# Bellingshausen, King George Island, -621159-0585337, since 1968-02-22 # Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
# Mirny, Davis coast, -6633+09301, since 1956-02 # Mirny, Davis coast, -6633+09301, since 1956-02
...@@ -301,8 +302,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12 ...@@ -301,8 +302,8 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# year-round from 1960/61 to 1992 # year-round from 1960/61 to 1992
# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
# <a href="http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP"> # From Craig Mundell (1994-12-15):
# From Craig Mundell (1994-12-15)</a>: # http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
# Vostok, which is one of the Russian stations, is set on the same # Vostok, which is one of the Russian stations, is set on the same
# time as Moscow, Russia. # time as Moscow, Russia.
# #
...@@ -317,7 +318,7 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12 ...@@ -317,7 +318,7 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 12
# #
# From Paul Eggert (2001-05-04): # From Paul Eggert (2001-05-04):
# This seems to be hopelessly confusing, so I asked Lee Hotz about it # This seems to be hopelessly confusing, so I asked Lee Hotz about it
# in person. He said that some Antartic locations set their local # in person. He said that some Antarctic locations set their local
# time so that noon is the warmest part of the day, and that this # time so that noon is the warmest part of the day, and that this
# changes during the year and does not necessarily correspond to mean # changes during the year and does not necessarily correspond to mean
# solar noon. So the Vostok time might have been whatever the clocks # solar noon. So the Vostok time might have been whatever the clocks
...@@ -329,9 +330,12 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec 16 ...@@ -329,9 +330,12 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec 16
# S Africa - year-round bases # S Africa - year-round bases
# Marion Island, -4653+03752 # Marion Island, -4653+03752
# Sanae, -7141-00250 # SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
# Ukraine - year-round base
# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
# UK # United Kingdom
# #
# British Antarctic Territories (BAT) claims # British Antarctic Territories (BAT) claims
# South Orkney Islands # South Orkney Islands
...@@ -387,7 +391,7 @@ Zone Antarctica/Palmer 0 - zzz 1965 ...@@ -387,7 +391,7 @@ Zone Antarctica/Palmer 0 - zzz 1965
# but that he found it more convenient to keep GMT+12 # but that he found it more convenient to keep GMT+12
# as supplies for the station were coming from McMurdo Sound, # as supplies for the station were coming from McMurdo Sound,
# which was on GMT+12 because New Zealand was on GMT+12 all year # which was on GMT+12 because New Zealand was on GMT+12 all year
# at that time (1957). (Source: Siple's book 90 degrees SOUTH.) # at that time (1957). (Source: Siple's book 90 Degrees South.)
# #
# From Susan Smith # From Susan Smith
# http://www.cybertours.com/whs/pole10.html # http://www.cybertours.com/whs/pole10.html
......
make/data/tzdata/asia
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/australasia
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/backward
浏览文件 @ fc7790e6
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# This file provides links between current names for time zones # This file provides links between current names for time zones
# and their old names. Many names changed in late 1993. # and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
Link Africa/Asmara Africa/Asmera Link Africa/Asmara Africa/Asmera
Link Africa/Bamako Africa/Timbuktu Link Africa/Abidjan Africa/Timbuktu
Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
Link America/Adak America/Atka Link America/Adak America/Atka
Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Buenos_Aires America/Buenos_Aires
...@@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin ...@@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Kolkata Asia/Calcutta Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking Link Asia/Shanghai Asia/Chongqing
Link Asia/Shanghai Asia/Chungking
Link Asia/Dhaka Asia/Dacca Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu Link Asia/Kathmandu Asia/Katmandu
Link Asia/Macau Asia/Macao Link Asia/Macau Asia/Macao
Link Asia/Ho_Chi_Minh Asia/Saigon Link Asia/Ho_Chi_Minh Asia/Saigon
......
make/data/tzdata/etcetera
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
...@@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC ...@@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file `backward', # but it belongs here, not in the file 'backward',
# as functions like gmtime load the "GMT" file to handle leap seconds properly. # as functions like gmtime load the "GMT" file to handle leap seconds properly.
# We want this to work even on installations that omit the other older names. # We want this to work even on installations that omit the other older names.
Link Etc/GMT GMT Link Etc/GMT GMT
......
make/data/tzdata/europe
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/factory
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
make/data/tzdata/iso3166.tab
浏览文件 @ fc7790e6
...@@ -26,21 +26,21 @@ ...@@ -26,21 +26,21 @@
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-05-27): # From Paul Eggert (2014-07-18):
# This file contains a table of two-letter country codes. Columns are
# separated by a single tab. Lines beginning with '#' are comments.
# Although all text currently uses ASCII encoding, this is planned to
# change to UTF-8 soon. The columns of the table are as follows:
# #
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 # ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
# #
# Columns are separated by a single tab.
# The table is sorted by country code. # The table is sorted by country code.
# #
# Lines beginning with `#' are comments.
#
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data appropriate for their practical needs. It is not intended
# to take or endorse any position on legal or territorial claims. # to take or endorse any position on legal or territorial claims.
......
make/data/tzdata/leapseconds
浏览文件 @ fc7790e6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# 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.
# #
# Allowance for leapseconds added to each timezone file. # Allowance for leap seconds added to each time zone file.
# This file is in the public domain. # This file is in the public domain.
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
# you should be able to pick up leap-seconds.list from a secondary NIST server. # you should be able to pick up leap-seconds.list from a secondary NIST server.
# For more about leap-seconds.list, please see # For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds # The NTP Timescale and Leap Seconds
# <http://www.eecis.udel.edu/~mills/leap.html>. # http://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation Service periodically uses leap seconds # The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1 # to keep UTC to within 0.9 s of UT1
......
make/data/tzdata/northamerica
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/pacificnew
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
make/data/tzdata/southamerica
浏览文件 @ fc7790e6
此差异已折叠。
make/data/tzdata/systemv
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
make/data/tzdata/zone.tab
浏览文件 @ fc7790e6
...@@ -21,39 +21,27 @@ ...@@ -21,39 +21,27 @@
# 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.
# #
# TZ zone descriptions # tz zone descriptions (deprecated version)
# #
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-08-14): # From Paul Eggert (2014-07-31):
# This file is intended as a backward-compatibility aid for older programs.
# New programs should use zone1970.tab. This file is like zone1970.tab (see
# zone1970.tab's comments), but with the following additional restrictions:
# #
# This file contains a table where each row stands for an area that is # 1. This file contains only ASCII characters.
# the intersection of a region identified by a country code and of a # 2. The first data column contains exactly one country code.
# zone where civil clocks have agreed since 1970. The columns of the
# table are as follows:
# #
# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'. # Because of (2), each row stands for an area that is the intersection
# 2. Latitude and longitude of the area's principal location # of a region identified by a country code and of a zone where civil
# in ISO 6709 sign-degrees-minutes-seconds format, # clocks have agreed since 1970; this is a narrower definition than
# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, # that of zone1970.tab.
# first latitude (+ is north), then longitude (+ is east).
# 3. Zone name used in value of TZ environment variable.
# Please see the 'Theory' file for how zone names are chosen.
# If multiple zones overlap a country, each has a row in the
# table, with column 1 being duplicated.
# 4. Comments; present if and only if the country has multiple rows.
#
# Columns are separated by a single tab.
# The table is sorted first by country, then an order within the country that
# (1) makes some geographical sense, and
# (2) puts the most populous areas first, where that does not contradict (1).
#
# Lines beginning with '#' are comments.
# #
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data entries appropriate for their practical needs. It is not
# to take or endorse any position on legal or territorial claims. # intended to take or endorse any position on legal or territorial claims.
# #
#country- #country-
#code coordinates TZ comments #code coordinates TZ comments
...@@ -72,7 +60,7 @@ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay ...@@ -72,7 +60,7 @@ AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay
AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills
AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula
AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
...@@ -151,7 +139,7 @@ CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did ...@@ -151,7 +139,7 @@ CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations
CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut
CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut
CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
...@@ -176,13 +164,10 @@ CH +4723+00832 Europe/Zurich ...@@ -176,13 +164,10 @@ CH +4723+00832 Europe/Zurich
CI +0519-00402 Africa/Abidjan CI +0519-00402 Africa/Abidjan
CK -2114-15946 Pacific/Rarotonga CK -2114-15946 Pacific/Rarotonga
CL -3327-07040 America/Santiago most locations CL -3327-07040 America/Santiago most locations
CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala CM +0403+00942 Africa/Douala
CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. CN +3114+12128 Asia/Shanghai Beijing Time
CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin CN +4348+08735 Asia/Urumqi Xinjiang Time
CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
CO +0436-07405 America/Bogota CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica CR +0956-08405 America/Costa_Rica
CU +2308-08222 America/Havana CU +2308-08222 America/Havana
...@@ -364,24 +349,26 @@ RE -2052+05528 Indian/Reunion ...@@ -364,24 +349,26 @@ RE -2052+05528 Indian/Reunion
RO +4426+02606 Europe/Bucharest RO +4426+02606 Europe/Bucharest
RS +4450+02030 Europe/Belgrade RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia
RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea
RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River
RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal
RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River
RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky
RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River
RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island
RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky
RU +5934+15048 Asia/Magadan Moscow+08 - Magadan RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is
RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
RW -0157+03004 Africa/Kigali RW -0157+03004 Africa/Kigali
SA +2438+04643 Asia/Riyadh SA +2438+04643 Asia/Riyadh
SB -0932+16012 Pacific/Guadalcanal SB -0932+16012 Pacific/Guadalcanal
...@@ -448,13 +435,13 @@ US +394421-1045903 America/Denver Mountain Time ...@@ -448,13 +435,13 @@ US +394421-1045903 America/Denver Mountain Time
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time US +340308-1181434 America/Los_Angeles Pacific Time
US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
US +611305-1495401 America/Anchorage Alaska Time US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands US +515248-1763929 America/Adak Aleutian Islands
US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island
US +211825-1575130 Pacific/Honolulu Hawaii US +211825-1575130 Pacific/Honolulu Hawaii
UY -3453-05611 America/Montevideo UY -3453-05611 America/Montevideo
UZ +3940+06648 Asia/Samarkand west Uzbekistan UZ +3940+06648 Asia/Samarkand west Uzbekistan
......
src/share/classes/sun/util/calendar/ZoneInfoFile.java
浏览文件 @ fc7790e6
...@@ -615,7 +615,9 @@ public final class ZoneInfoFile { ...@@ -615,7 +615,9 @@ public final class ZoneInfoFile {
// startTime=86400000 <= 24 hours // startTime=86400000 <= 24 hours
// This: startDayOfWeek=6 // This: startDayOfWeek=6
// startTime=0 // startTime=0
// Below is the workaround, it probably slows down everyone a little // Similar workaround needs to be applied to Africa/Cairo and
// its endDayOfWeek and endTime
// Below is the workarounds, it probably slows down everyone a little
if (params[2] == 6 && params[3] == 0 && if (params[2] == 6 && params[3] == 0 &&
(zoneId.equals("Asia/Amman") || (zoneId.equals("Asia/Amman") ||
zoneId.equals("Asia/Gaza") || zoneId.equals("Asia/Gaza") ||
...@@ -623,6 +625,13 @@ public final class ZoneInfoFile { ...@@ -623,6 +625,13 @@ public final class ZoneInfoFile {
params[2] = 5; params[2] = 5;
params[3] = 86400000; params[3] = 86400000;
} }
//endDayOfWeek and endTime workaround
if (params[7] == 6 && params[8] == 0 &&
(zoneId.equals("Africa/Cairo"))) {
params[7] = 5;
params[8] = 86400000;
}
} else if (nTrans > 0) { // only do this if there is something in table already } else if (nTrans > 0) { // only do this if there is something in table already
if (lastyear < LASTYEAR) { if (lastyear < LASTYEAR) {
// ZoneInfo has an ending entry for 2037 // ZoneInfo has an ending entry for 2037
......
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @ fc7790e6
...@@ -47,9 +47,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -47,9 +47,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String ACT[] = new String[] {"Acre Time", "ACT", String ACT[] = new String[] {"Acre Time", "ACT",
"Acre Summer Time", "ACST", "Acre Summer Time", "ACST",
"Acre Time", "ACT"}; "Acre Time", "ACT"};
String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST", String ADELAIDE[] = new String[] {"Australian Central Standard Time (South Australia)", "ACST",
"Central Summer Time (South Australia)", "CST", "Australian Central Daylight Time (South Australia)", "ACDT",
"Central Time (South Australia)", "CT"}; "Australian Central Time (South Australia)", "ACT"};
String AGT[] = new String[] {"Argentine Time", "ART", String AGT[] = new String[] {"Argentine Time", "ART",
"Argentine Summer Time", "ARST", "Argentine Summer Time", "ARST",
"Argentine Time", "ART"}; "Argentine Time", "ART"};
...@@ -71,12 +71,12 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -71,12 +71,12 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String BDT[] = new String[] {"Bangladesh Time", "BDT", String BDT[] = new String[] {"Bangladesh Time", "BDT",
"Bangladesh Summer Time", "BDST", "Bangladesh Summer Time", "BDST",
"Bangladesh Time", "BDT"}; "Bangladesh Time", "BDT"};
String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST", String BRISBANE[] = new String[] {"Australian Eastern Standard Time (Queensland)", "AEST",
"Eastern Summer Time (Queensland)", "EST", "Australian Eastern Daylight Time (Queensland)", "AEDT",
"Eastern Time (Queensland)", "ET"}; "Australian Eastern Time (Queensland)", "AET"};
String BROKEN_HILL[] = new String[] {"Central Standard Time (South Australia/New South Wales)", "CST", String BROKEN_HILL[] = new String[] {"Australian Central Standard Time (South Australia/New South Wales)", "ACST",
"Central Summer Time (South Australia/New South Wales)", "CST", "Australian Central Daylight Time (South Australia/New South Wales)", "ACDT",
"Central Time (South Australia/New South Wales)", "CT"}; "Australian Central Time (South Australia/New South Wales)", "ACT"};
String BRT[] = new String[] {"Brasilia Time", "BRT", String BRT[] = new String[] {"Brasilia Time", "BRT",
"Brasilia Summer Time", "BRST", "Brasilia Summer Time", "BRST",
"Brasilia Time", "BRT"}; "Brasilia Time", "BRT"};
...@@ -110,9 +110,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -110,9 +110,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String CUBA[] = new String[] {"Cuba Standard Time", "CST", String CUBA[] = new String[] {"Cuba Standard Time", "CST",
"Cuba Daylight Time", "CDT", "Cuba Daylight Time", "CDT",
"Cuba Time", "CT"}; "Cuba Time", "CT"};
String DARWIN[] = new String[] {"Central Standard Time (Northern Territory)", "CST", String DARWIN[] = new String[] {"Australian Central Standard Time (Northern Territory)", "ACST",
"Central Summer Time (Northern Territory)", "CST", "Australian Central Daylight Time (Northern Territory)", "ACDT",
"Central Time (Northern Territory)", "CT"}; "Australian Central Time (Northern Territory)", "ACT"};
String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT", String DUBLIN[] = new String[] {"Greenwich Mean Time", "GMT",
"Irish Summer Time", "IST", "Irish Summer Time", "IST",
"Irish Time", "IT"}; "Irish Time", "IT"};
...@@ -131,9 +131,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -131,9 +131,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String EST[] = new String[] {"Eastern Standard Time", "EST", String EST[] = new String[] {"Eastern Standard Time", "EST",
"Eastern Daylight Time", "EDT", "Eastern Daylight Time", "EDT",
"Eastern Time", "ET"}; "Eastern Time", "ET"};
String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST", String EST_NSW[] = new String[] {"Australian Eastern Standard Time (New South Wales)", "AEST",
"Eastern Summer Time (New South Wales)", "EST", "Australian Eastern Daylight Time (New South Wales)", "AEDT",
"Eastern Time (New South Wales)", "ET"}; "Australian Eastern Time (New South Wales)", "AET"};
String FET[] = new String[] {"Further-eastern European Time", "FET", String FET[] = new String[] {"Further-eastern European Time", "FET",
"Further-eastern European Summer Time", "FEST", "Further-eastern European Summer Time", "FEST",
"Further-eastern European Time", "FET"}; "Further-eastern European Time", "FET"};
...@@ -167,6 +167,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -167,6 +167,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String IRT[] = new String[] {"Iran Standard Time", "IRST", String IRT[] = new String[] {"Iran Standard Time", "IRST",
"Iran Daylight Time", "IRDT", "Iran Daylight Time", "IRDT",
"Iran Time", "IRT"}; "Iran Time", "IRT"};
String IRKT[] = new String[] {"Irkutsk Time", "IRKT",
"Irkutsk Summer Time", "IRKST",
"Irkutsk Time", "IRKT"};
String ISRAEL[] = new String[] {"Israel Standard Time", "IST", String ISRAEL[] = new String[] {"Israel Standard Time", "IST",
"Israel Daylight Time", "IDT", "Israel Daylight Time", "IDT",
"Israel Time", "IT"}; "Israel Time", "IT"};
...@@ -176,11 +179,14 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -176,11 +179,14 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String JST[] = new String[] {"Japan Standard Time", "JST", String JST[] = new String[] {"Japan Standard Time", "JST",
"Japan Daylight Time", "JDT", "Japan Daylight Time", "JDT",
"Japan Time", "JT"}; "Japan Time", "JT"};
String KRAT[] = new String[] {"Krasnoyarsk Time", "KRAT",
"Krasnoyarsk Summer Time", "KRAST",
"Krasnoyarsk Time", "KRAT"};
String KST[] = new String[] {"Korea Standard Time", "KST", String KST[] = new String[] {"Korea Standard Time", "KST",
"Korea Daylight Time", "KDT", "Korea Daylight Time", "KDT",
"Korea Time", "KT"}; "Korea Time", "KT"};
String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST", String LORD_HOWE[] = new String[] {"Lord Howe Standard Time", "LHST",
"Lord Howe Summer Time", "LHST", "Lord Howe Daylight Time", "LHDT",
"Lord Howe Time", "LHT"}; "Lord Howe Time", "LHT"};
String MHT[] = new String[] {"Marshall Islands Time", "MHT", String MHT[] = new String[] {"Marshall Islands Time", "MHT",
"Marshall Islands Summer Time", "MHST", "Marshall Islands Summer Time", "MHST",
...@@ -230,21 +236,15 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -230,21 +236,15 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String SGT[] = new String[] {"Singapore Time", "SGT", String SGT[] = new String[] {"Singapore Time", "SGT",
"Singapore Summer Time", "SGST", "Singapore Summer Time", "SGST",
"Singapore Time", "SGT"}; "Singapore Time", "SGT"};
String SLST[] = new String[] {"Greenwich Mean Time", "GMT", String TASMANIA[] = new String[] {"Australian Eastern Standard Time (Tasmania)", "AEST",
"Sierra Leone Summer Time", "SLST", "Australian Eastern Daylight Time (Tasmania)", "AEDT",
"Sierra Leone Time", "SLT"}; "Australian Eastern Time (Tasmania)", "AET"};
String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmania)", "EST",
"Eastern Summer Time (Tasmania)", "EST",
"Eastern Time (Tasmania)", "ET"};
String TMT[] = new String[] {"Turkmenistan Time", "TMT", String TMT[] = new String[] {"Turkmenistan Time", "TMT",
"Turkmenistan Summer Time", "TMST", "Turkmenistan Summer Time", "TMST",
"Turkmenistan Time", "TMT"}; "Turkmenistan Time", "TMT"};
String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT", String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT",
"Ulaanbaatar Summer Time", "ULAST", "Ulaanbaatar Summer Time", "ULAST",
"Ulaanbaatar Time", "ULAT"}; "Ulaanbaatar Time", "ULAT"};
String WART[] = new String[] {"Western Argentine Time", "WART",
"Western Argentine Summer Time", "WARST",
"Western Argentine Time", "WART"};
String WAT[] = new String[] {"Western African Time", "WAT", String WAT[] = new String[] {"Western African Time", "WAT",
"Western African Summer Time", "WAST", "Western African Summer Time", "WAST",
"Western African Time", "WAT"}; "Western African Time", "WAT"};
...@@ -254,27 +254,30 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -254,27 +254,30 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
String WIT[] = new String[] {"West Indonesia Time", "WIB", String WIT[] = new String[] {"West Indonesia Time", "WIB",
"West Indonesia Summer Time", "WIST", "West Indonesia Summer Time", "WIST",
"West Indonesia Time", "WIB"}; "West Indonesia Time", "WIB"};
String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST", String WST_AUS[] = new String[] {"Australian Western Standard Time", "AWST",
"Western Summer Time (Australia)", "WST", "Australian Western Daylight Time", "AWDT",
"Western Time (Australia)", "WT"}; "Australian Western Time", "AWT"};
String SAMOA[] = new String[] {"Samoa Standard Time", "SST", String SAMOA[] = new String[] {"Samoa Standard Time", "SST",
"Samoa Daylight Time", "SDT", "Samoa Daylight Time", "SDT",
"Samoa Time", "ST"}; "Samoa Time", "ST"};
String WST_SAMOA[] = new String[] {"West Samoa Time", "WST", String WST_SAMOA[] = new String[] {"West Samoa Standard Time", "WSST",
"West Samoa Daylight Time", "WSDT", "West Samoa Daylight Time", "WSDT",
"West Samoa Time", "WST"}; "West Samoa Time", "WST"};
String ChST[] = new String[] {"Chamorro Standard Time", "ChST", String ChST[] = new String[] {"Chamorro Standard Time", "ChST",
"Chamorro Daylight Time", "ChDT", "Chamorro Daylight Time", "ChDT",
"Chamorro Time", "ChT"}; "Chamorro Time", "ChT"};
String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", String VICTORIA[] = new String[] {"Australian Eastern Standard Time (Victoria)", "AEST",
"Eastern Summer Time (Victoria)", "EST", "Australian Eastern Daylight Time (Victoria)", "AEDT",
"Eastern Time (Victoria)", "ET"}; "Australian Eastern Time (Victoria)", "AET"};
String UTC[] = new String[] {"Coordinated Universal Time", "UTC", String UTC[] = new String[] {"Coordinated Universal Time", "UTC",
"Coordinated Universal Time", "UTC", "Coordinated Universal Time", "UTC",
"Coordinated Universal Time", "UTC"}; "Coordinated Universal Time", "UTC"};
String UZT[] = new String[] {"Uzbekistan Time", "UZT", String UZT[] = new String[] {"Uzbekistan Time", "UZT",
"Uzbekistan Summer Time", "UZST", "Uzbekistan Summer Time", "UZST",
"Uzbekistan Time", "UZT"}; "Uzbekistan Time", "UZT"};
String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
"Xinjiang Daylight Time", "XJDT",
"Xinjiang Time", "XJT"};
return new Object[][] { return new Object[][] {
{"America/Los_Angeles", PST}, {"America/Los_Angeles", PST},
...@@ -336,7 +339,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -336,7 +339,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Africa/Djibouti", EAT}, {"Africa/Djibouti", EAT},
{"Africa/Douala", WAT}, {"Africa/Douala", WAT},
{"Africa/El_Aaiun", WET}, {"Africa/El_Aaiun", WET},
{"Africa/Freetown", SLST}, {"Africa/Freetown", GMT},
{"Africa/Gaborone", CAT}, {"Africa/Gaborone", CAT},
{"Africa/Harare", CAT}, {"Africa/Harare", CAT},
{"Africa/Johannesburg", SAST}, {"Africa/Johannesburg", SAST},
...@@ -437,7 +440,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -437,7 +440,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Western Greenland Summer Time", "WGST", "Western Greenland Summer Time", "WGST",
"Western Greenland Time", "WGT"}}, "Western Greenland Time", "WGT"}},
{"America/Goose_Bay", AST}, {"America/Goose_Bay", AST},
{"America/Grand_Turk", EST}, {"America/Grand_Turk", AST},
{"America/Grenada", AST}, {"America/Grenada", AST},
{"America/Guadeloupe", AST}, {"America/Guadeloupe", AST},
{"America/Guatemala", CST}, {"America/Guatemala", CST},
...@@ -484,9 +487,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -484,9 +487,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"America/Mendoza", AGT}, {"America/Mendoza", AGT},
{"America/Menominee", CST}, {"America/Menominee", CST},
{"America/Merida", CST}, {"America/Merida", CST},
{"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", {"America/Metlakatla", PST},
"Metlakatla Daylight Time", "MeDT",
"Metlakatla Time", "MeT"}},
{"America/Mexico_City", CST}, {"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST", {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
"Pierre & Miquelon Daylight Time", "PMDT", "Pierre & Miquelon Daylight Time", "PMDT",
...@@ -555,8 +556,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -555,8 +556,8 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT", {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Time", "DDUT",
"Dumont-d'Urville Summer Time", "DDUST", "Dumont-d'Urville Summer Time", "DDUST",
"Dumont-d'Urville Time", "DDUT"}}, "Dumont-d'Urville Time", "DDUT"}},
{"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", {"Antarctica/Macquarie", new String[] {"Macquarie Island Standard Time", "MIST",
"Macquarie Island Summer Time", "MIST", "Macquarie Island Daylight Time", "MIDT",
"Macquarie Island Time", "MIST"}}, "Macquarie Island Time", "MIST"}},
{"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT", {"Antarctica/Mawson", new String[] {"Mawson Time", "MAWT",
"Mawson Summer Time", "MAWST", "Mawson Summer Time", "MAWST",
...@@ -607,6 +608,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -607,6 +608,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Brunei Summer Time", "BNST", "Brunei Summer Time", "BNST",
"Brunei Time", "BNT"}}, "Brunei Time", "BNT"}},
{"Asia/Calcutta", IST}, {"Asia/Calcutta", IST},
{"Asia/Chita", IRKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT", {"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
"Choibalsan Summer Time", "CHOST", "Choibalsan Summer Time", "CHOST",
"Choibalsan Time", "CHOT"}}, "Choibalsan Time", "CHOT"}},
...@@ -631,9 +633,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -631,9 +633,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Hovd", new String[] {"Hovd Time", "HOVT", {"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
"Hovd Summer Time", "HOVST", "Hovd Summer Time", "HOVST",
"Hovd Time", "HOVT"}}, "Hovd Time", "HOVT"}},
{"Asia/Irkutsk", new String[] {"Irkutsk Time", "IRKT", {"Asia/Irkutsk", IRKT},
"Irkutsk Summer Time", "IRKST",
"Irkutsk Time", "IRKT"}},
{"Asia/Istanbul", EET}, {"Asia/Istanbul", EET},
{"Asia/Jakarta", WIT}, {"Asia/Jakarta", WIT},
{"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT", {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT",
...@@ -646,7 +646,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -646,7 +646,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Petropavlovsk-Kamchatski Summer Time", "PETST", "Petropavlovsk-Kamchatski Summer Time", "PETST",
"Petropavlovsk-Kamchatski Time", "PETT"}}, "Petropavlovsk-Kamchatski Time", "PETT"}},
{"Asia/Karachi", PKT}, {"Asia/Karachi", PKT},
{"Asia/Kashgar", CTT}, {"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT}, {"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT}, {"Asia/Katmandu", NPT},
{"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT", {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
...@@ -654,9 +654,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -654,9 +654,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Khandyga Time", "YAKT"}}, "Khandyga Time", "YAKT"}},
{"Asia/Kolkata", IST}, {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT", {"Asia/Krasnoyarsk", KRAT},
"Krasnoyarsk Summer Time", "KRAST",
"Krasnoyarsk Time", "KRAT"}},
{"Asia/Kuala_Lumpur", MYT}, {"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT}, {"Asia/Kuching", MYT},
{"Asia/Kuwait", ARAST}, {"Asia/Kuwait", ARAST},
...@@ -671,7 +669,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -671,7 +669,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Philippines Time", "PHT"}}, "Philippines Time", "PHT"}},
{"Asia/Muscat", GST}, {"Asia/Muscat", GST},
{"Asia/Nicosia", EET}, {"Asia/Nicosia", EET},
{"Asia/Novokuznetsk", NOVT}, {"Asia/Novokuznetsk", KRAT},
{"Asia/Novosibirsk", NOVT}, {"Asia/Novosibirsk", NOVT},
{"Asia/Oral", new String[] {"Oral Time", "ORAT", {"Asia/Oral", new String[] {"Oral Time", "ORAT",
"Oral Summer Time", "ORAST", "Oral Summer Time", "ORAST",
...@@ -697,6 +695,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -697,6 +695,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Samarkand", UZT}, {"Asia/Samarkand", UZT},
{"Asia/Seoul", KST}, {"Asia/Seoul", KST},
{"Asia/Singapore", SGT}, {"Asia/Singapore", SGT},
{"Asia/Srednekolymsk", new String[] {"Srednekolymsk Time", "SRET",
"Srednekolymsk Daylight Time", "SREDT",
"Srednekolymsk Time", "SRET"}},
{"Asia/Taipei", CTT}, {"Asia/Taipei", CTT},
{"Asia/Tel_Aviv", ISRAEL}, {"Asia/Tel_Aviv", ISRAEL},
{"Asia/Tashkent", UZT}, {"Asia/Tashkent", UZT},
...@@ -709,7 +710,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -709,7 +710,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Asia/Ujung_Pandang", CIT}, {"Asia/Ujung_Pandang", CIT},
{"Asia/Ulaanbaatar", ULAT}, {"Asia/Ulaanbaatar", ULAT},
{"Asia/Ulan_Bator", ULAT}, {"Asia/Ulan_Bator", ULAT},
{"Asia/Urumqi", CTT}, {"Asia/Urumqi", XJT},
{"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT", {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT",
"Ust-Nera Summer Time", "VLAST", "Ust-Nera Summer Time", "VLAST",
"Ust-Nera Time", "VLAT"}}, "Ust-Nera Time", "VLAT"}},
...@@ -751,9 +752,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -751,9 +752,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Australia/Canberra", EST_NSW}, {"Australia/Canberra", EST_NSW},
{"Australia/Currie", EST_NSW}, {"Australia/Currie", EST_NSW},
{"Australia/Darwin", DARWIN}, {"Australia/Darwin", DARWIN},
{"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", {"Australia/Eucla", new String[] {"Australian Central Western Standard Time", "ACWST",
"Central Western Summer Time (Australia)", "CWST", "Australian Central Western Daylight Time", "ACWDT",
"Central Western Time (Australia)", "CWT"}}, "Australian Central Western Time", "ACWT"}},
{"Australia/Hobart", TASMANIA}, {"Australia/Hobart", TASMANIA},
{"Australia/LHI", LORD_HOWE}, {"Australia/LHI", LORD_HOWE},
{"Australia/Lindeman", BRISBANE}, {"Australia/Lindeman", BRISBANE},
...@@ -819,7 +820,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -819,7 +820,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Isle_of_Man", GMTBST}, {"Europe/Isle_of_Man", GMTBST},
{"Europe/Istanbul", EET}, {"Europe/Istanbul", EET},
{"Europe/Jersey", GMTBST}, {"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", FET}, {"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET}, {"Europe/Kiev", EET},
{"Europe/Lisbon", WET}, {"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET}, {"Europe/Ljubljana", CET},
...@@ -854,9 +855,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { ...@@ -854,9 +855,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Vatican", CET}, {"Europe/Vatican", CET},
{"Europe/Vienna", CET}, {"Europe/Vienna", CET},
{"Europe/Vilnius", EET}, {"Europe/Vilnius", EET},
{"Europe/Volgograd", new String[] {"Volgograd Time", "VOLT", {"Europe/Volgograd", MSK},
"Volgograd Summer Time", "VOLST",
"Volgograd Time", "VOLT"}},
{"Europe/Warsaw", CET}, {"Europe/Warsaw", CET},
{"Europe/Zagreb", CET}, {"Europe/Zagreb", CET},
{"Europe/Zaporozhye", EET}, {"Europe/Zaporozhye", EET},
......
test/java/time/test/java/time/format/TestZoneTextPrinterParser.java
浏览文件 @ fc7790e6
...@@ -138,7 +138,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser { ...@@ -138,7 +138,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
{"Asia/Taipei", "China Standard Time", preferred, Locale.ENGLISH, TextStyle.FULL}, {"Asia/Taipei", "China Standard Time", preferred, Locale.ENGLISH, TextStyle.FULL},
{"America/Chicago", "CST", none, Locale.ENGLISH, TextStyle.SHORT}, {"America/Chicago", "CST", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Taipei", "CST", preferred, Locale.ENGLISH, TextStyle.SHORT}, {"Asia/Taipei", "CST", preferred, Locale.ENGLISH, TextStyle.SHORT},
{"Australia/South", "CST", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, {"Australia/South", "ACST", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
{"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT}, {"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT}, {"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
}; };
......
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @ fc7790e6
...@@ -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.
# #
tzdata2014c tzdata2014g
test/sun/util/calendar/zi/tzdata/backward
浏览文件 @ fc7790e6
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# This file provides links between current names for time zones # This file provides links between current names for time zones
# and their old names. Many names changed in late 1993. # and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
Link Africa/Asmara Africa/Asmera Link Africa/Asmara Africa/Asmera
Link Africa/Bamako Africa/Timbuktu Link Africa/Abidjan Africa/Timbuktu
Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Argentina/Catamarca America/Argentina/ComodRivadavia
Link America/Adak America/Atka Link America/Adak America/Atka
Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Buenos_Aires America/Buenos_Aires
...@@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin ...@@ -50,8 +50,11 @@ Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole Link Pacific/Auckland Antarctica/South_Pole
Link Asia/Ashgabat Asia/Ashkhabad Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Kolkata Asia/Calcutta Link Asia/Kolkata Asia/Calcutta
Link Asia/Chongqing Asia/Chungking Link Asia/Shanghai Asia/Chongqing
Link Asia/Shanghai Asia/Chungking
Link Asia/Dhaka Asia/Dacca Link Asia/Dhaka Asia/Dacca
Link Asia/Shanghai Asia/Harbin
Link Asia/Urumqi Asia/Kashgar
Link Asia/Kathmandu Asia/Katmandu Link Asia/Kathmandu Asia/Katmandu
Link Asia/Macau Asia/Macao Link Asia/Macau Asia/Macao
Link Asia/Ho_Chi_Minh Asia/Saigon Link Asia/Ho_Chi_Minh Asia/Saigon
......
test/sun/util/calendar/zi/tzdata/etcetera
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
...@@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC ...@@ -37,7 +36,7 @@ Zone Etc/UTC 0 - UTC
Zone Etc/UCT 0 - UCT Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions, # The following link uses older naming conventions,
# but it belongs here, not in the file `backward', # but it belongs here, not in the file 'backward',
# as functions like gmtime load the "GMT" file to handle leap seconds properly. # as functions like gmtime load the "GMT" file to handle leap seconds properly.
# We want this to work even on installations that omit the other older names. # We want this to work even on installations that omit the other older names.
Link Etc/GMT GMT Link Etc/GMT GMT
......
test/sun/util/calendar/zi/tzdata/factory
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
test/sun/util/calendar/zi/tzdata/iso3166.tab
浏览文件 @ fc7790e6
...@@ -26,21 +26,21 @@ ...@@ -26,21 +26,21 @@
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
# #
# From Paul Eggert (2013-05-27): # From Paul Eggert (2014-07-18):
# This file contains a table of two-letter country codes. Columns are
# separated by a single tab. Lines beginning with '#' are comments.
# Although all text currently uses ASCII encoding, this is planned to
# change to UTF-8 soon. The columns of the table are as follows:
# #
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of # 1. ISO 3166-1 alpha-2 country code, current as of
# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 # ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
# 2. The usual English name for the coded region, # 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists. # chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables. # This is not the same as the English name in the ISO 3166 tables.
# #
# Columns are separated by a single tab.
# The table is sorted by country code. # The table is sorted by country code.
# #
# Lines beginning with `#' are comments.
#
# This table is intended as an aid for users, to help them select time # This table is intended as an aid for users, to help them select time
# zone data appropriate for their practical needs. It is not intended # zone data appropriate for their practical needs. It is not intended
# to take or endorse any position on legal or territorial claims. # to take or endorse any position on legal or territorial claims.
......
test/sun/util/calendar/zi/tzdata/leapseconds
浏览文件 @ fc7790e6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# 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.
# #
# Allowance for leapseconds added to each timezone file. # Allowance for leap seconds added to each time zone file.
# This file is in the public domain. # This file is in the public domain.
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
# you should be able to pick up leap-seconds.list from a secondary NIST server. # you should be able to pick up leap-seconds.list from a secondary NIST server.
# For more about leap-seconds.list, please see # For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds # The NTP Timescale and Leap Seconds
# <http://www.eecis.udel.edu/~mills/leap.html>. # http://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation Service periodically uses leap seconds # The International Earth Rotation Service periodically uses leap seconds
# to keep UTC to within 0.9 s of UT1 # to keep UTC to within 0.9 s of UT1
......
test/sun/util/calendar/zi/tzdata/pacificnew
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
test/sun/util/calendar/zi/tzdata/systemv
浏览文件 @ fc7790e6
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# 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.
# #
# <pre>
# This file is in the public domain, so clarified as of # This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson. # 2009-05-17 by Arthur David Olson.
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或