Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f72ca2c9
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f72ca2c9
编写于
11月 27, 2018
作者:
A
aefimov
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
510c13df
c9b7534c
变更
46
隐藏空白更改
内联
并排
Showing
46 changed file
with
1210 addition
and
358 deletion
+1210
-358
make/data/tzdata/VERSION
make/data/tzdata/VERSION
+1
-1
make/data/tzdata/africa
make/data/tzdata/africa
+50
-71
make/data/tzdata/antarctica
make/data/tzdata/antarctica
+2
-0
make/data/tzdata/asia
make/data/tzdata/asia
+267
-47
make/data/tzdata/australasia
make/data/tzdata/australasia
+11
-2
make/data/tzdata/backward
make/data/tzdata/backward
+3
-1
make/data/tzdata/etcetera
make/data/tzdata/etcetera
+3
-1
make/data/tzdata/europe
make/data/tzdata/europe
+67
-10
make/data/tzdata/factory
make/data/tzdata/factory
+4
-2
make/data/tzdata/leapseconds
make/data/tzdata/leapseconds
+18
-13
make/data/tzdata/northamerica
make/data/tzdata/northamerica
+17
-4
make/data/tzdata/pacificnew
make/data/tzdata/pacificnew
+2
-0
make/data/tzdata/southamerica
make/data/tzdata/southamerica
+33
-3
make/data/tzdata/systemv
make/data/tzdata/systemv
+2
-0
make/data/tzdata/zone.tab
make/data/tzdata/zone.tab
+7
-7
src/share/classes/java/time/chrono/HijrahEra.java
src/share/classes/java/time/chrono/HijrahEra.java
+17
-0
src/share/classes/java/time/chrono/JapaneseEra.java
src/share/classes/java/time/chrono/JapaneseEra.java
+7
-1
src/share/classes/java/time/chrono/MinguoEra.java
src/share/classes/java/time/chrono/MinguoEra.java
+20
-0
src/share/classes/java/time/chrono/ThaiBuddhistEra.java
src/share/classes/java/time/chrono/ThaiBuddhistEra.java
+20
-0
src/share/classes/sun/util/resources/TimeZoneNames.java
src/share/classes/sun/util/resources/TimeZoneNames.java
+3
-3
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
...share/classes/sun/util/resources/de/TimeZoneNames_de.java
+3
-3
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
...share/classes/sun/util/resources/es/TimeZoneNames_es.java
+3
-3
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
...share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
+3
-3
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
...share/classes/sun/util/resources/it/TimeZoneNames_it.java
+3
-3
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
...share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
+3
-3
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
...share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
+3
-3
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
...re/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
+3
-3
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
...share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
+3
-3
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
+3
-3
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
+3
-3
test/java/time/test/java/time/chrono/TestEraDisplayName.java
test/java/time/test/java/time/chrono/TestEraDisplayName.java
+139
-0
test/sun/util/calendar/zi/tzdata/VERSION
test/sun/util/calendar/zi/tzdata/VERSION
+1
-1
test/sun/util/calendar/zi/tzdata/africa
test/sun/util/calendar/zi/tzdata/africa
+50
-71
test/sun/util/calendar/zi/tzdata/antarctica
test/sun/util/calendar/zi/tzdata/antarctica
+2
-0
test/sun/util/calendar/zi/tzdata/asia
test/sun/util/calendar/zi/tzdata/asia
+267
-47
test/sun/util/calendar/zi/tzdata/australasia
test/sun/util/calendar/zi/tzdata/australasia
+11
-2
test/sun/util/calendar/zi/tzdata/backward
test/sun/util/calendar/zi/tzdata/backward
+3
-1
test/sun/util/calendar/zi/tzdata/etcetera
test/sun/util/calendar/zi/tzdata/etcetera
+3
-1
test/sun/util/calendar/zi/tzdata/europe
test/sun/util/calendar/zi/tzdata/europe
+67
-10
test/sun/util/calendar/zi/tzdata/factory
test/sun/util/calendar/zi/tzdata/factory
+4
-2
test/sun/util/calendar/zi/tzdata/leapseconds
test/sun/util/calendar/zi/tzdata/leapseconds
+18
-13
test/sun/util/calendar/zi/tzdata/northamerica
test/sun/util/calendar/zi/tzdata/northamerica
+17
-4
test/sun/util/calendar/zi/tzdata/pacificnew
test/sun/util/calendar/zi/tzdata/pacificnew
+2
-0
test/sun/util/calendar/zi/tzdata/southamerica
test/sun/util/calendar/zi/tzdata/southamerica
+33
-3
test/sun/util/calendar/zi/tzdata/systemv
test/sun/util/calendar/zi/tzdata/systemv
+2
-0
test/sun/util/calendar/zi/tzdata/zone.tab
test/sun/util/calendar/zi/tzdata/zone.tab
+7
-7
未找到文件。
make/data/tzdata/VERSION
浏览文件 @
f72ca2c9
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2018
e
tzdata2018
g
make/data/tzdata/africa
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Africa and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -29,7 +31,7 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (201
7-04-09
):
# From Paul Eggert (201
8-05-27
):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...
...
@@ -74,13 +76,15 @@
# I vaguely recall 'WAT' also being used for -01 in the past but
# cannot now come up with solid citations.
#
# I invented the following abbreviations
; corrections are welcome!
# +02 WAST West Africa Summer Time
(no longer used)
# +03 CAST Central Africa Summer Time
(no longer used)
# +03 SAST South Africa Summer Time
(no longer used)
# I invented the following abbreviations
in the 1990s:
# +02 WAST West Africa Summer Time
# +03 CAST Central Africa Summer Time
# +03 SAST South Africa Summer Time
# +03 EAT East Africa Time
# 'EAT' also seems to have caught on; the others are rare but are paired
# with better-attested non-DST abbreviations.
# 'EAT' seems to have caught on and is in current timestamps, and though
# the other abbreviations are rarer and are only in past timestamps,
# they are paired with better-attested non-DST abbreviations.
# Corrections are welcome.
# Algeria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
...
...
@@ -385,6 +389,13 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
# Eritrea
# Ethiopia
# See Africa/Nairobi.
#
# Unfortunately tzdb records only Western clock time in use in Ethiopia,
# as the tzdb format is not up to properly recording a common Ethiopian
# timekeeping practice that is based on solar time. See:
# Mortada D. If you have a meeting in Ethiopia, you'd better double
# check the time. PRI's The World. 2015-01-30 15:15 -05.
# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
# Gabon
# See Africa/Lagos.
...
...
@@ -856,94 +867,61 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
# with the patch.
# From Paul Eggert (2015-06-08):
# For now, guess that later spring and fall transitions will use 2015's rules,
# and guess that Morocco will switch to standard time at 03:00 the last
# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
# Ramadan. To implement this, transition dates for 2016 through 2037 were
# determined by running the following program under GNU Emacs 24.3, with the
# results integrated by hand into the table below.
# (let ((islamic-year 1437))
# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
# (sunday 0))
# (while (/= sunday (mod (setq a (1- a)) 7)))
# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
# (insert
# (format
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
# From Mohamed Essedik Najd (2018-10-26):
# Today, a Moroccan government council approved the perpetual addition
# of 60 minutes to the regular Moroccan timezone.
# From Brian Inglis (2018-10-26):
# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
Rule Morocco 1939 only - Sep 12 0:00 1:00 -
Rule Morocco 1939 only - Nov 19 0:00 0 -
Rule Morocco 1940 only - Feb 25 0:00 1:00
S
Rule Morocco 1940 only - Feb 25 0:00 1:00
-
Rule Morocco 1945 only - Nov 18 0:00 0 -
Rule Morocco 1950 only - Jun 11 0:00 1:00
S
Rule Morocco 1950 only - Jun 11 0:00 1:00
-
Rule Morocco 1950 only - Oct 29 0:00 0 -
Rule Morocco 1967 only - Jun 3 12:00 1:00
S
Rule Morocco 1967 only - Jun 3 12:00 1:00
-
Rule Morocco 1967 only - Oct 1 0:00 0 -
Rule Morocco 1974 only - Jun 24 0:00 1:00
S
Rule Morocco 1974 only - Jun 24 0:00 1:00
-
Rule Morocco 1974 only - Sep 1 0:00 0 -
Rule Morocco 1976 1977 - May 1 0:00 1:00
S
Rule Morocco 1976 1977 - May 1 0:00 1:00
-
Rule Morocco 1976 only - Aug 1 0:00 0 -
Rule Morocco 1977 only - Sep 28 0:00 0 -
Rule Morocco 1978 only - Jun 1 0:00 1:00
S
Rule Morocco 1978 only - Jun 1 0:00 1:00
-
Rule Morocco 1978 only - Aug 4 0:00 0 -
Rule Morocco 2008 only - Jun 1 0:00 1:00
S
Rule Morocco 2008 only - Jun 1 0:00 1:00
-
Rule Morocco 2008 only - Sep 1 0:00 0 -
Rule Morocco 2009 only - Jun 1 0:00 1:00
S
Rule Morocco 2009 only - Jun 1 0:00 1:00
-
Rule Morocco 2009 only - Aug 21 0:00 0 -
Rule Morocco 2010 only - May 2 0:00 1:00
S
Rule Morocco 2010 only - May 2 0:00 1:00
-
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00
S
Rule Morocco 2011 only - Apr 3 0:00 1:00
-
Rule Morocco 2011 only - Jul 31 0:00 0 -
Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00
S
Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00
-
Rule Morocco 2012 only - Jul 20 3:00 0 -
Rule Morocco 2012 only - Aug 20 2:00 1:00
S
Rule Morocco 2012 only - Aug 20 2:00 1:00
-
Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00
S
Rule Morocco 2013
max
- Oct lastSun 3:00 0 -
Rule Morocco 2014 20
21 - Mar lastSun 2:00 1:00 S
Rule Morocco 2013 only - Aug 10 2:00 1:00
-
Rule Morocco 2013
2018
- Oct lastSun 3:00 0 -
Rule Morocco 2014 20
18 - Mar lastSun 2:00 1:00 -
Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00
S
Rule Morocco 2014 only - Aug 2 2:00 1:00
-
Rule Morocco 2015 only - Jun 14 3:00 0 -
Rule Morocco 2015 only - Jul 19 2:00 1:00
S
Rule Morocco 2015 only - Jul 19 2:00 1:00
-
Rule Morocco 2016 only - Jun 5 3:00 0 -
Rule Morocco 2016 only - Jul 10 2:00 1:00
S
Rule Morocco 2016 only - Jul 10 2:00 1:00
-
Rule Morocco 2017 only - May 21 3:00 0 -
Rule Morocco 2017 only - Jul 2 2:00 1:00
S
Rule Morocco 2017 only - Jul 2 2:00 1:00
-
Rule Morocco 2018 only - May 13 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 S
Rule Morocco 2019 only - May 5 3:00 0 -
Rule Morocco 2019 only - Jun 9 2:00 1:00 S
Rule Morocco 2020 only - Apr 19 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 S
Rule Morocco 2021 only - Apr 11 3:00 0 -
Rule Morocco 2021 only - May 16 2:00 1:00 S
Rule Morocco 2022 only - May 8 2:00 1:00 S
Rule Morocco 2023 only - Apr 23 2:00 1:00 S
Rule Morocco 2024 only - Apr 14 2:00 1:00 S
Rule Morocco 2025 only - Apr 6 2:00 1:00 S
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
Rule Morocco 2036 only - Oct 19 3:00 0 -
Rule Morocco 2037 only - Oct 4 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
0:00 Morocco WE%sT
0:00 Morocco +00/+01 1984 Mar 16
1:00 - +01 1986
0:00 Morocco +00/+01 2018 Oct 27
1:00 - +01
# Western Sahara
#
...
...
@@ -958,7 +936,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
-1:00 - -01 1976 Apr 14
0:00 Morocco WE%sT
0:00 Morocco +00/+01 2018 Oct 27
1:00 - +01
# Mozambique
#
...
...
make/data/tzdata/antarctica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Antarctica and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
make/data/tzdata/asia
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Asia and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -29,7 +31,7 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (201
7-01-13
):
# From Paul Eggert (201
8-06-19
):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...
...
@@ -58,7 +60,8 @@
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
#
# The following alphabetic abbreviations appear in these tables:
# The following alphabetic abbreviations appear in these tables
# (corrections are welcome):
# std dst
# LMT Local Mean Time
# 2:00 EET EEST Eastern European Time
...
...
@@ -67,11 +70,13 @@
# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
# 8:00 PST PDT* Philippine Standard Time
# 8:30 KST KDT Korea when at +0830
# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea when at +09
# 9:30 ACST Australian Central Standard Time
# *I invented the abbreviation PDT; see "Philippines" below.
# Otherwise, these tables typically use numeric abbreviations like +03
# and +0330 for integer hour and minute UT offsets. Although earlier
# editions invented alphabetic time zone abbreviations for every
...
...
@@ -304,6 +309,29 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
# China
# From Paul Eggert (2018-10-02):
# The following comes from Table 1 of:
# Li Yu. Research on the daylight saving movement in 1940s Shanghai.
# Nanjing Journal of Social Sciences. 2014;(2):144-50.
# http://oversea.cnki.net/kns55/detail.aspx?dbname=CJFD2014&filename=NJSH201402020
# The table lists dates only; I am guessing 00:00 and 24:00 transition times.
# Also, the table lists the planned end of DST in 1949, but the corresponding
# zone line cuts this off on May 28, when the Communists took power.
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Shang 1940 only - Jun 1 0:00 1:00 D
Rule Shang 1940 only - Oct 12 24:00 0 S
Rule Shang 1941 only - Mar 15 0:00 1:00 D
Rule Shang 1941 only - Nov 1 24:00 0 S
Rule Shang 1942 only - Jan 31 0:00 1:00 D
Rule Shang 1945 only - Sep 1 24:00 0 S
Rule Shang 1946 only - May 15 0:00 1:00 D
Rule Shang 1946 only - Sep 30 24:00 0 S
Rule Shang 1947 only - Apr 15 0:00 1:00 D
Rule Shang 1947 only - Oct 31 24:00 0 S
Rule Shang 1948 1949 - May 1 0:00 1:00 D
Rule Shang 1948 1949 - Sep 30 24:00 0 S #plan
# From Guy Harris:
# People's Republic of China. Yes, they really have only one time zone.
...
...
@@ -330,18 +358,33 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
# time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
# observing daylight saving time in 1986.
# From Paul Eggert (2014-06-30):
# Shanks & Pottenger have China switching to a single time zone in 1980, but
# this doesn't seem to be correct. They also write that China observed summer
# DST from 1986 through 1991, which seems to match the above commentary, so
# go with them for DST rules as follows:
# From P Chan (2018-05-07):
# The start and end time of DST in China [from 1986 on] should be 2:00
# (i.e. 2:00 to 3:00 at the start and 2:00 to 1:00 at the end)....
# Government notices about summer time:
#
# 1986-04-12 http://www.zj.gov.cn/attach/zfgb/198608.pdf p.21-22
# (To establish summer time from 1986. On 4 May, set the clocks ahead one hour
# at 2 am. On 14 September, set the clocks backward one hour at 2 am.)
#
# 1987-02-15 http://www.gov.cn/gongbao/shuju/1987/gwyb198703.pdf p.114
# (Summer time in 1987 to start from 12 April until 13 September)
#
# 1987-09-09 http://www.gov.cn/gongbao/shuju/1987/gwyb198721.pdf p.709
# (From 1988, summer time to start from 2 am of the first Sunday of mid-April
# until 2 am of the first Sunday of mid-September)
#
# 1992-03-03 http://www.gov.cn/gongbao/shuju/1992/gwyb199205.pdf p.152
# (To suspend summer time from 1992)
#
# The first page of People's Daily on 12 April 1988 stating that summer time
# to begin on 17 April.
# http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Shang 1940 only - Jun 3 0:00 1:00 D
Rule Shang 1940 1941 - Oct 1 0:00 0 S
Rule Shang 1941 only - Mar 16 0:00 1:00 D
Rule PRC 1986 only - May 4 0:00 1:00 D
Rule PRC 1986 1991 - Sep Sun>=11 0:00 0 S
Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
Rule PRC 1986 only - May 4 2:00 1:00 D
Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
# From Anthony Fok (2001-12-20):
# BTW, I did some research on-line and found some info regarding these five
...
...
@@ -363,10 +406,11 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
# Alois Treindl kindly sent me translations of the following two sources:
#
# (1)
# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
# Guo Qing
-
sheng (National Time-Service Center, CAS, Xi'an 710600, China)
# Beijing Time at the Beginning of the PRC
# China Historical Materials of Science and Technology
# (Zhongguo ke ji shi liao, 中国科技史料), Vol. 24, No. 1 (2003)
# (Zhongguo ke ji shi liao, 中国科技史料). 2003;24(1):5-9.
# http://oversea.cnki.net/kcms/detail/detail.aspx?filename=ZGKS200301000&dbname=CJFD2003
# It gives evidence that at the beginning of the PRC, Beijing time was
# officially apparent solar time! However, Guo also says that the
# evidence is dubious, as the relevant institute of astronomy had not
...
...
@@ -543,7 +587,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Beijing time, used throughout China; represented by Shanghai.
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949
8:00 Shang C%sT 1949
May 28
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
...
...
@@ -772,24 +816,140 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
8:00 Taiwan C%sT
# Macau (Macao, Aomen)
#
# From P Chan (2018-05-10):
# * LegisMac
# http://legismac.safp.gov.mo/legismac/descqry/Descqry.jsf?lang=pt
# A database for searching titles of legal documents of Macau in
# Chinese and Portuguese. The term "HORÁRIO DE VERÃO" can be used for
# searching decrees about summer time.
# * Archives of Macao
# http://www.archives.gov.mo/en/bo/
# It contains images of old official gazettes.
# * The Macao Meteorological and Geophysical Bureau have a page listing the
# summer time history. But it is not complete and has some mistakes.
# http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
# Macau adopted GMT+8 on 30 Oct 1904 to follow Hong Kong. Clocks were
# advanced by 25 minutes and 50 seconds. Which means the LMT used was
# +7:34:10. As stated in the "Portaria No. 204" dated 21 October 1904
# and published in the Official Gazette on 29 October 1904.
# http://igallery.icm.gov.mo/Images/Archives/BO/MO_AH_PUB_BO_1904_10/MO_AH_PUB_BO_1904_10_00025_Grey.JPG
#
# Therefore the 1911 decree of Portugal did not change time in Macau.
#
# From LegisMac, here is a list of decrees that changed the time ...
# [Decree Gazette-no. date; titles omitted in this quotation]
# DIL 732 BOCM 51 1941.12.20
# DIL 764 BOCM 9S 1942.04.30
# DIL 781 BOCM 21 1942.10.10
# PT 3434 BOCM 8S 1943.04.17
# PT 3504 BOCM 20 1943.09.25
# PT 3843 BOCM 39 1945.09.29
# PT 3961 BOCM 17 1946.04.27
# PT 4026 BOCM 39 1946.09.28
# PT 4153 BOCM 16 1947.04.10
# PT 4271 BOCM 48 1947.11.29
# PT 4374 BOCM 18 1948.05.01
# PT 4465 BOCM 44 1948.10.30
# PT 4590 BOCM 14 1949.04.02
# PT 4666 BOCM 44 1949.10.29
# PT 4771 BOCM 12 1950.03.25
# PT 4838 BOCM 43 1950.10.28
# PT 4946 BOCM 12 1951.03.24
# PT 5025 BO 43 1951.10.27
# PT 5149 BO 14 1952.04.05
# PT 5251 BO 43 1952.10.25
# PT 5366 BO 13 1953.03.28
# PT 5444 BO 44 1953.10.31
# PT 5540 BO 12 1954.03.20
# PT 5589 BO 44 1954.10.30
# PT 5676 BO 12 1955.03.19
# PT 5739 BO 45 1955.11.05
# PT 5823 BO 11 1956.03.17
# PT 5891 BO 44 1956.11.03
# PT 5981 BO 12 1957.03.23
# PT 6064 BO 43 1957.10.26
# PT 6172 BO 12 1958.03.22
# PT 6243 BO 43 1958.10.25
# PT 6341 BO 12 1959.03.21
# PT 6411 BO 43 1959.10.24
# PT 6514 BO 11 1960.03.12
# PT 6584 BO 44 1960.10.29
# PT 6721 BO 10 1961.03.11
# PT 6815 BO 43 1961.10.28
# PT 6947 BO 10 1962.03.10
# PT 7080 BO 43 1962.10.27
# PT 7218 BO 12 1963.03.23
# PT 7340 BO 43 1963.10.26
# PT 7491 BO 11 1964.03.14
# PT 7664 BO 43 1964.10.24
# PT 7846 BO 15 1965.04.10
# PT 7979 BO 42 1965.10.16
# PT 8146 BO 15 1966.04.09
# PT 8252 BO 41 1966.10.08
# PT 8429 BO 15 1967.04.15
# PT 8540 BO 41 1967.10.14
# PT 8735 BO 15 1968.04.13
# PT 8860 BO 41 1968.10.12
# PT 9035 BO 16 1969.04.19
# PT 9156 BO 42 1969.10.18
# PT 9328 BO 15 1970.04.11
# PT 9418 BO 41 1970.10.10
# PT 9587 BO 14 1971.04.03
# PT 9702 BO 41 1971.10.09
# PT 38-A/72 BO 14 1972.04.01
# PT 126-A/72 BO 41 1972.10.07
# PT 61/73 BO 14 1973.04.07
# PT 182/73 BO 40 1973.10.06
# PT 282/73 BO 51 1973.12.22
# PT 177/74 BO 41 1974.10.12
# PT 51/75 BO 15 1975.04.12
# PT 173/75 BO 41 1975.10.11
# PT 67/76/M BO 14 1976.04.03
# PT 169/76/M BO 41 1976.10.09
# PT 78/79/M BO 19 1979.05.12
# PT 166/79/M BO 42 1979.10.20
# Note that DIL 732 does not belong to "HORÁRIO DE VERÃO" according to
# LegisMac.... Note that between 1942 and 1945, the time switched
# between GMT+9 and GMT+10. Also in 1965 and 1965 the DST ended at 2:30am.
# From Paul Eggert (2018-05-10):
# The 1904 decree says that Macau changed from the meridian of
# Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Macau 1961 1962 - Mar Sun>=16 3:30 1:00 D
Rule Macau 1961 1964 - Nov Sun>=1 3:30 0 S
Rule Macau 1963 only - Mar Sun>=16 0:00 1:00 D
Rule Macau 1964 only - Mar Sun>=16 3:30 1:00 D
Rule Macau 1965 only - Mar Sun>=16 0:00 1:00 D
Rule Macau 1965 only - Oct 31 0:00 0 S
Rule Macau 1966 1971 - Apr Sun>=16 3:30 1:00 D
Rule Macau 1966 1971 - Oct Sun>=16 3:30 0 S
Rule Macau 1972 1974 - Apr Sun>=15 0:00 1:00 D
Rule Macau 1972 1973 - Oct Sun>=15 0:00 0 S
Rule Macau 1974 1977 - Oct Sun>=15 3:30 0 S
Rule Macau 1975 1977 - Apr Sun>=15 3:30 1:00 D
Rule Macau 1978 1980 - Apr Sun>=15 0:00 1:00 D
Rule Macau 1978 1980 - Oct Sun>=15 0:00 0 S
# See Europe/Lisbon for info about the 1912 transition.
Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
Rule Macau 1942 only - Nov 17 23:00 0 -
Rule Macau 1943 only - Sep 30 23:00 0 S
Rule Macau 1946 only - Apr 30 23:00s 1:00 D
Rule Macau 1946 only - Sep 30 23:00s 0 S
Rule Macau 1947 only - Apr 19 23:00s 1:00 D
Rule Macau 1947 only - Nov 30 23:00s 0 S
Rule Macau 1948 only - May 2 23:00s 1:00 D
Rule Macau 1948 only - Oct 31 23:00s 0 S
Rule Macau 1949 1950 - Apr Sat>=1 23:00s 1:00 D
Rule Macau 1949 1950 - Oct lastSat 23:00s 0 S
Rule Macau 1951 only - Mar 31 23:00s 1:00 D
Rule Macau 1951 only - Oct 28 23:00s 0 S
Rule Macau 1952 1953 - Apr Sat>=1 23:00s 1:00 D
Rule Macau 1952 only - Nov 1 23:00s 0 S
Rule Macau 1953 1954 - Oct lastSat 23:00s 0 S
Rule Macau 1954 1956 - Mar Sat>=17 23:00s 1:00 D
Rule Macau 1955 only - Nov 5 23:00s 0 S
Rule Macau 1956 1964 - Nov Sun>=1 03:30 0 S
Rule Macau 1957 1964 - Mar Sun>=18 03:30 1:00 D
Rule Macau 1965 1973 - Apr Sun>=16 03:30 1:00 D
Rule Macau 1965 1966 - Oct Sun>=16 02:30 0 S
Rule Macau 1967 1976 - Oct Sun>=16 03:30 0 S
Rule Macau 1973 only - Dec 30 03:30 1:00 D
Rule Macau 1975 1976 - Apr Sun>=16 03:30 1:00 D
Rule Macau 1979 only - May 13 03:30 1:00 D
Rule Macau 1979 only - Oct Sun>=16 03:30 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Macau 7:34:20 - LMT 1911 Dec 31 16:00u
Zone Asia/Macau 7:34:10 - LMT 1904 Oct 30
8:00 - CST 1941 Dec 21 23:00
9:00 Macau +09/+10 1945 Sep 30 24:00
8:00 Macau C%sT
...
...
@@ -1494,9 +1654,29 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm
# ... In summary, it is written as follows. From 24:00 on the first Saturday
# in May, until 0:00 on the day after the second Saturday in September.
# From Phake Nick (2018-09-27):
# [T]he webpage authored by National Astronomical Observatory of Japan
# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EF.html
# ... mentioned that using Showa 23 (year 1948) as example, 13pm of September
# 11 in summer time will equal to 0am of September 12 in standard time.
# It cited a document issued by the Liaison Office which briefly existed
# during the postwar period of Japan, where the detail on implementation
# of the summer time is described in the document.
# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EFB2C6BBFEB9EFA4CEBCC2BBDCA4CBA4C4A4A4A4C6.pdf
# The text in the document do instruct a fall back to occur at
# September 11, 13pm in summer time, while ordinary citizens can
# change the clock before they sleep.
#
# From Paul Eggert (2018-09-27):
# This instruction is equivalent to "Sat>=8 25:00", so use that. zic treats
# it like "Sun>=9 01:00", which is not quite the same but is the best we can
# do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
# which should be safe now.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
Rule Japan 1948 1951 - Sep Sun>=9
0
:00 0 S
Rule Japan 1948 1951 - Sep Sun>=9
1
:00 0 S
Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D
...
...
@@ -1878,7 +2058,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
5:00 - +05
# Mangghystaū (KZ-MAN)
# Aqtau was not founded until 1963, but it represents an inhabited region,
# so include time
stamps before 1963.
# so include timestamps before 1963.
Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Oct 1
...
...
@@ -2018,6 +2198,10 @@ Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
# Assembly, as published in Rodong Sinmun.
# From Tim Parenti (2018-04-29):
# It appears to be the front page story at the top in the right-most column.
#
# From Paul Eggert (2018-05-04):
# The BBC reported that the transition was from 23:30 to 24:00 today.
# https://www.bbc.com/news/world-asia-44010705
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
...
...
@@ -2030,7 +2214,7 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
8:30 - KST 1912 Jan 1
9:00 - JST 1945 Aug 24
9:00 - KST 2015 Aug 15 00:00
8:30 - KST 2018 May
5
8:30 - KST 2018 May
4 23:30
9:00 - KST
###############################################################################
...
...
@@ -2780,19 +2964,35 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
# Philippine Star 2014-08-05
# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
# From Paul Goyette (2018-06-15):
# In the Philippines, there is a national law, Republic Act No. 10535
# which declares the official time here as "Philippine Standard Time".
# The act [1] even specifies use of PST as the abbreviation, although
# the FAQ provided by PAGASA [2] uses the "acronym PhST to distinguish
# it from the Pacific Standard Time (PST)."
# [1] http://www.officialgazette.gov.ph/2013/05/15/republic-act-no-10535/
# [2] https://www1.pagasa.dost.gov.ph/index.php/astronomy/philippine-standard-time#republic-act-10535
#
# From Paul Eggert (2018-06-19):
# I surveyed recent news reports, and my impression is that "PST" is
# more popular among reliable English-language news sources. This is
# not just a measure of Google hit counts: it's also the sizes and
# influence of the sources. There is no current abbreviation for DST,
# so use "PDT", the usual American style.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Phil 1936 only - Nov 1 0:00 1:00
-
Rule Phil 1937 only - Feb 1 0:00 0
-
Rule Phil 1954 only - Apr 12 0:00 1:00
-
Rule Phil 1954 only - Jul 1 0:00 0
-
Rule Phil 1978 only - Mar 22 0:00 1:00
-
Rule Phil 1978 only - Sep 21 0:00 0
-
Rule Phil 1936 only - Nov 1 0:00 1:00
D
Rule Phil 1937 only - Feb 1 0:00 0
S
Rule Phil 1954 only - Apr 12 0:00 1:00
D
Rule Phil 1954 only - Jul 1 0:00 0
S
Rule Phil 1978 only - Mar 22 0:00 1:00
D
Rule Phil 1978 only - Sep 21 0:00 0
S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31
8:04:00 - LMT 1899 May 11
8:00 Phil
+08/+09
1942 May
9:00 -
+09
1944 Nov
8:00 Phil
+08/+09
8:00 Phil
P%sT
1942 May
9:00 -
JST
1944 Nov
8:00 Phil
P%sT
# Qatar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
...
...
@@ -2803,15 +3003,34 @@ Link Asia/Qatar Asia/Bahrain
# Saudi Arabia
#
# From Paul Eggert (201
4-07-15
):
# From Paul Eggert (201
8-08-29
):
# Time in Saudi Arabia and other countries in the Arabian peninsula was not
# standardized until
relatively recently; we don't know
when, and possibly it
# standardized until
1968 or so; we don't know exactly
when, and possibly it
# has never been made official. Richard P Hunt, in "Islam city yielding to
# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
# observed standard time, and that people in Jeddah mostly observed quasi-solar
# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
# o'clock for "Arab" time).
#
# Timekeeping differed depending on who you were and which part of Saudi
# Arabia you were in. In 1969, Elias Antar wrote that although a common
# practice had been to set one's watch to 12:00 (i.e., midnight) at sunset -
# which meant that the time on one side of a mountain could differ greatly from
# the time on the other side - many foreigners set their watches to 6pm
# instead, while airlines instead used UTC +03 (except in Dhahran, where they
# used UTC +04), Aramco used UTC +03 with DST, and the Trans-Arabian Pipe Line
# Company used Aramco time in eastern Saudi Arabia and airline time in western.
# (The American Military Aid Advisory Group used plain UTC.) Antar writes,
# "A man named Higgins, so the story goes, used to run a local power
# station. One day, the whole thing became too much for Higgins and he
# assembled his staff and laid down the law. 'I've had enough of this,' he
# shrieked. 'It is now 12 o'clock Higgins Time, and from now on this station is
# going to run on Higgins Time.' And so, until last year, it did." See:
# Antar E. Dinner at When? Saudi Aramco World, 1969 March/April. 2-3.
# http://archive.aramcoworld.com/issue/196902/dinner.at.when.htm
# newspapers.com says a similar story about Higgins was published in the Port
# Angeles (WA) Evening News, 1965-03-10, page 5, but I lack access to the text.
#
# The TZ database cannot represent quasi-solar time; airline time is the best
# we can do. The 1946 foreign air news digest of the U.S. Civil Aeronautics
# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
...
...
@@ -2821,7 +3040,8 @@ Link Asia/Qatar Asia/Bahrain
#
# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
# time zones; the other zone, at UT +04, was in the far eastern part of
# the country. Ignore this, as it's before our 1970 cutoff.
# the country. Presumably this is documenting airline time. Ignore this,
# as it's before our 1970 cutoff.
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
...
...
make/data/tzdata/australasia
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Australasia and environs, and for much of the Pacific
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -384,8 +386,15 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# Dominic Fok writes (2017-08-20) that DST ends 2018-01-14, citing
# Extraordinary Government of Fiji Gazette Supplement No. 21 (2017-08-27),
# [Legal Notice No. 41] of an order of the previous day by J Usamate.
# From Raymond Kumar (2018-07-13):
# http://www.fijitimes.com/government-approves-2018-daylight-saving/
# ... The daylight saving period will end at 3am on Sunday January 13, 2019.
#
# From Paul Eggert (2018-07-15):
# For now, guess DST from 02:00 the first Sunday in November to 03:00
# the first Sunday on or after January 14. Although ad hoc, it matches
# the first Sunday on or after January 13. January transitions reportedly
# depend on when school terms start. Although the guess is ad hoc, it matches
# transitions since late 2014 and seems more likely to match future
# practice than guessing no DST.
...
...
@@ -399,7 +408,7 @@ Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 max - Jan Sun>=1
4
3:00 0 -
Rule Fiji 2015 max - Jan Sun>=1
3
3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
...
...
make/data/tzdata/backward
浏览文件 @
f72ca2c9
...
...
@@ -21,10 +21,12 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb links for backward compatibility
# This file is in the public domain, so clarified as of
# 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 timezones
# and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
...
...
make/data/tzdata/etcetera
浏览文件 @
f72ca2c9
...
...
@@ -21,12 +21,14 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for ships at sea and other miscellany
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
# These entries are mostly present for historical reasons, so that
# people in areas not otherwise covered by the tz files could "zic -l"
# to a time
zone that was right for their area. These days, the
# to a timezone that was right for their area. These days, the
# tz files cover almost all the inhabited world, and the only practical
# need now for the entries that are not on UTC are for ships at sea
# that cannot use POSIX TZ settings.
...
...
make/data/tzdata/europe
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Europe and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -540,7 +542,7 @@ Link Europe/London Europe/Isle_of_Man
#
# To work around this problem, the build procedure can translate the
# following data into two forms, one with negative SAVE values and the
# other form with a traditional approximation for Irish time
stamps
# other form with a traditional approximation for Irish timestamps
# after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
# flags that are reversed, its UTC offsets are correct and this often
# suffices. This source file currently uses only nonnegative SAVE
...
...
@@ -2450,6 +2452,33 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
# administratively part of Sakhalin oblast', they appear to have
# remained on UTC+11 along with Magadan.
# From Marat Nigametzianov (2018-07-16):
# this is link to order from 1956 about timezone in USSR
# http://astro.uni-altai.ru/~orion/blog/2011/11/novyie-granitsyi-chasovyih-poyasov-v-sssr/
#
# From Paul Eggert (2018-07-16):
# Perhaps someone could translate the above-mentioned link and use it
# to correct our data for the ex-Soviet Union. It cites the following:
# «Поясное время и новые границы часовых поясов» / сост. П.Н. Долгов,
# отв. ред. Г.Д. Бурдун - М: Комитет стандартов, мер и измерительных
# приборов при Совете Министров СССР, Междуведомственная комиссия
# единой службы времени, 1956 г.
# This book looks like it would be a helpful resource for the Soviet
# Union through 1956. Although a copy was in the Scientific Library
# of Tomsk State University, I have not been able to track down a copy nearby.
#
# From Stepan Golosunov (2018-07-21):
# http://astro.uni-altai.ru/~orion/blog/2015/05/center-reforma-ischisleniya-vremeni-br-na-territorii-sssr-v-1957-godu-center/
# says that the 1956 decision to change time belts' borders was not
# implemented as planned in 1956 and the change happened in 1957.
# There is also the problem that actual time zones were different from
# the official time belts (and from many time belts' maps) as there were
# numerous exceptions to application of time belt rules. For example,
# https://ru.wikipedia.org/wiki/Московское_время#Перемещение_границы_применения_московского_времени_на_восток
# says that by 1962 there were many regions in the 3rd time belt that
# were on Moscow time, referring to a 1962 map. By 1989 number of such
# exceptions grew considerably.
# From Tim Parenti (2014-07-06):
# The comments detailing the coverage of each Russian zone are meant to assist
# with maintenance only and represent our best guesses as to which regions
...
...
@@ -2460,9 +2489,6 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
# future stability. ISO 3166-2:RU codes are also listed for first-level
# divisions where available.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# From Tim Parenti (2014-07-03):
# Europe/Kaliningrad covers...
# 39 RU-KGD Kaliningrad Oblast
...
...
@@ -2730,6 +2756,15 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May
# 34 RU-VGG Volgograd Oblast
# The 1988 transition is from USSR act No. 5 (1988-01-04).
# From Alexander Fetisov (2018-09-20):
# Volgograd region in southern Russia (Europe/Volgograd) change
# timezone from UTC+3 to UTC+4 from 28oct2018.
# http://sozd.parliament.gov.ru/bill/452878-7
#
# From Stepan Golosunov (2018-10-11):
# The law has been published today on
# http://publication.pravo.gov.ru/Document/View/0001201810110037
Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
3:00 - +03 1930 Jun 21
4:00 - +04 1961 Nov 11
...
...
@@ -2738,7 +2773,8 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 - +04 1992 Mar 29 2:00s
3:00 Russia +03/+04 2011 Mar 27 2:00s
4:00 - +04 2014 Oct 26 2:00s
3:00 - +03
3:00 - +03 2018 Oct 28 2:00s
4:00 - +04
# From Paul Eggert (2016-11-11):
# Europe/Saratov covers:
...
...
@@ -3427,7 +3463,8 @@ Rule Spain 1978 only - Oct 1 2:00s 0 -
#Rule NatSpain 1937 only - May 22 23:00 1:00 S
#Rule NatSpain 1937 1938 - Oct Sat>=1 24:00s 0 -
#Rule NatSpain 1938 only - Mar 26 23:00 1:00 S
# The following rules are copied from Morocco from 1967 through 1978.
# The following rules are copied from Morocco from 1967 through 1978,
# except with "S" letters.
Rule SpainAfrica 1967 only - Jun 3 12:00 1:00 S
Rule SpainAfrica 1967 only - Oct 1 0:00 0 -
Rule SpainAfrica 1974 only - Jun 24 0:00 1:00 S
...
...
@@ -3447,6 +3484,7 @@ Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44
0:00 1:00 WEST 1918 Oct 7 23:00
0:00 - WET 1924
0:00 Spain WE%sT 1929
0:00 - WET 1967 # Help zishrink.awk.
0:00 SpainAfrica WE%sT 1984 Mar 16
1:00 - CET 1986
1:00 EU CE%sT
...
...
@@ -3632,7 +3670,7 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2 - for 2001
# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2 - for 2002-2006
# From Paul Eggert (2016-09-25):
# Prefer the above sources to Shanks & Pottenger for time
stamps after 1985.
# Prefer the above sources to Shanks & Pottenger for timestamps after 1985.
# From Steffen Thorsen (2007-03-09):
# Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
...
...
@@ -3842,10 +3880,29 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
# From Paul Eggert (2018-10-03):
# As is usual in tzdb, Ukrainian zones use the most common English spellings.
# For example, tzdb uses Europe/Kiev, as "Kiev" is the most common spelling in
# English for Ukraine's capital, even though it is certainly wrong as a
# transliteration of the Ukrainian "Київ". This is similar to tzdb's use of
# Europe/Prague, which is certainly wrong as a transliteration of the Czech
# "Praha". ("Kiev" came from old Slavic via Russian to English, and "Prague"
# came from old Slavic via French to English, so the two cases have something
# in common.) Admittedly English-language spelling of Ukrainian names is
# controversial, and some day "Kyiv" may become substantially more popular in
# English; in the meantime, stick with the traditional English "Kiev" as that
# means less disruption for our users.
#
# Anyway, none of the common English-language spellings (Kiev, Kyiv, Kieff,
# Kijeff, Kijev, Kiyef, Kiyeff) do justice to the common pronunciation in
# Ukrainian, namely [ˈkɪjiu̯] (IPA). This pronunciation has nothing like an
# English "v" or "f", and instead trails off with what an English-speaker
# would call a demure "oo" sound, and it would would be better anglicized as
# "Kuiyu". Here's a sound file, if you would like to do as the Kuiyuvians do:
# https://commons.wikimedia.org/wiki/File:Uk-Київ.ogg
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
# "Kyiv" is the transliteration of the Ukrainian name, but
# "Kiev" is more common in English.
# This represents most of Ukraine. See above for the spelling of "Kiev".
Zone Europe/Kiev 2:02:04 - LMT 1880
2:02:04 - KMT 1924 May 2 # Kiev Mean Time
2:00 - EET 1930 Jun 21
...
...
make/data/tzdata/factory
浏览文件 @
f72ca2c9
...
...
@@ -21,11 +21,13 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for noncommittal factory settings
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
# For distributors who don't want to
put time zone specification in
#
their installation procedures. Users that
run 'date' will get the
# For distributors who don't want to
specify a timezone in their
#
installation procedures. Users who
run 'date' will get the
# time zone abbreviation "-00", indicating that the actual time zone
# is unknown.
...
...
make/data/tzdata/leapseconds
浏览文件 @
f72ca2c9
...
...
@@ -26,21 +26,25 @@
# This file is in the public domain.
# This file is generated automatically from the data in the public-domain
# leap-seconds.list file, which is copied from:
# ftp://ftp.nist.gov/pub/time/leap-seconds.list
# leap-seconds.list file, which can be copied from
# <ftp://ftp.nist.gov/pub/time/leap-seconds.list>
# or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>
# or <ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.list>.
# For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds
#
https://www.eecis.udel.edu/~mills/leap.html
#
<https://www.eecis.udel.edu/~mills/leap.html>.
# The International Earth Rotation and Reference Systems Service
# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Levine J. Coordinated Universal Time and the leap second.
# (which measures the true angular orientation of the earth in space)
# and publishes leap second data in a copyrighted file
# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
# See: Levine J. Coordinated Universal Time and the leap second.
# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
#
http://ieeexplore.ieee.org/document/7909995/
#
<https://ieeexplore.ieee.org/document/7909995>.
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist
until the early 1970s
.
# did not exist.
# The correction (+ or -) is made at the given time, so lines
# will typically look like:
...
...
@@ -48,10 +52,7 @@
# or
# Leap YEAR MON DAY 23:59:59 - R/S
# If the leapsecond is Rolling (R) the given time is local time.
# If the leapsecond is Stationary (S) the given time is UTC.
# Leap YEAR MONTH DAY HH:MM:SS CORR R/S
# If the leap second is Rolling (R) the given time is local time (unused here).
Leap 1972 Jun 30 23:59:60 + S
Leap 1972 Dec 31 23:59:60 + S
Leap 1973 Dec 31 23:59:60 + S
...
...
@@ -80,5 +81,9 @@ Leap 2012 Jun 30 23:59:60 + S
Leap 2015 Jun 30 23:59:60 + S
Leap 2016 Dec 31 23:59:60 + S
# Updated through IERS Bulletin C55
# File expires on: 28 December 2018
# POSIX timestamps for the data in this file:
#updated 1467936000
#expires 1561680000
# Updated through IERS Bulletin C56
# File expires on: 28 June 2019
make/data/tzdata/northamerica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for North and Central America and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -71,7 +73,7 @@
#
# Most of the US soon followed suit. See:
# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
# http://dx.doi.org/10.2307/3105430
# http
s
://dx.doi.org/10.2307/3105430
# From Paul Eggert (2005-04-16):
# That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
...
...
@@ -460,6 +462,19 @@ Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
# western South Dakota, far western Texas (El Paso County, Hudspeth County,
# and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
#
# From Paul Eggert (2018-10-25):
# On 1921-03-04 federal law placed all of Texas into the central time zone.
# However, El Paso ignored the law for decades and continued to observe
# mountain time, on the grounds that that's what they had always done
# and they weren't about to let the federal government tell them what to do.
# Eventually the federal government gave in and changed the law on
# 1970-04-10 to match what El Paso was actually doing. Although
# that's slightly after our 1970 cutoff, there is no need to create a
# separate zone for El Paso since they were ignoring the law anyway. See:
# Long T. El Pasoans were time rebels, fought to stay in Mountain zone.
# El Paso Times. 2018-10-24 06:40 -06.
# https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoans-were-time-rebels-fought-stay-mountain-zone/1744509002/
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
Rule Denver 1920 only - Oct lastSun 2:00 0 S
...
...
@@ -729,9 +744,7 @@ Zone America/Adak 12:13:22 - LMT 1867 Oct 19 12:44:35
Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
-10:30 - HST 1933 Apr 30 2:00
-10:30 1:00 HDT 1933 May 21 12:00
-10:30 - HST 1942 Feb 9 2:00
-10:30 1:00 HDT 1945 Sep 30 2:00
-10:30 - HST 1947 Jun 8 2:00
-10:30 US H%sT 1947 Jun 8 2:00
-10:00 - HST
# Now we turn to US areas that have diverged from the consensus since 1970.
...
...
make/data/tzdata/pacificnew
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for proposed US election time (this file is obsolete)
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
make/data/tzdata/southamerica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for South America and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -415,7 +417,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 -
# standard time, so let's do that here too. This does not change UTC
# offsets, only tm_isdst and the time zone abbreviations. One minor
# plus is that this silences a zic complaint that there's no POSIX TZ
# setting for time
stamps past 2038.
# setting for timestamps past 2038.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
...
...
@@ -948,6 +950,14 @@ Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 -
# ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
# From Steffen Thorsen (2017-12-20):
# http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
#
# From Fábio Gomes (2018-10-04):
# The Brazilian president just announced a new change on this year DST.
# It was scheduled to start on November 4th and it was changed to November 18th.
# From Rodrigo Brüning Wessler (2018-10-15):
# The Brazilian government just announced that the change in DST was
# canceled.... Maybe the president Michel Temer also woke up one hour
# earlier today. :)
Rule Brazil 2018 max - Nov Sun>=1 0:00 1:00 -
Rule Brazil 2023 only - Feb Sun>=22 0:00 0 -
Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 -
...
...
@@ -1254,6 +1264,24 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# they will switch from -03 to -04 one hour after Santiago does that day.
# For now, assume that they will not revert.
# From Juan Correa (2018-08-13):
# As of moments ago, the Ministry of Energy in Chile has announced the new
# schema for DST. ... Announcement in video (in Spanish):
# https://twitter.com/MinEnergia/status/1029000399129374720
# From Yonathan Dossow (2018-08-13):
# The video says "first Saturday of September", we all know it means Sunday at
# midnight.
# From Tim Parenti (2018-08-13):
# Translating the captions on the video at 0:44-0:55, "We want to announce as
# Government that from 2019, Winter Time will be increased to 5 months, between
# the first Saturday of April and the first Saturday of September."
# At 2:08-2:20, "The Magallanes region will maintain its current time, as
# decided by the citizens during 2017, but our Government will promote a
# regional dialogue table to gather their opinion on this matter."
# https://twitter.com/MinEnergia/status/1029009354001973248
# "We will keep the new time policy unchanged for at least the next 4 years."
# So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
Rule Chile 1928 1932 - Apr 1 0:00 0 -
...
...
@@ -1287,8 +1315,10 @@ Rule Chile 2011 only - May Sun>=2 3:00u 0 -
Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 -
Rule Chile 2012 2014 - Apr Sun>=23 3:00u 0 -
Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 -
Rule Chile 2016 max - May Sun>=9 3:00u 0 -
Rule Chile 2016 max - Aug Sun>=9 4:00u 1:00 -
Rule Chile 2016 2018 - May Sun>=9 3:00u 0 -
Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 -
Rule Chile 2019 max - Apr Sun>=2 3:00u 0 -
Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
# (1996-09) says 1998-03-08. Ignore these.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
...
...
make/data/tzdata/systemv
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for System V rules (this file is obsolete)
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
make/data/tzdata/zone.tab
浏览文件 @
f72ca2c9
...
...
@@ -21,12 +21,12 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tz
zone descriptions (deprecated version)
# tz
db time
zone descriptions (deprecated version)
#
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
# From Paul Eggert (201
4-07-31
):
# From Paul Eggert (201
8-06-27
):
# 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:
...
...
@@ -35,13 +35,13 @@
# 2. The first data column contains exactly one country code.
#
# Because of (2), each row stands for an area that is the intersection
# of a region identified by a country code and of a zone where civil
# of a region identified by a country code and of a
time
zone where civil
# clocks have agreed since 1970; this is a narrower definition than
# that of zone1970.tab.
#
# This table is intended as an aid for users, to help them select time
#
zone data entries appropriate for their practical needs. It is not
#
intended to take or
endorse any position on legal or territorial claims.
# This table is intended as an aid for users, to help them select time
zones
#
appropriate for their practical needs. It is not intended to take or
# endorse any position on legal or territorial claims.
#
#country-
#code coordinates TZ comments
...
...
@@ -291,7 +291,7 @@ MM +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
MO +221
4+11335
Asia/Macau
MO +221
150+1133230
Asia/Macau
MP +1512+14545 Pacific/Saipan
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
...
...
src/share/classes/java/time/chrono/HijrahEra.java
浏览文件 @
f72ca2c9
...
...
@@ -64,10 +64,13 @@ package java.time.chrono;
import
static
java
.
time
.
temporal
.
ChronoField
.
ERA
;
import
java.time.DateTimeException
;
import
java.time.format.DateTimeFormatterBuilder
;
import
java.time.format.TextStyle
;
import
java.time.temporal.ChronoField
;
import
java.time.temporal.TemporalField
;
import
java.time.temporal.UnsupportedTemporalTypeException
;
import
java.time.temporal.ValueRange
;
import
java.util.Locale
;
/**
* An era in the Hijrah calendar system.
...
...
@@ -155,4 +158,18 @@ public enum HijrahEra implements Era {
return
Era
.
super
.
range
(
field
);
}
/**
* {@inheritDoc}
*
* @param style {@inheritDoc}
* @param locale {@inheritDoc}
*/
@Override
public
String
getDisplayName
(
TextStyle
style
,
Locale
locale
)
{
return
new
DateTimeFormatterBuilder
()
.
appendText
(
ERA
,
style
)
.
toFormatter
(
locale
)
.
withChronology
(
HijrahChronology
.
INSTANCE
)
.
format
(
HijrahDate
.
now
());
}
}
src/share/classes/java/time/chrono/JapaneseEra.java
浏览文件 @
f72ca2c9
...
...
@@ -73,6 +73,7 @@ import java.io.ObjectStreamException;
import
java.io.Serializable
;
import
java.time.DateTimeException
;
import
java.time.LocalDate
;
import
java.time.format.DateTimeFormatterBuilder
;
import
java.time.format.TextStyle
;
import
java.time.temporal.ChronoField
;
import
java.time.temporal.TemporalField
;
...
...
@@ -252,7 +253,12 @@ public final class JapaneseEra
Objects
.
requireNonNull
(
locale
,
"locale"
);
return
style
.
asNormal
()
==
TextStyle
.
NARROW
?
getAbbreviation
()
:
getName
();
}
return
Era
.
super
.
getDisplayName
(
style
,
locale
);
return
new
DateTimeFormatterBuilder
()
.
appendText
(
ERA
,
style
)
.
toFormatter
(
locale
)
.
withChronology
(
JapaneseChronology
.
INSTANCE
)
.
format
(
this
==
MEIJI
?
MEIJI_6_ISODATE
:
since
);
}
//-----------------------------------------------------------------------
...
...
src/share/classes/java/time/chrono/MinguoEra.java
浏览文件 @
f72ca2c9
...
...
@@ -61,7 +61,12 @@
*/
package
java.time.chrono
;
import
static
java
.
time
.
temporal
.
ChronoField
.
ERA
;
import
java.time.DateTimeException
;
import
java.time.format.DateTimeFormatterBuilder
;
import
java.time.format.TextStyle
;
import
java.util.Locale
;
/**
* An era in the Minguo calendar system.
...
...
@@ -152,4 +157,19 @@ public enum MinguoEra implements Era {
return
ordinal
();
}
/**
* {@inheritDoc}
*
* @param style {@inheritDoc}
* @param locale {@inheritDoc}
*/
@Override
public
String
getDisplayName
(
TextStyle
style
,
Locale
locale
)
{
return
new
DateTimeFormatterBuilder
()
.
appendText
(
ERA
,
style
)
.
toFormatter
(
locale
)
.
withChronology
(
MinguoChronology
.
INSTANCE
)
.
format
(
this
==
ROC
?
MinguoDate
.
of
(
1
,
1
,
1
)
:
MinguoDate
.
of
(
0
,
1
,
1
));
}
}
src/share/classes/java/time/chrono/ThaiBuddhistEra.java
浏览文件 @
f72ca2c9
...
...
@@ -61,7 +61,12 @@
*/
package
java.time.chrono
;
import
static
java
.
time
.
temporal
.
ChronoField
.
ERA
;
import
java.time.DateTimeException
;
import
java.time.format.DateTimeFormatterBuilder
;
import
java.time.format.TextStyle
;
import
java.util.Locale
;
/**
* An era in the Thai Buddhist calendar system.
...
...
@@ -152,4 +157,19 @@ public enum ThaiBuddhistEra implements Era {
return
ordinal
();
}
/**
* {@inheritDoc}
*
* @param style {@inheritDoc}
* @param locale {@inheritDoc}
*/
@Override
public
String
getDisplayName
(
TextStyle
style
,
Locale
locale
)
{
return
new
DateTimeFormatterBuilder
()
.
appendText
(
ERA
,
style
)
.
toFormatter
(
locale
)
.
withChronology
(
ThaiBuddhistChronology
.
INSTANCE
)
.
format
(
this
==
BE
?
ThaiBuddhistDate
.
of
(
1
,
1
,
1
)
:
ThaiBuddhistDate
.
of
(
0
,
1
,
1
));
}
}
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @
f72ca2c9
...
...
@@ -666,9 +666,9 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
"Magadan Summer Time"
,
"MAGST"
,
"Magadan Time"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"Philippines
Time"
,
"PH
T"
,
"Philippines
Summer Time"
,
"PHS
T"
,
"Philippines Time"
,
"P
H
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"Philippines
Standard Time"
,
"PS
T"
,
"Philippines
Daylight Time"
,
"PD
T"
,
"Philippines Time"
,
"PT"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
"Magadanische Sommerzeit"
,
"MAGST"
,
"Magadanische Zeit"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"Philippin
ische Zeit"
,
"PH
T"
,
"Philippin
ische Sommerzeit"
,
"PHS
T"
,
"Philippin
ische Zeit"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"Philippin
es Standard Time"
,
"PS
T"
,
"Philippin
es Daylight Time"
,
"PD
T"
,
"Philippin
es Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
"Hora de verano de Magad\u00e1n"
,
"MAGST"
,
"Hora de Magad\u00E1n"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
Hora de Filipinas"
,
"PH
T"
,
"
Hora de verano de Filipinas"
,
"PHS
T"
,
"
Hora de Filipinas"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
"Heure d'\u00e9t\u00e9 de Magadan"
,
"MAGST"
,
"Heure de Magadan"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
Heure des Philippines"
,
"PH
T"
,
"
Heure d'\u00e9t\u00e9 des Philippines"
,
"PHS
T"
,
"
Heure des Philippines"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
"Ora estiva di Magadan"
,
"MAGST"
,
"Ora di Magadan"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
Ora delle Filippine"
,
"PH
T"
,
"
Ora estiva delle Filippine"
,
"PHS
T"
,
"
Ora delle Filippine"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
"\u30de\u30ac\u30c0\u30f3\u590f\u6642\u9593"
,
"MAGST"
,
"\u30DE\u30AC\u30C0\u30F3\u6642\u9593"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
\u30d5\u30a3\u30ea\u30d4\u30f3\u6642\u9593"
,
"PH
T"
,
"
\u30d5\u30a3\u30ea\u30d4\u30f3\u590f\u6642\u9593"
,
"PHS
T"
,
"
\u30D5\u30A3\u30EA\u30D4\u30F3\u6642\u9593"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
"\ub9c8\uac00\ub2e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"MAGST"
,
"\uB9C8\uAC00\uB2E8 \uD45C\uC900\uC2DC"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
\ud544\ub9ac\ud540 \uc2dc\uac04"
,
"PH
T"
,
"
\ud544\ub9ac\ud540 \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"PHS
T"
,
"
\uD544\uB9AC\uD540 \uD45C\uC900\uC2DC"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
"Fuso hor\u00e1rio de ver\u00e3o de Magadan"
,
"MAGST"
,
"Hor\u00E1rio de Magadan"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
Fuso hor\u00e1rio das Filipinas"
,
"PH
T"
,
"
Fuso hor\u00e1rio de ver\u00e3o das Filipinas"
,
"PHS
T"
,
"
Hor\u00E1rio das Filipinas"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
"Magadan, sommartid"
,
"MAGST"
,
"Magadan-tid"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
Filippinerna, normaltid"
,
"PH
T"
,
"
Filippinerna, sommartid"
,
"PHS
T"
,
"
Filippinsk tid"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
"Magadan \u590f\u4ee4\u65f6"
,
"MAGST"
,
"Magadan \u65F6\u95F4"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
\u83f2\u5f8b\u5bbe\u65f6\u95f4"
,
"PH
T"
,
"
\u83f2\u5f8b\u5bbe\u590f\u4ee4\u65f6"
,
"PHS
T"
,
"
\u83F2\u5F8B\u5BBE\u65F6\u95F4"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @
f72ca2c9
...
...
@@ -667,9 +667,9 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
"Magadan \u590f\u4ee4\u6642\u9593"
,
"MAGST"
,
"\u99AC\u52A0\u4E39\u6642\u9593"
,
"MAGT"
}},
{
"Asia/Makassar"
,
CIT
},
{
"Asia/Manila"
,
new
String
[]
{
"
\u83f2\u5f8b\u8cd3\u6642\u9593"
,
"PH
T"
,
"
\u83f2\u5f8b\u8cd3\u590f\u4ee4\u6642\u9593"
,
"PHS
T"
,
"
\u83F2\u5F8B\u8CD3\u6642\u9593"
,
"PH
T"
}},
{
"Asia/Manila"
,
new
String
[]
{
"
Philippines Standard Time"
,
"PS
T"
,
"
Philippines Daylight Time"
,
"PD
T"
,
"
Philippines Time"
,
"P
T"
}},
{
"Asia/Muscat"
,
GST
},
{
"Asia/Nicosia"
,
EET
},
{
"Asia/Novokuznetsk"
,
KRAT
},
...
...
test/java/time/test/java/time/chrono/TestEraDisplayName.java
0 → 100644
浏览文件 @
f72ca2c9
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package
test.java.time.chrono
;
import
java.time.*
;
import
java.time.chrono.*
;
import
java.time.format.*
;
import
java.util.Locale
;
import
org.testng.annotations.DataProvider
;
import
org.testng.annotations.Test
;
import
static
org
.
testng
.
Assert
.
assertEquals
;
/**
* Tests Era.getDisplayName() correctly returns the name based on each
* chrono implementation.
* Note: The exact result may depend on locale data provider's implementation.
*
* @bug 8171049
* @run testng/othervm -Djava.locale.providers=CLDR TestEraDisplayName
*/
@Test
public
class
TestEraDisplayName
{
private
static
final
Locale
THAI
=
Locale
.
forLanguageTag
(
"th-TH"
);
private
static
final
Locale
EGYPT
=
Locale
.
forLanguageTag
(
"ar-EG"
);
@DataProvider
(
name
=
"eraDisplayName"
)
Object
[][]
eraDisplayName
()
{
return
new
Object
[][]
{
// Era, text style, displyay locale, expected name
// IsoEra
{
IsoEra
.
BCE
,
TextStyle
.
FULL
,
Locale
.
US
,
"Before Christ"
},
{
IsoEra
.
CE
,
TextStyle
.
FULL
,
Locale
.
US
,
"Anno Domini"
},
{
IsoEra
.
BCE
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u7d00\u5143\u524d"
},
{
IsoEra
.
CE
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u897f\u66a6"
},
{
IsoEra
.
BCE
,
TextStyle
.
SHORT
,
Locale
.
US
,
"BC"
},
{
IsoEra
.
CE
,
TextStyle
.
SHORT
,
Locale
.
US
,
"AD"
},
{
IsoEra
.
BCE
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u7d00\u5143\u524d"
},
{
IsoEra
.
CE
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u897f\u66a6"
},
{
IsoEra
.
BCE
,
TextStyle
.
NARROW
,
Locale
.
US
,
"B"
},
{
IsoEra
.
CE
,
TextStyle
.
NARROW
,
Locale
.
US
,
"A"
},
{
IsoEra
.
BCE
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"B"
},
{
IsoEra
.
CE
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"A"
},
// JapaneseEra
{
JapaneseEra
.
MEIJI
,
TextStyle
.
FULL
,
Locale
.
US
,
"Meiji"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
FULL
,
Locale
.
US
,
"Taisho"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
FULL
,
Locale
.
US
,
"Showa"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
FULL
,
Locale
.
US
,
"Heisei"
},
{
JapaneseEra
.
MEIJI
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u660e\u6cbb"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u5927\u6b63"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u662d\u548c"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
FULL
,
Locale
.
JAPAN
,
"\u5e73\u6210"
},
{
JapaneseEra
.
MEIJI
,
TextStyle
.
SHORT
,
Locale
.
US
,
"Meiji"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
SHORT
,
Locale
.
US
,
"Taisho"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
SHORT
,
Locale
.
US
,
"Showa"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
SHORT
,
Locale
.
US
,
"Heisei"
},
{
JapaneseEra
.
MEIJI
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u660e\u6cbb"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u5927\u6b63"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u662d\u548c"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
SHORT
,
Locale
.
JAPAN
,
"\u5e73\u6210"
},
{
JapaneseEra
.
MEIJI
,
TextStyle
.
NARROW
,
Locale
.
US
,
"M"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
NARROW
,
Locale
.
US
,
"T"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
NARROW
,
Locale
.
US
,
"S"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
NARROW
,
Locale
.
US
,
"H"
},
{
JapaneseEra
.
MEIJI
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"M"
},
{
JapaneseEra
.
TAISHO
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"T"
},
{
JapaneseEra
.
SHOWA
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"S"
},
{
JapaneseEra
.
HEISEI
,
TextStyle
.
NARROW
,
Locale
.
JAPAN
,
"H"
},
// ThaiBuddhistEra
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
FULL
,
Locale
.
US
,
"BC"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
FULL
,
Locale
.
US
,
"B.E."
},
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
FULL
,
THAI
,
"BC"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
FULL
,
THAI
,
"\u0e1e\u0e38\u0e17\u0e18\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a"
},
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
SHORT
,
Locale
.
US
,
"BC"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
SHORT
,
Locale
.
US
,
"B.E."
},
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
SHORT
,
THAI
,
"\u0e1b\u0e35\u0e01\u0e48\u0e2d\u0e19\u0e04\u0e23\u0e34\u0e2a"
+
"\u0e15\u0e4c\u0e01\u0e32\u0e25\u0e17\u0e35\u0e48"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
SHORT
,
THAI
,
"\u0e1e.\u0e28."
},
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
NARROW
,
Locale
.
US
,
"BC"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
NARROW
,
Locale
.
US
,
"B.E."
},
{
ThaiBuddhistEra
.
BEFORE_BE
,
TextStyle
.
NARROW
,
THAI
,
"BC"
},
{
ThaiBuddhistEra
.
BE
,
TextStyle
.
NARROW
,
THAI
,
"B.E."
},
// MinguoEra
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
FULL
,
Locale
.
US
,
"Before R.O.C."
},
{
MinguoEra
.
ROC
,
TextStyle
.
FULL
,
Locale
.
US
,
"R.O.C."
},
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
FULL
,
Locale
.
TAIWAN
,
"\u6c11\u570b\u524d"
},
{
MinguoEra
.
ROC
,
TextStyle
.
FULL
,
Locale
.
TAIWAN
,
"\u6c11\u570b"
},
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
SHORT
,
Locale
.
US
,
"Before R.O.C."
},
{
MinguoEra
.
ROC
,
TextStyle
.
SHORT
,
Locale
.
US
,
"R.O.C."
},
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
SHORT
,
Locale
.
TAIWAN
,
"\u6c11\u570b\u524d"
},
{
MinguoEra
.
ROC
,
TextStyle
.
SHORT
,
Locale
.
TAIWAN
,
"\u6c11\u570b"
},
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
NARROW
,
Locale
.
US
,
"0"
},
{
MinguoEra
.
ROC
,
TextStyle
.
NARROW
,
Locale
.
US
,
"1"
},
{
MinguoEra
.
BEFORE_ROC
,
TextStyle
.
NARROW
,
Locale
.
TAIWAN
,
"0"
},
{
MinguoEra
.
ROC
,
TextStyle
.
NARROW
,
Locale
.
TAIWAN
,
"1"
},
// HijrahEra
{
HijrahEra
.
AH
,
TextStyle
.
FULL
,
Locale
.
US
,
"AH"
},
{
HijrahEra
.
AH
,
TextStyle
.
FULL
,
EGYPT
,
"\u0647\u0640"
},
{
HijrahEra
.
AH
,
TextStyle
.
SHORT
,
Locale
.
US
,
"AH"
},
{
HijrahEra
.
AH
,
TextStyle
.
SHORT
,
EGYPT
,
"\u0647\u0640"
},
{
HijrahEra
.
AH
,
TextStyle
.
NARROW
,
Locale
.
US
,
"1"
},
{
HijrahEra
.
AH
,
TextStyle
.
NARROW
,
EGYPT
,
"1"
},
};
}
@Test
(
dataProvider
=
"eraDisplayName"
)
public
void
test_eraDisplayName
(
Era
era
,
TextStyle
style
,
Locale
locale
,
String
expected
)
{
assertEquals
(
era
.
getDisplayName
(
style
,
locale
),
expected
);
}
}
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @
f72ca2c9
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2018
e
tzdata2018
g
test/sun/util/calendar/zi/tzdata/africa
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Africa and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -29,7 +31,7 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (201
7-04-09
):
# From Paul Eggert (201
8-05-27
):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...
...
@@ -74,13 +76,15 @@
# I vaguely recall 'WAT' also being used for -01 in the past but
# cannot now come up with solid citations.
#
# I invented the following abbreviations
; corrections are welcome!
# +02 WAST West Africa Summer Time
(no longer used)
# +03 CAST Central Africa Summer Time
(no longer used)
# +03 SAST South Africa Summer Time
(no longer used)
# I invented the following abbreviations
in the 1990s:
# +02 WAST West Africa Summer Time
# +03 CAST Central Africa Summer Time
# +03 SAST South Africa Summer Time
# +03 EAT East Africa Time
# 'EAT' also seems to have caught on; the others are rare but are paired
# with better-attested non-DST abbreviations.
# 'EAT' seems to have caught on and is in current timestamps, and though
# the other abbreviations are rarer and are only in past timestamps,
# they are paired with better-attested non-DST abbreviations.
# Corrections are welcome.
# Algeria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
...
...
@@ -385,6 +389,13 @@ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
# Eritrea
# Ethiopia
# See Africa/Nairobi.
#
# Unfortunately tzdb records only Western clock time in use in Ethiopia,
# as the tzdb format is not up to properly recording a common Ethiopian
# timekeeping practice that is based on solar time. See:
# Mortada D. If you have a meeting in Ethiopia, you'd better double
# check the time. PRI's The World. 2015-01-30 15:15 -05.
# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
# Gabon
# See Africa/Lagos.
...
...
@@ -856,94 +867,61 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
# with the patch.
# From Paul Eggert (2015-06-08):
# For now, guess that later spring and fall transitions will use 2015's rules,
# and guess that Morocco will switch to standard time at 03:00 the last
# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
# Ramadan. To implement this, transition dates for 2016 through 2037 were
# determined by running the following program under GNU Emacs 24.3, with the
# results integrated by hand into the table below.
# (let ((islamic-year 1437))
# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
# (sunday 0))
# (while (/= sunday (mod (setq a (1- a)) 7)))
# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
# (insert
# (format
# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
# "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
# (setq islamic-year (+ 1 islamic-year))))
# From Mohamed Essedik Najd (2018-10-26):
# Today, a Moroccan government council approved the perpetual addition
# of 60 minutes to the regular Moroccan timezone.
# From Brian Inglis (2018-10-26):
# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
Rule Morocco 1939 only - Sep 12 0:00 1:00 -
Rule Morocco 1939 only - Nov 19 0:00 0 -
Rule Morocco 1940 only - Feb 25 0:00 1:00
S
Rule Morocco 1940 only - Feb 25 0:00 1:00
-
Rule Morocco 1945 only - Nov 18 0:00 0 -
Rule Morocco 1950 only - Jun 11 0:00 1:00
S
Rule Morocco 1950 only - Jun 11 0:00 1:00
-
Rule Morocco 1950 only - Oct 29 0:00 0 -
Rule Morocco 1967 only - Jun 3 12:00 1:00
S
Rule Morocco 1967 only - Jun 3 12:00 1:00
-
Rule Morocco 1967 only - Oct 1 0:00 0 -
Rule Morocco 1974 only - Jun 24 0:00 1:00
S
Rule Morocco 1974 only - Jun 24 0:00 1:00
-
Rule Morocco 1974 only - Sep 1 0:00 0 -
Rule Morocco 1976 1977 - May 1 0:00 1:00
S
Rule Morocco 1976 1977 - May 1 0:00 1:00
-
Rule Morocco 1976 only - Aug 1 0:00 0 -
Rule Morocco 1977 only - Sep 28 0:00 0 -
Rule Morocco 1978 only - Jun 1 0:00 1:00
S
Rule Morocco 1978 only - Jun 1 0:00 1:00
-
Rule Morocco 1978 only - Aug 4 0:00 0 -
Rule Morocco 2008 only - Jun 1 0:00 1:00
S
Rule Morocco 2008 only - Jun 1 0:00 1:00
-
Rule Morocco 2008 only - Sep 1 0:00 0 -
Rule Morocco 2009 only - Jun 1 0:00 1:00
S
Rule Morocco 2009 only - Jun 1 0:00 1:00
-
Rule Morocco 2009 only - Aug 21 0:00 0 -
Rule Morocco 2010 only - May 2 0:00 1:00
S
Rule Morocco 2010 only - May 2 0:00 1:00
-
Rule Morocco 2010 only - Aug 8 0:00 0 -
Rule Morocco 2011 only - Apr 3 0:00 1:00
S
Rule Morocco 2011 only - Apr 3 0:00 1:00
-
Rule Morocco 2011 only - Jul 31 0:00 0 -
Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00
S
Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00
-
Rule Morocco 2012 only - Jul 20 3:00 0 -
Rule Morocco 2012 only - Aug 20 2:00 1:00
S
Rule Morocco 2012 only - Aug 20 2:00 1:00
-
Rule Morocco 2012 only - Sep 30 3:00 0 -
Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00
S
Rule Morocco 2013
max
- Oct lastSun 3:00 0 -
Rule Morocco 2014 20
21 - Mar lastSun 2:00 1:00 S
Rule Morocco 2013 only - Aug 10 2:00 1:00
-
Rule Morocco 2013
2018
- Oct lastSun 3:00 0 -
Rule Morocco 2014 20
18 - Mar lastSun 2:00 1:00 -
Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00
S
Rule Morocco 2014 only - Aug 2 2:00 1:00
-
Rule Morocco 2015 only - Jun 14 3:00 0 -
Rule Morocco 2015 only - Jul 19 2:00 1:00
S
Rule Morocco 2015 only - Jul 19 2:00 1:00
-
Rule Morocco 2016 only - Jun 5 3:00 0 -
Rule Morocco 2016 only - Jul 10 2:00 1:00
S
Rule Morocco 2016 only - Jul 10 2:00 1:00
-
Rule Morocco 2017 only - May 21 3:00 0 -
Rule Morocco 2017 only - Jul 2 2:00 1:00
S
Rule Morocco 2017 only - Jul 2 2:00 1:00
-
Rule Morocco 2018 only - May 13 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 S
Rule Morocco 2019 only - May 5 3:00 0 -
Rule Morocco 2019 only - Jun 9 2:00 1:00 S
Rule Morocco 2020 only - Apr 19 3:00 0 -
Rule Morocco 2020 only - May 24 2:00 1:00 S
Rule Morocco 2021 only - Apr 11 3:00 0 -
Rule Morocco 2021 only - May 16 2:00 1:00 S
Rule Morocco 2022 only - May 8 2:00 1:00 S
Rule Morocco 2023 only - Apr 23 2:00 1:00 S
Rule Morocco 2024 only - Apr 14 2:00 1:00 S
Rule Morocco 2025 only - Apr 6 2:00 1:00 S
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
Rule Morocco 2036 only - Oct 19 3:00 0 -
Rule Morocco 2037 only - Oct 4 3:00 0 -
Rule Morocco 2018 only - Jun 17 2:00 1:00 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
0:00 Morocco WE%sT
0:00 Morocco +00/+01 1984 Mar 16
1:00 - +01 1986
0:00 Morocco +00/+01 2018 Oct 27
1:00 - +01
# Western Sahara
#
...
...
@@ -958,7 +936,8 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
-1:00 - -01 1976 Apr 14
0:00 Morocco WE%sT
0:00 Morocco +00/+01 2018 Oct 27
1:00 - +01
# Mozambique
#
...
...
test/sun/util/calendar/zi/tzdata/antarctica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Antarctica and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
test/sun/util/calendar/zi/tzdata/asia
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Asia and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -29,7 +31,7 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
# From Paul Eggert (201
7-01-13
):
# From Paul Eggert (201
8-06-19
):
#
# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
...
...
@@ -58,7 +60,8 @@
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
#
# The following alphabetic abbreviations appear in these tables:
# The following alphabetic abbreviations appear in these tables
# (corrections are welcome):
# std dst
# LMT Local Mean Time
# 2:00 EET EEST Eastern European Time
...
...
@@ -67,11 +70,13 @@
# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
# 8:00 PST PDT* Philippine Standard Time
# 8:30 KST KDT Korea when at +0830
# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea when at +09
# 9:30 ACST Australian Central Standard Time
# *I invented the abbreviation PDT; see "Philippines" below.
# Otherwise, these tables typically use numeric abbreviations like +03
# and +0330 for integer hour and minute UT offsets. Although earlier
# editions invented alphabetic time zone abbreviations for every
...
...
@@ -304,6 +309,29 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
# China
# From Paul Eggert (2018-10-02):
# The following comes from Table 1 of:
# Li Yu. Research on the daylight saving movement in 1940s Shanghai.
# Nanjing Journal of Social Sciences. 2014;(2):144-50.
# http://oversea.cnki.net/kns55/detail.aspx?dbname=CJFD2014&filename=NJSH201402020
# The table lists dates only; I am guessing 00:00 and 24:00 transition times.
# Also, the table lists the planned end of DST in 1949, but the corresponding
# zone line cuts this off on May 28, when the Communists took power.
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Shang 1940 only - Jun 1 0:00 1:00 D
Rule Shang 1940 only - Oct 12 24:00 0 S
Rule Shang 1941 only - Mar 15 0:00 1:00 D
Rule Shang 1941 only - Nov 1 24:00 0 S
Rule Shang 1942 only - Jan 31 0:00 1:00 D
Rule Shang 1945 only - Sep 1 24:00 0 S
Rule Shang 1946 only - May 15 0:00 1:00 D
Rule Shang 1946 only - Sep 30 24:00 0 S
Rule Shang 1947 only - Apr 15 0:00 1:00 D
Rule Shang 1947 only - Oct 31 24:00 0 S
Rule Shang 1948 1949 - May 1 0:00 1:00 D
Rule Shang 1948 1949 - Sep 30 24:00 0 S #plan
# From Guy Harris:
# People's Republic of China. Yes, they really have only one time zone.
...
...
@@ -330,18 +358,33 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
# time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
# observing daylight saving time in 1986.
# From Paul Eggert (2014-06-30):
# Shanks & Pottenger have China switching to a single time zone in 1980, but
# this doesn't seem to be correct. They also write that China observed summer
# DST from 1986 through 1991, which seems to match the above commentary, so
# go with them for DST rules as follows:
# From P Chan (2018-05-07):
# The start and end time of DST in China [from 1986 on] should be 2:00
# (i.e. 2:00 to 3:00 at the start and 2:00 to 1:00 at the end)....
# Government notices about summer time:
#
# 1986-04-12 http://www.zj.gov.cn/attach/zfgb/198608.pdf p.21-22
# (To establish summer time from 1986. On 4 May, set the clocks ahead one hour
# at 2 am. On 14 September, set the clocks backward one hour at 2 am.)
#
# 1987-02-15 http://www.gov.cn/gongbao/shuju/1987/gwyb198703.pdf p.114
# (Summer time in 1987 to start from 12 April until 13 September)
#
# 1987-09-09 http://www.gov.cn/gongbao/shuju/1987/gwyb198721.pdf p.709
# (From 1988, summer time to start from 2 am of the first Sunday of mid-April
# until 2 am of the first Sunday of mid-September)
#
# 1992-03-03 http://www.gov.cn/gongbao/shuju/1992/gwyb199205.pdf p.152
# (To suspend summer time from 1992)
#
# The first page of People's Daily on 12 April 1988 stating that summer time
# to begin on 17 April.
# http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Shang 1940 only - Jun 3 0:00 1:00 D
Rule Shang 1940 1941 - Oct 1 0:00 0 S
Rule Shang 1941 only - Mar 16 0:00 1:00 D
Rule PRC 1986 only - May 4 0:00 1:00 D
Rule PRC 1986 1991 - Sep Sun>=11 0:00 0 S
Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
Rule PRC 1986 only - May 4 2:00 1:00 D
Rule PRC 1986 1991 - Sep Sun>=11 2:00 0 S
Rule PRC 1987 1991 - Apr Sun>=11 2:00 1:00 D
# From Anthony Fok (2001-12-20):
# BTW, I did some research on-line and found some info regarding these five
...
...
@@ -363,10 +406,11 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
# Alois Treindl kindly sent me translations of the following two sources:
#
# (1)
# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
# Guo Qing
-
sheng (National Time-Service Center, CAS, Xi'an 710600, China)
# Beijing Time at the Beginning of the PRC
# China Historical Materials of Science and Technology
# (Zhongguo ke ji shi liao, 中国科技史料), Vol. 24, No. 1 (2003)
# (Zhongguo ke ji shi liao, 中国科技史料). 2003;24(1):5-9.
# http://oversea.cnki.net/kcms/detail/detail.aspx?filename=ZGKS200301000&dbname=CJFD2003
# It gives evidence that at the beginning of the PRC, Beijing time was
# officially apparent solar time! However, Guo also says that the
# evidence is dubious, as the relevant institute of astronomy had not
...
...
@@ -543,7 +587,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Beijing time, used throughout China; represented by Shanghai.
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949
8:00 Shang C%sT 1949
May 28
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
...
...
@@ -772,24 +816,140 @@ Zone Asia/Taipei 8:06:00 - LMT 1896 Jan 1
8:00 Taiwan C%sT
# Macau (Macao, Aomen)
#
# From P Chan (2018-05-10):
# * LegisMac
# http://legismac.safp.gov.mo/legismac/descqry/Descqry.jsf?lang=pt
# A database for searching titles of legal documents of Macau in
# Chinese and Portuguese. The term "HORÁRIO DE VERÃO" can be used for
# searching decrees about summer time.
# * Archives of Macao
# http://www.archives.gov.mo/en/bo/
# It contains images of old official gazettes.
# * The Macao Meteorological and Geophysical Bureau have a page listing the
# summer time history. But it is not complete and has some mistakes.
# http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
# Macau adopted GMT+8 on 30 Oct 1904 to follow Hong Kong. Clocks were
# advanced by 25 minutes and 50 seconds. Which means the LMT used was
# +7:34:10. As stated in the "Portaria No. 204" dated 21 October 1904
# and published in the Official Gazette on 29 October 1904.
# http://igallery.icm.gov.mo/Images/Archives/BO/MO_AH_PUB_BO_1904_10/MO_AH_PUB_BO_1904_10_00025_Grey.JPG
#
# Therefore the 1911 decree of Portugal did not change time in Macau.
#
# From LegisMac, here is a list of decrees that changed the time ...
# [Decree Gazette-no. date; titles omitted in this quotation]
# DIL 732 BOCM 51 1941.12.20
# DIL 764 BOCM 9S 1942.04.30
# DIL 781 BOCM 21 1942.10.10
# PT 3434 BOCM 8S 1943.04.17
# PT 3504 BOCM 20 1943.09.25
# PT 3843 BOCM 39 1945.09.29
# PT 3961 BOCM 17 1946.04.27
# PT 4026 BOCM 39 1946.09.28
# PT 4153 BOCM 16 1947.04.10
# PT 4271 BOCM 48 1947.11.29
# PT 4374 BOCM 18 1948.05.01
# PT 4465 BOCM 44 1948.10.30
# PT 4590 BOCM 14 1949.04.02
# PT 4666 BOCM 44 1949.10.29
# PT 4771 BOCM 12 1950.03.25
# PT 4838 BOCM 43 1950.10.28
# PT 4946 BOCM 12 1951.03.24
# PT 5025 BO 43 1951.10.27
# PT 5149 BO 14 1952.04.05
# PT 5251 BO 43 1952.10.25
# PT 5366 BO 13 1953.03.28
# PT 5444 BO 44 1953.10.31
# PT 5540 BO 12 1954.03.20
# PT 5589 BO 44 1954.10.30
# PT 5676 BO 12 1955.03.19
# PT 5739 BO 45 1955.11.05
# PT 5823 BO 11 1956.03.17
# PT 5891 BO 44 1956.11.03
# PT 5981 BO 12 1957.03.23
# PT 6064 BO 43 1957.10.26
# PT 6172 BO 12 1958.03.22
# PT 6243 BO 43 1958.10.25
# PT 6341 BO 12 1959.03.21
# PT 6411 BO 43 1959.10.24
# PT 6514 BO 11 1960.03.12
# PT 6584 BO 44 1960.10.29
# PT 6721 BO 10 1961.03.11
# PT 6815 BO 43 1961.10.28
# PT 6947 BO 10 1962.03.10
# PT 7080 BO 43 1962.10.27
# PT 7218 BO 12 1963.03.23
# PT 7340 BO 43 1963.10.26
# PT 7491 BO 11 1964.03.14
# PT 7664 BO 43 1964.10.24
# PT 7846 BO 15 1965.04.10
# PT 7979 BO 42 1965.10.16
# PT 8146 BO 15 1966.04.09
# PT 8252 BO 41 1966.10.08
# PT 8429 BO 15 1967.04.15
# PT 8540 BO 41 1967.10.14
# PT 8735 BO 15 1968.04.13
# PT 8860 BO 41 1968.10.12
# PT 9035 BO 16 1969.04.19
# PT 9156 BO 42 1969.10.18
# PT 9328 BO 15 1970.04.11
# PT 9418 BO 41 1970.10.10
# PT 9587 BO 14 1971.04.03
# PT 9702 BO 41 1971.10.09
# PT 38-A/72 BO 14 1972.04.01
# PT 126-A/72 BO 41 1972.10.07
# PT 61/73 BO 14 1973.04.07
# PT 182/73 BO 40 1973.10.06
# PT 282/73 BO 51 1973.12.22
# PT 177/74 BO 41 1974.10.12
# PT 51/75 BO 15 1975.04.12
# PT 173/75 BO 41 1975.10.11
# PT 67/76/M BO 14 1976.04.03
# PT 169/76/M BO 41 1976.10.09
# PT 78/79/M BO 19 1979.05.12
# PT 166/79/M BO 42 1979.10.20
# Note that DIL 732 does not belong to "HORÁRIO DE VERÃO" according to
# LegisMac.... Note that between 1942 and 1945, the time switched
# between GMT+9 and GMT+10. Also in 1965 and 1965 the DST ended at 2:30am.
# From Paul Eggert (2018-05-10):
# The 1904 decree says that Macau changed from the meridian of
# Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Macau 1961 1962 - Mar Sun>=16 3:30 1:00 D
Rule Macau 1961 1964 - Nov Sun>=1 3:30 0 S
Rule Macau 1963 only - Mar Sun>=16 0:00 1:00 D
Rule Macau 1964 only - Mar Sun>=16 3:30 1:00 D
Rule Macau 1965 only - Mar Sun>=16 0:00 1:00 D
Rule Macau 1965 only - Oct 31 0:00 0 S
Rule Macau 1966 1971 - Apr Sun>=16 3:30 1:00 D
Rule Macau 1966 1971 - Oct Sun>=16 3:30 0 S
Rule Macau 1972 1974 - Apr Sun>=15 0:00 1:00 D
Rule Macau 1972 1973 - Oct Sun>=15 0:00 0 S
Rule Macau 1974 1977 - Oct Sun>=15 3:30 0 S
Rule Macau 1975 1977 - Apr Sun>=15 3:30 1:00 D
Rule Macau 1978 1980 - Apr Sun>=15 0:00 1:00 D
Rule Macau 1978 1980 - Oct Sun>=15 0:00 0 S
# See Europe/Lisbon for info about the 1912 transition.
Rule Macau 1942 1943 - Apr 30 23:00 1:00 -
Rule Macau 1942 only - Nov 17 23:00 0 -
Rule Macau 1943 only - Sep 30 23:00 0 S
Rule Macau 1946 only - Apr 30 23:00s 1:00 D
Rule Macau 1946 only - Sep 30 23:00s 0 S
Rule Macau 1947 only - Apr 19 23:00s 1:00 D
Rule Macau 1947 only - Nov 30 23:00s 0 S
Rule Macau 1948 only - May 2 23:00s 1:00 D
Rule Macau 1948 only - Oct 31 23:00s 0 S
Rule Macau 1949 1950 - Apr Sat>=1 23:00s 1:00 D
Rule Macau 1949 1950 - Oct lastSat 23:00s 0 S
Rule Macau 1951 only - Mar 31 23:00s 1:00 D
Rule Macau 1951 only - Oct 28 23:00s 0 S
Rule Macau 1952 1953 - Apr Sat>=1 23:00s 1:00 D
Rule Macau 1952 only - Nov 1 23:00s 0 S
Rule Macau 1953 1954 - Oct lastSat 23:00s 0 S
Rule Macau 1954 1956 - Mar Sat>=17 23:00s 1:00 D
Rule Macau 1955 only - Nov 5 23:00s 0 S
Rule Macau 1956 1964 - Nov Sun>=1 03:30 0 S
Rule Macau 1957 1964 - Mar Sun>=18 03:30 1:00 D
Rule Macau 1965 1973 - Apr Sun>=16 03:30 1:00 D
Rule Macau 1965 1966 - Oct Sun>=16 02:30 0 S
Rule Macau 1967 1976 - Oct Sun>=16 03:30 0 S
Rule Macau 1973 only - Dec 30 03:30 1:00 D
Rule Macau 1975 1976 - Apr Sun>=16 03:30 1:00 D
Rule Macau 1979 only - May 13 03:30 1:00 D
Rule Macau 1979 only - Oct Sun>=16 03:30 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Macau 7:34:20 - LMT 1911 Dec 31 16:00u
Zone Asia/Macau 7:34:10 - LMT 1904 Oct 30
8:00 - CST 1941 Dec 21 23:00
9:00 Macau +09/+10 1945 Sep 30 24:00
8:00 Macau C%sT
...
...
@@ -1494,9 +1654,29 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm
# ... In summary, it is written as follows. From 24:00 on the first Saturday
# in May, until 0:00 on the day after the second Saturday in September.
# From Phake Nick (2018-09-27):
# [T]he webpage authored by National Astronomical Observatory of Japan
# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EF.html
# ... mentioned that using Showa 23 (year 1948) as example, 13pm of September
# 11 in summer time will equal to 0am of September 12 in standard time.
# It cited a document issued by the Liaison Office which briefly existed
# during the postwar period of Japan, where the detail on implementation
# of the summer time is described in the document.
# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EFB2C6BBFEB9EFA4CEBCC2BBDCA4CBA4C4A4A4A4C6.pdf
# The text in the document do instruct a fall back to occur at
# September 11, 13pm in summer time, while ordinary citizens can
# change the clock before they sleep.
#
# From Paul Eggert (2018-09-27):
# This instruction is equivalent to "Sat>=8 25:00", so use that. zic treats
# it like "Sun>=9 01:00", which is not quite the same but is the best we can
# do in any POSIX or C platform. The "25:00" assumes zic from 2007 or later,
# which should be safe now.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
Rule Japan 1948 1951 - Sep Sun>=9
0
:00 0 S
Rule Japan 1948 1951 - Sep Sun>=9
1
:00 0 S
Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D
...
...
@@ -1878,7 +2058,7 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
5:00 - +05
# Mangghystaū (KZ-MAN)
# Aqtau was not founded until 1963, but it represents an inhabited region,
# so include time
stamps before 1963.
# so include timestamps before 1963.
Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Oct 1
...
...
@@ -2018,6 +2198,10 @@ Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
# Assembly, as published in Rodong Sinmun.
# From Tim Parenti (2018-04-29):
# It appears to be the front page story at the top in the right-most column.
#
# From Paul Eggert (2018-05-04):
# The BBC reported that the transition was from 23:30 to 24:00 today.
# https://www.bbc.com/news/world-asia-44010705
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
...
...
@@ -2030,7 +2214,7 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
8:30 - KST 1912 Jan 1
9:00 - JST 1945 Aug 24
9:00 - KST 2015 Aug 15 00:00
8:30 - KST 2018 May
5
8:30 - KST 2018 May
4 23:30
9:00 - KST
###############################################################################
...
...
@@ -2780,19 +2964,35 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
# Philippine Star 2014-08-05
# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
# From Paul Goyette (2018-06-15):
# In the Philippines, there is a national law, Republic Act No. 10535
# which declares the official time here as "Philippine Standard Time".
# The act [1] even specifies use of PST as the abbreviation, although
# the FAQ provided by PAGASA [2] uses the "acronym PhST to distinguish
# it from the Pacific Standard Time (PST)."
# [1] http://www.officialgazette.gov.ph/2013/05/15/republic-act-no-10535/
# [2] https://www1.pagasa.dost.gov.ph/index.php/astronomy/philippine-standard-time#republic-act-10535
#
# From Paul Eggert (2018-06-19):
# I surveyed recent news reports, and my impression is that "PST" is
# more popular among reliable English-language news sources. This is
# not just a measure of Google hit counts: it's also the sizes and
# influence of the sources. There is no current abbreviation for DST,
# so use "PDT", the usual American style.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Phil 1936 only - Nov 1 0:00 1:00
-
Rule Phil 1937 only - Feb 1 0:00 0
-
Rule Phil 1954 only - Apr 12 0:00 1:00
-
Rule Phil 1954 only - Jul 1 0:00 0
-
Rule Phil 1978 only - Mar 22 0:00 1:00
-
Rule Phil 1978 only - Sep 21 0:00 0
-
Rule Phil 1936 only - Nov 1 0:00 1:00
D
Rule Phil 1937 only - Feb 1 0:00 0
S
Rule Phil 1954 only - Apr 12 0:00 1:00
D
Rule Phil 1954 only - Jul 1 0:00 0
S
Rule Phil 1978 only - Mar 22 0:00 1:00
D
Rule Phil 1978 only - Sep 21 0:00 0
S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31
8:04:00 - LMT 1899 May 11
8:00 Phil
+08/+09
1942 May
9:00 -
+09
1944 Nov
8:00 Phil
+08/+09
8:00 Phil
P%sT
1942 May
9:00 -
JST
1944 Nov
8:00 Phil
P%sT
# Qatar
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
...
...
@@ -2803,15 +3003,34 @@ Link Asia/Qatar Asia/Bahrain
# Saudi Arabia
#
# From Paul Eggert (201
4-07-15
):
# From Paul Eggert (201
8-08-29
):
# Time in Saudi Arabia and other countries in the Arabian peninsula was not
# standardized until
relatively recently; we don't know
when, and possibly it
# standardized until
1968 or so; we don't know exactly
when, and possibly it
# has never been made official. Richard P Hunt, in "Islam city yielding to
# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
# observed standard time, and that people in Jeddah mostly observed quasi-solar
# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
# o'clock for "Arab" time).
#
# Timekeeping differed depending on who you were and which part of Saudi
# Arabia you were in. In 1969, Elias Antar wrote that although a common
# practice had been to set one's watch to 12:00 (i.e., midnight) at sunset -
# which meant that the time on one side of a mountain could differ greatly from
# the time on the other side - many foreigners set their watches to 6pm
# instead, while airlines instead used UTC +03 (except in Dhahran, where they
# used UTC +04), Aramco used UTC +03 with DST, and the Trans-Arabian Pipe Line
# Company used Aramco time in eastern Saudi Arabia and airline time in western.
# (The American Military Aid Advisory Group used plain UTC.) Antar writes,
# "A man named Higgins, so the story goes, used to run a local power
# station. One day, the whole thing became too much for Higgins and he
# assembled his staff and laid down the law. 'I've had enough of this,' he
# shrieked. 'It is now 12 o'clock Higgins Time, and from now on this station is
# going to run on Higgins Time.' And so, until last year, it did." See:
# Antar E. Dinner at When? Saudi Aramco World, 1969 March/April. 2-3.
# http://archive.aramcoworld.com/issue/196902/dinner.at.when.htm
# newspapers.com says a similar story about Higgins was published in the Port
# Angeles (WA) Evening News, 1965-03-10, page 5, but I lack access to the text.
#
# The TZ database cannot represent quasi-solar time; airline time is the best
# we can do. The 1946 foreign air news digest of the U.S. Civil Aeronautics
# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
...
...
@@ -2821,7 +3040,8 @@ Link Asia/Qatar Asia/Bahrain
#
# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
# time zones; the other zone, at UT +04, was in the far eastern part of
# the country. Ignore this, as it's before our 1970 cutoff.
# the country. Presumably this is documenting airline time. Ignore this,
# as it's before our 1970 cutoff.
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
...
...
test/sun/util/calendar/zi/tzdata/australasia
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Australasia and environs, and for much of the Pacific
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -384,8 +386,15 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# Dominic Fok writes (2017-08-20) that DST ends 2018-01-14, citing
# Extraordinary Government of Fiji Gazette Supplement No. 21 (2017-08-27),
# [Legal Notice No. 41] of an order of the previous day by J Usamate.
# From Raymond Kumar (2018-07-13):
# http://www.fijitimes.com/government-approves-2018-daylight-saving/
# ... The daylight saving period will end at 3am on Sunday January 13, 2019.
#
# From Paul Eggert (2018-07-15):
# For now, guess DST from 02:00 the first Sunday in November to 03:00
# the first Sunday on or after January 14. Although ad hoc, it matches
# the first Sunday on or after January 13. January transitions reportedly
# depend on when school terms start. Although the guess is ad hoc, it matches
# transitions since late 2014 and seems more likely to match future
# practice than guessing no DST.
...
...
@@ -399,7 +408,7 @@ Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 max - Jan Sun>=1
4
3:00 0 -
Rule Fiji 2015 max - Jan Sun>=1
3
3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
...
...
test/sun/util/calendar/zi/tzdata/backward
浏览文件 @
f72ca2c9
...
...
@@ -21,10 +21,12 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb links for backward compatibility
# This file is in the public domain, so clarified as of
# 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 timezones
# and their old names. Many names changed in late 1993.
# Link TARGET LINK-NAME
...
...
test/sun/util/calendar/zi/tzdata/etcetera
浏览文件 @
f72ca2c9
...
...
@@ -21,12 +21,14 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for ships at sea and other miscellany
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
# These entries are mostly present for historical reasons, so that
# people in areas not otherwise covered by the tz files could "zic -l"
# to a time
zone that was right for their area. These days, the
# to a timezone that was right for their area. These days, the
# tz files cover almost all the inhabited world, and the only practical
# need now for the entries that are not on UTC are for ships at sea
# that cannot use POSIX TZ settings.
...
...
test/sun/util/calendar/zi/tzdata/europe
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for Europe and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -540,7 +542,7 @@ Link Europe/London Europe/Isle_of_Man
#
# To work around this problem, the build procedure can translate the
# following data into two forms, one with negative SAVE values and the
# other form with a traditional approximation for Irish time
stamps
# other form with a traditional approximation for Irish timestamps
# after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
# flags that are reversed, its UTC offsets are correct and this often
# suffices. This source file currently uses only nonnegative SAVE
...
...
@@ -2450,6 +2452,33 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
# administratively part of Sakhalin oblast', they appear to have
# remained on UTC+11 along with Magadan.
# From Marat Nigametzianov (2018-07-16):
# this is link to order from 1956 about timezone in USSR
# http://astro.uni-altai.ru/~orion/blog/2011/11/novyie-granitsyi-chasovyih-poyasov-v-sssr/
#
# From Paul Eggert (2018-07-16):
# Perhaps someone could translate the above-mentioned link and use it
# to correct our data for the ex-Soviet Union. It cites the following:
# «Поясное время и новые границы часовых поясов» / сост. П.Н. Долгов,
# отв. ред. Г.Д. Бурдун - М: Комитет стандартов, мер и измерительных
# приборов при Совете Министров СССР, Междуведомственная комиссия
# единой службы времени, 1956 г.
# This book looks like it would be a helpful resource for the Soviet
# Union through 1956. Although a copy was in the Scientific Library
# of Tomsk State University, I have not been able to track down a copy nearby.
#
# From Stepan Golosunov (2018-07-21):
# http://astro.uni-altai.ru/~orion/blog/2015/05/center-reforma-ischisleniya-vremeni-br-na-territorii-sssr-v-1957-godu-center/
# says that the 1956 decision to change time belts' borders was not
# implemented as planned in 1956 and the change happened in 1957.
# There is also the problem that actual time zones were different from
# the official time belts (and from many time belts' maps) as there were
# numerous exceptions to application of time belt rules. For example,
# https://ru.wikipedia.org/wiki/Московское_время#Перемещение_границы_применения_московского_времени_на_восток
# says that by 1962 there were many regions in the 3rd time belt that
# were on Moscow time, referring to a 1962 map. By 1989 number of such
# exceptions grew considerably.
# From Tim Parenti (2014-07-06):
# The comments detailing the coverage of each Russian zone are meant to assist
# with maintenance only and represent our best guesses as to which regions
...
...
@@ -2460,9 +2489,6 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct
# future stability. ISO 3166-2:RU codes are also listed for first-level
# divisions where available.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# From Tim Parenti (2014-07-03):
# Europe/Kaliningrad covers...
# 39 RU-KGD Kaliningrad Oblast
...
...
@@ -2730,6 +2756,15 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May
# 34 RU-VGG Volgograd Oblast
# The 1988 transition is from USSR act No. 5 (1988-01-04).
# From Alexander Fetisov (2018-09-20):
# Volgograd region in southern Russia (Europe/Volgograd) change
# timezone from UTC+3 to UTC+4 from 28oct2018.
# http://sozd.parliament.gov.ru/bill/452878-7
#
# From Stepan Golosunov (2018-10-11):
# The law has been published today on
# http://publication.pravo.gov.ru/Document/View/0001201810110037
Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
3:00 - +03 1930 Jun 21
4:00 - +04 1961 Nov 11
...
...
@@ -2738,7 +2773,8 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 - +04 1992 Mar 29 2:00s
3:00 Russia +03/+04 2011 Mar 27 2:00s
4:00 - +04 2014 Oct 26 2:00s
3:00 - +03
3:00 - +03 2018 Oct 28 2:00s
4:00 - +04
# From Paul Eggert (2016-11-11):
# Europe/Saratov covers:
...
...
@@ -3427,7 +3463,8 @@ Rule Spain 1978 only - Oct 1 2:00s 0 -
#Rule NatSpain 1937 only - May 22 23:00 1:00 S
#Rule NatSpain 1937 1938 - Oct Sat>=1 24:00s 0 -
#Rule NatSpain 1938 only - Mar 26 23:00 1:00 S
# The following rules are copied from Morocco from 1967 through 1978.
# The following rules are copied from Morocco from 1967 through 1978,
# except with "S" letters.
Rule SpainAfrica 1967 only - Jun 3 12:00 1:00 S
Rule SpainAfrica 1967 only - Oct 1 0:00 0 -
Rule SpainAfrica 1974 only - Jun 24 0:00 1:00 S
...
...
@@ -3447,6 +3484,7 @@ Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44
0:00 1:00 WEST 1918 Oct 7 23:00
0:00 - WET 1924
0:00 Spain WE%sT 1929
0:00 - WET 1967 # Help zishrink.awk.
0:00 SpainAfrica WE%sT 1984 Mar 16
1:00 - CET 1986
1:00 EU CE%sT
...
...
@@ -3632,7 +3670,7 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment.
# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2 - for 2001
# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2 - for 2002-2006
# From Paul Eggert (2016-09-25):
# Prefer the above sources to Shanks & Pottenger for time
stamps after 1985.
# Prefer the above sources to Shanks & Pottenger for timestamps after 1985.
# From Steffen Thorsen (2007-03-09):
# Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
...
...
@@ -3842,10 +3880,29 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents.
# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
# From Paul Eggert (2018-10-03):
# As is usual in tzdb, Ukrainian zones use the most common English spellings.
# For example, tzdb uses Europe/Kiev, as "Kiev" is the most common spelling in
# English for Ukraine's capital, even though it is certainly wrong as a
# transliteration of the Ukrainian "Київ". This is similar to tzdb's use of
# Europe/Prague, which is certainly wrong as a transliteration of the Czech
# "Praha". ("Kiev" came from old Slavic via Russian to English, and "Prague"
# came from old Slavic via French to English, so the two cases have something
# in common.) Admittedly English-language spelling of Ukrainian names is
# controversial, and some day "Kyiv" may become substantially more popular in
# English; in the meantime, stick with the traditional English "Kiev" as that
# means less disruption for our users.
#
# Anyway, none of the common English-language spellings (Kiev, Kyiv, Kieff,
# Kijeff, Kijev, Kiyef, Kiyeff) do justice to the common pronunciation in
# Ukrainian, namely [ˈkɪjiu̯] (IPA). This pronunciation has nothing like an
# English "v" or "f", and instead trails off with what an English-speaker
# would call a demure "oo" sound, and it would would be better anglicized as
# "Kuiyu". Here's a sound file, if you would like to do as the Kuiyuvians do:
# https://commons.wikimedia.org/wiki/File:Uk-Київ.ogg
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
# "Kyiv" is the transliteration of the Ukrainian name, but
# "Kiev" is more common in English.
# This represents most of Ukraine. See above for the spelling of "Kiev".
Zone Europe/Kiev 2:02:04 - LMT 1880
2:02:04 - KMT 1924 May 2 # Kiev Mean Time
2:00 - EET 1930 Jun 21
...
...
test/sun/util/calendar/zi/tzdata/factory
浏览文件 @
f72ca2c9
...
...
@@ -21,11 +21,13 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for noncommittal factory settings
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
# For distributors who don't want to
put time zone specification in
#
their installation procedures. Users that
run 'date' will get the
# For distributors who don't want to
specify a timezone in their
#
installation procedures. Users who
run 'date' will get the
# time zone abbreviation "-00", indicating that the actual time zone
# is unknown.
...
...
test/sun/util/calendar/zi/tzdata/leapseconds
浏览文件 @
f72ca2c9
...
...
@@ -26,21 +26,25 @@
# This file is in the public domain.
# This file is generated automatically from the data in the public-domain
# leap-seconds.list file, which is copied from:
# ftp://ftp.nist.gov/pub/time/leap-seconds.list
# leap-seconds.list file, which can be copied from
# <ftp://ftp.nist.gov/pub/time/leap-seconds.list>
# or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>
# or <ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.list>.
# For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds
#
https://www.eecis.udel.edu/~mills/leap.html
#
<https://www.eecis.udel.edu/~mills/leap.html>.
# The International Earth Rotation and Reference Systems Service
# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Levine J. Coordinated Universal Time and the leap second.
# (which measures the true angular orientation of the earth in space)
# and publishes leap second data in a copyrighted file
# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
# See: Levine J. Coordinated Universal Time and the leap second.
# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
#
http://ieeexplore.ieee.org/document/7909995/
#
<https://ieeexplore.ieee.org/document/7909995>.
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist
until the early 1970s
.
# did not exist.
# The correction (+ or -) is made at the given time, so lines
# will typically look like:
...
...
@@ -48,10 +52,7 @@
# or
# Leap YEAR MON DAY 23:59:59 - R/S
# If the leapsecond is Rolling (R) the given time is local time.
# If the leapsecond is Stationary (S) the given time is UTC.
# Leap YEAR MONTH DAY HH:MM:SS CORR R/S
# If the leap second is Rolling (R) the given time is local time (unused here).
Leap 1972 Jun 30 23:59:60 + S
Leap 1972 Dec 31 23:59:60 + S
Leap 1973 Dec 31 23:59:60 + S
...
...
@@ -80,5 +81,9 @@ Leap 2012 Jun 30 23:59:60 + S
Leap 2015 Jun 30 23:59:60 + S
Leap 2016 Dec 31 23:59:60 + S
# Updated through IERS Bulletin C55
# File expires on: 28 December 2018
# POSIX timestamps for the data in this file:
#updated 1467936000
#expires 1561680000
# Updated through IERS Bulletin C56
# File expires on: 28 June 2019
test/sun/util/calendar/zi/tzdata/northamerica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for North and Central America and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -71,7 +73,7 @@
#
# Most of the US soon followed suit. See:
# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
# http://dx.doi.org/10.2307/3105430
# http
s
://dx.doi.org/10.2307/3105430
# From Paul Eggert (2005-04-16):
# That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
...
...
@@ -460,6 +462,19 @@ Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
# western South Dakota, far western Texas (El Paso County, Hudspeth County,
# and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
#
# From Paul Eggert (2018-10-25):
# On 1921-03-04 federal law placed all of Texas into the central time zone.
# However, El Paso ignored the law for decades and continued to observe
# mountain time, on the grounds that that's what they had always done
# and they weren't about to let the federal government tell them what to do.
# Eventually the federal government gave in and changed the law on
# 1970-04-10 to match what El Paso was actually doing. Although
# that's slightly after our 1970 cutoff, there is no need to create a
# separate zone for El Paso since they were ignoring the law anyway. See:
# Long T. El Pasoans were time rebels, fought to stay in Mountain zone.
# El Paso Times. 2018-10-24 06:40 -06.
# https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoans-were-time-rebels-fought-stay-mountain-zone/1744509002/
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Denver 1920 1921 - Mar lastSun 2:00 1:00 D
Rule Denver 1920 only - Oct lastSun 2:00 0 S
...
...
@@ -729,9 +744,7 @@ Zone America/Adak 12:13:22 - LMT 1867 Oct 19 12:44:35
Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
-10:30 - HST 1933 Apr 30 2:00
-10:30 1:00 HDT 1933 May 21 12:00
-10:30 - HST 1942 Feb 9 2:00
-10:30 1:00 HDT 1945 Sep 30 2:00
-10:30 - HST 1947 Jun 8 2:00
-10:30 US H%sT 1947 Jun 8 2:00
-10:00 - HST
# Now we turn to US areas that have diverged from the consensus since 1970.
...
...
test/sun/util/calendar/zi/tzdata/pacificnew
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for proposed US election time (this file is obsolete)
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
test/sun/util/calendar/zi/tzdata/southamerica
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for South America and environs
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
@@ -415,7 +417,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 -
# standard time, so let's do that here too. This does not change UTC
# offsets, only tm_isdst and the time zone abbreviations. One minor
# plus is that this silences a zic complaint that there's no POSIX TZ
# setting for time
stamps past 2038.
# setting for timestamps past 2038.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
...
...
@@ -948,6 +950,14 @@ Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 -
# ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
# From Steffen Thorsen (2017-12-20):
# http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
#
# From Fábio Gomes (2018-10-04):
# The Brazilian president just announced a new change on this year DST.
# It was scheduled to start on November 4th and it was changed to November 18th.
# From Rodrigo Brüning Wessler (2018-10-15):
# The Brazilian government just announced that the change in DST was
# canceled.... Maybe the president Michel Temer also woke up one hour
# earlier today. :)
Rule Brazil 2018 max - Nov Sun>=1 0:00 1:00 -
Rule Brazil 2023 only - Feb Sun>=22 0:00 0 -
Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 -
...
...
@@ -1254,6 +1264,24 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914
# they will switch from -03 to -04 one hour after Santiago does that day.
# For now, assume that they will not revert.
# From Juan Correa (2018-08-13):
# As of moments ago, the Ministry of Energy in Chile has announced the new
# schema for DST. ... Announcement in video (in Spanish):
# https://twitter.com/MinEnergia/status/1029000399129374720
# From Yonathan Dossow (2018-08-13):
# The video says "first Saturday of September", we all know it means Sunday at
# midnight.
# From Tim Parenti (2018-08-13):
# Translating the captions on the video at 0:44-0:55, "We want to announce as
# Government that from 2019, Winter Time will be increased to 5 months, between
# the first Saturday of April and the first Saturday of September."
# At 2:08-2:20, "The Magallanes region will maintain its current time, as
# decided by the citizens during 2017, but our Government will promote a
# regional dialogue table to gather their opinion on this matter."
# https://twitter.com/MinEnergia/status/1029009354001973248
# "We will keep the new time policy unchanged for at least the next 4 years."
# So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Chile 1927 1931 - Sep 1 0:00 1:00 -
Rule Chile 1928 1932 - Apr 1 0:00 0 -
...
...
@@ -1287,8 +1315,10 @@ Rule Chile 2011 only - May Sun>=2 3:00u 0 -
Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 -
Rule Chile 2012 2014 - Apr Sun>=23 3:00u 0 -
Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 -
Rule Chile 2016 max - May Sun>=9 3:00u 0 -
Rule Chile 2016 max - Aug Sun>=9 4:00u 1:00 -
Rule Chile 2016 2018 - May Sun>=9 3:00u 0 -
Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 -
Rule Chile 2019 max - Apr Sun>=2 3:00u 0 -
Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
# (1996-09) says 1998-03-08. Ignore these.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
...
...
test/sun/util/calendar/zi/tzdata/systemv
浏览文件 @
f72ca2c9
...
...
@@ -21,6 +21,8 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tzdb data for System V rules (this file is obsolete)
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
...
...
test/sun/util/calendar/zi/tzdata/zone.tab
浏览文件 @
f72ca2c9
...
...
@@ -21,12 +21,12 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# tz
zone descriptions (deprecated version)
# tz
db time
zone descriptions (deprecated version)
#
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
# From Paul Eggert (201
4-07-31
):
# From Paul Eggert (201
8-06-27
):
# 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:
...
...
@@ -35,13 +35,13 @@
# 2. The first data column contains exactly one country code.
#
# Because of (2), each row stands for an area that is the intersection
# of a region identified by a country code and of a zone where civil
# of a region identified by a country code and of a
time
zone where civil
# clocks have agreed since 1970; this is a narrower definition than
# that of zone1970.tab.
#
# This table is intended as an aid for users, to help them select time
#
zone data entries appropriate for their practical needs. It is not
#
intended to take or
endorse any position on legal or territorial claims.
# This table is intended as an aid for users, to help them select time
zones
#
appropriate for their practical needs. It is not intended to take or
# endorse any position on legal or territorial claims.
#
#country-
#code coordinates TZ comments
...
...
@@ -291,7 +291,7 @@ MM +1647+09610 Asia/Yangon
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
MO +221
4+11335
Asia/Macau
MO +221
150+1133230
Asia/Macau
MP +1512+14545 Pacific/Saipan
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录