Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
08bbd5f0
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
08bbd5f0
编写于
12月 12, 2016
作者:
R
rpatil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8170316: (tz) Support tzdata2016j
Reviewed-by: martin, okutsu
上级
7e544225
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
174 addition
and
100 deletion
+174
-100
make/data/tzdata/VERSION
make/data/tzdata/VERSION
+1
-1
make/data/tzdata/africa
make/data/tzdata/africa
+1
-1
make/data/tzdata/asia
make/data/tzdata/asia
+55
-40
make/data/tzdata/europe
make/data/tzdata/europe
+23
-3
make/data/tzdata/iso3166.tab
make/data/tzdata/iso3166.tab
+1
-1
make/data/tzdata/zone.tab
make/data/tzdata/zone.tab
+6
-4
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
+1
-1
test/sun/util/calendar/zi/tzdata/asia
test/sun/util/calendar/zi/tzdata/asia
+55
-40
test/sun/util/calendar/zi/tzdata/europe
test/sun/util/calendar/zi/tzdata/europe
+23
-3
test/sun/util/calendar/zi/tzdata/iso3166.tab
test/sun/util/calendar/zi/tzdata/iso3166.tab
+1
-1
test/sun/util/calendar/zi/tzdata/zone.tab
test/sun/util/calendar/zi/tzdata/zone.tab
+6
-4
未找到文件。
make/data/tzdata/VERSION
浏览文件 @
08bbd5f0
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2016
i
tzdata2016
j
make/data/tzdata/africa
浏览文件 @
08bbd5f0
...
...
@@ -142,7 +142,7 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
# Cameroon
# See Africa/Lagos.
# Cape Verde
# Cape Verde
/ Cabo Verde
#
# Shanks gives 1907 for the transition to CVT.
# Perhaps the 1911-05-26 Portuguese decree
...
...
make/data/tzdata/asia
浏览文件 @
08bbd5f0
...
...
@@ -1606,12 +1606,12 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# was "blended" with the Central zone. Therefore, Kazakhstan now has
# two time zones, and difference between them is one hour. The zone
# closer to UTC is the former Western zone (probably still called the
# same), encompassing four provinces in the west: Aqt
obe, Atyrau
,
# Mangghysta
u
, and West Kazakhstan. The other zone encompasses
# same), encompassing four provinces in the west: Aqt
öbe, Atyraū
,
# Mangghysta
ū
, and West Kazakhstan. The other zone encompasses
# everything else.... I guess that would make Kazakhstan time zones
# de jure UTC+5 and UTC+6 respectively.
# From Stepan Golosunov (2016-03-27)
([*] means see later comments below)
:
# From Stepan Golosunov (2016-03-27):
# Review of the linked documents from http://adilet.zan.kz/
# produced the following data for post-1991 Kazakhstan:
#
...
...
@@ -1657,7 +1657,7 @@ Zone Asia/Amman 2:23:44 - LMT 1931
#
# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
# to +04/+05. It's unclear how
Kzyl-O
rda oblast moved into the fifth
# to +04/+05. It's unclear how
Qyzylo
rda oblast moved into the fifth
# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
#
# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
...
...
@@ -1670,25 +1670,25 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
# 2:00, specified DST rules. It acknowledged that Kazakhstan was
# located in the fourth and the fifth time belts and specified the
# border between them to be located east of
Ku
stanay and Aktyubinsk
# oblasts (notably including Turgai and
Kzyl-O
rda oblasts into the fifth
# border between them to be located east of
Qo
stanay and Aktyubinsk
# oblasts (notably including Turgai and
Qyzylo
rda oblasts into the fifth
# time belt).
#
# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyra
u and Ku
stanay oblasts; from
# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)
[*]
....
# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyra
ū and Qo
stanay oblasts; from
# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)....
#
# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
# from 1992-03-27 No. 284
# http://adilet.zan.kz/rus/docs/P920000284_
# cancels extra hour ("decree time") for Uralsk and
Kzyl-O
rda oblasts
# cancels extra hour ("decree time") for Uralsk and
Qyzylo
rda oblasts
# since the last Sunday of March 1992, while keeping them in the fourth
# and the fifth time belts respectively.
#
# 3. Order of the Prime Minister of the Republic of Kazakhstan
# from 1994-09-23 No. 384
# http://adilet.zan.kz/rus/docs/R940000384_
# cancels the extra hour ("decree time") on the territory of Mang
ystau
# cancels the extra hour ("decree time") on the territory of Mang
ghystaū
# oblast since the last Sunday of September 1994 (saying that time on
# the territory would correspond to the third time belt as a
# result)....
...
...
@@ -1702,14 +1702,11 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# 5. Act of the Government of the Republic of Kazakhstan
# from 1999-03-26 No. 305
# http://adilet.zan.kz/rus/docs/P990000305_
# cancels the extra hour ("decree time") for Atyra
u
oblast since the
# cancels the extra hour ("decree time") for Atyra
ū
oblast since the
# last Sunday of March 1999 while retaining the oblast in the fourth
# time belt.
#
# This means change from +05/+06 to +04/+05.
#
# There is no zone for Atyrau currently (listed under Asia/Aqtau in
# zone1970.tab).[*]
# This means change from +05/+06 to +04/+05....
#
# 6. Act of the Government of the Republic of Kazakhstan
# from 2000-11-23 No. 1749
...
...
@@ -1719,10 +1716,10 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# The only changes I noticed are in definition of the border between the
# fourth and the fifth time belts. They account for changes in spelling
# and administrative division (splitting of Turgai oblast in 1997
# probably changed time in territories incorporated into
K
ostanay oblast
# (including Arkalyk) from +06/+07 to +05/+06) and move
K
yzylorda oblast
# probably changed time in territories incorporated into
Q
ostanay oblast
# (including Arkalyk) from +06/+07 to +05/+06) and move
Q
yzylorda oblast
# from being in the fifth time belt and not using decree time into the
# fourth time belt (no change in practice).
[*]
# fourth time belt (no change in practice).
#
# 7. Act of the Government of the Republic of Kazakhstan
# from 2003-12-29 No. 1342
...
...
@@ -1732,7 +1729,7 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# 8. Act of the Government of the Republic of Kazakhstan
# from 2004-07-20 No. 775
# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
# modified the 2000-11-23 act to move
Kostanay and K
yzylorda oblasts into
# modified the 2000-11-23 act to move
Qostanay and Q
yzylorda oblasts into
# the fifth time belt and add Aktobe oblast to the list of regions not
# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
# zones (+04/+05 and +06/+07). The changes were to be implemented
...
...
@@ -1744,14 +1741,14 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# http://adilet.zan.kz/rus/docs/P040001059_
# modified the 2000-11-23 act to remove exceptions from the "decree time"
# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
# 2004-07-20 act to implement changes for Atyra
u
, West Kazakhstan,
#
Kostanay, Kyzylorda and Mangystau
oblasts by not moving clocks
# during the 20
1
4 transition to "winter" time.
# 2004-07-20 act to implement changes for Atyra
ū
, West Kazakhstan,
#
Qostanay, Qyzylorda and Mangghystaū
oblasts by not moving clocks
# during the 20
0
4 transition to "winter" time.
#
# This means transition from +04/+05 to +05/+06 for Atyra
u
oblast (no
# This means transition from +04/+05 to +05/+06 for Atyra
ū
oblast (no
# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
# +06/+07 for
Kostanay oblast (K
ostanay and Arkalyk, no zones currently)
# and Asia/Qyzylorda on 2004-10-31 at 3:00....
[*]
# +06/+07 for
Qostanay oblast (Q
ostanay and Arkalyk, no zones currently)
# and Asia/Qyzylorda on 2004-10-31 at 3:00....
#
# 10. Act of the Government of the Republic of Kazakhstan
# from 2005-03-15 No. 231
...
...
@@ -1767,14 +1764,9 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
# act was to be enacted on the last Sunday of March 1992.
# From Paul Eggert (2016-04-15):
# The tables below should reflect Stepan Golosunov's remarks above,
# except for the items marked "[*]" which I haven't gotten to yet.
# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
# to handle changes from 1992 through 2004 that we did not previously
# know about.
# From Paul Eggert (2016-11-07):
# The tables below reflect Golosunov's remarks, with exceptions as noted.
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
# Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
...
...
@@ -1787,6 +1779,8 @@ Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata
6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s
6:00 - +06
# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
# This currently includes Qostanay (aka Kostanay, Kustanay) (KZ-KUS);
# see comments below.
Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Apr 1
...
...
@@ -1798,7 +1792,21 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
6:00 RussiaAsia +06/+07 1992 Mar 29 2:00s
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
6:00 - +06
# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
# The following zone is like Asia/Qyzylorda except for being one
# hour earlier from 1991-09-29 to 1992-03-29. The 1991/2 rules for
# Qostenay are unclear partly because of the 1997 Turgai
# reorganization, so this zone is commented out for now.
#Zone Asia/Qostanay 4:14:20 - LMT 1924 May 2
# 4:00 - +04 1930 Jun 21
# 5:00 - +05 1981 Apr 1
# 5:00 1:00 +06 1981 Oct 1
# 6:00 - +06 1982 Apr 1
# 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
# 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
# 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
# 6:00 - +06
#
# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Apr 1
...
...
@@ -1808,14 +1816,11 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
5:00 - +05
# Qostanay (KZ-KUS)
# Mangghystau (KZ-MAN)
# Mangghystaū (KZ-MAN)
# Aqtau was not founded until 1963, but it represents an inhabited region,
# so include time stamps before 1963.
Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1963
5:00 - +05 1981 Oct 1
6:00 - +06 1982 Apr 1
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
...
...
@@ -1823,7 +1828,17 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s
4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s
5:00 - +05
# Atyraū (KZ-ATY) is like Mangghystaū except it switched from
# +04/+05 to +05/+06 in spring 1999, not fall 1994.
Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Oct 1
6:00 - +06 1982 Apr 1
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s
4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s
5:00 - +05
# West Kazakhstan (KZ-ZAP)
# From Paul Eggert (2016-03-18):
# The 1989 transition is from USSR act No. 227 (1989-03-14).
...
...
@@ -2639,7 +2654,7 @@ Rule Palestine 2016 max - Oct lastSat 1:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Zion EET
1948 May 15
2:00 Zion EET
/EEST
1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
...
...
@@ -2652,7 +2667,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Palestine EE%sT
Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
2:00 Zion EET
1948 May 15
2:00 Zion EET
/EEST
1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
...
...
make/data/tzdata/europe
浏览文件 @
08bbd5f0
...
...
@@ -924,7 +924,7 @@ Zone Europe/Sofia 1:33:16 - LMT 1880
# Cyprus
# Please see the 'asia' file for Asia/Nicosia.
# Czech Republic
# Czech Republic
/ Czechia
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Czech 1945 only - Apr 8 2:00s 1:00 S
Rule Czech 1945 only - Nov 18 2:00s 0 -
...
...
@@ -2624,10 +2624,9 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May
3:00 - +03 2016 Mar 27 2:00s
4:00 - +04
# From Paul Eggert (2016-
03-18
):
# From Paul Eggert (2016-
11-11
):
# Europe/Volgograd covers:
# 34 RU-VGG Volgograd Oblast
# 64 RU-SAR Saratov Oblast
# The 1988 transition is from USSR act No. 5 (1988-01-04).
Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
...
...
@@ -2640,6 +2639,27 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 - +04 2014 Oct 26 2:00s
3:00 - +03
# From Paul Eggert (2016-11-11):
# Europe/Saratov covers:
# 64 RU-SAR Saratov Oblast
# From Yuri Konotopov (2016-11-11):
# Dec 4, 2016 02:00 UTC+3.... Saratov Region's local time will be ... UTC+4.
# From Stepan Golosunov (2016-11-11):
# ... Byalokoz listed Saratov on 03:04:18.
# From Stepan Golosunov (2016-11-22):
# http://publication.pravo.gov.ru/Document/View/0001201611220031
Zone Europe/Saratov 3:04:18 - LMT 1919 Jul 1 0:00u
3:00 - +03 1930 Jun 21
4:00 Russia +04/+05 1988 Mar 27 2:00s
3:00 Russia +03/+04 1991 Mar 31 2:00s
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 2016 Dec 4 2:00s
4:00 - +04
# From Paul Eggert (2016-03-18):
# Europe/Kirov covers:
# 43 RU-KIR Kirov Oblast
...
...
make/data/tzdata/iso3166.tab
浏览文件 @
08bbd5f0
...
...
@@ -98,7 +98,7 @@ CO Colombia
CR Costa Rica
CU Cuba
CV Cape Verde
CW Cura
c
ao
CW Cura
ç
ao
CX Christmas Island
CY Cyprus
CZ Czech Republic
...
...
make/data/tzdata/zone.tab
浏览文件 @
08bbd5f0
...
...
@@ -262,7 +262,8 @@ KY +1918-08123 America/Cayman
KZ +4315+07657 Asia/Almaty Kazakhstan (most areas)
KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe
KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau
KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev
KZ +5113+05121 Asia/Oral West Kazakhstan
LA +1758+10236 Asia/Vientiane
LB +3353+03530 Asia/Beirut
...
...
@@ -353,14 +354,15 @@ RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
RU +4457+03406 Europe/Simferopol MSK+00 - Crimea
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
, Saratov
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan
RU +5
312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
RU +5
134+04602 Europe/Saratov MSK+01 - Saratov
RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk
RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg MSK+02 - Urals
RU +5500+07324 Asia/Omsk MSK+03 - Omsk
RU +5502+08255 Asia/Novosibirsk MSK+0
3
- Novosibirsk
RU +5502+08255 Asia/Novosibirsk MSK+0
4
- Novosibirsk
RU +5322+08345 Asia/Barnaul MSK+04 - Altai
RU +5630+08458 Asia/Tomsk MSK+04 - Tomsk
RU +5345+08707 Asia/Novokuznetsk MSK+04 - Kemerovo
...
...
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @
08bbd5f0
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2016
i
tzdata2016
j
test/sun/util/calendar/zi/tzdata/africa
浏览文件 @
08bbd5f0
...
...
@@ -142,7 +142,7 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01
# Cameroon
# See Africa/Lagos.
# Cape Verde
# Cape Verde
/ Cabo Verde
#
# Shanks gives 1907 for the transition to CVT.
# Perhaps the 1911-05-26 Portuguese decree
...
...
test/sun/util/calendar/zi/tzdata/asia
浏览文件 @
08bbd5f0
...
...
@@ -1606,12 +1606,12 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# was "blended" with the Central zone. Therefore, Kazakhstan now has
# two time zones, and difference between them is one hour. The zone
# closer to UTC is the former Western zone (probably still called the
# same), encompassing four provinces in the west: Aqt
obe, Atyrau
,
# Mangghysta
u
, and West Kazakhstan. The other zone encompasses
# same), encompassing four provinces in the west: Aqt
öbe, Atyraū
,
# Mangghysta
ū
, and West Kazakhstan. The other zone encompasses
# everything else.... I guess that would make Kazakhstan time zones
# de jure UTC+5 and UTC+6 respectively.
# From Stepan Golosunov (2016-03-27)
([*] means see later comments below)
:
# From Stepan Golosunov (2016-03-27):
# Review of the linked documents from http://adilet.zan.kz/
# produced the following data for post-1991 Kazakhstan:
#
...
...
@@ -1657,7 +1657,7 @@ Zone Asia/Amman 2:23:44 - LMT 1931
#
# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
# to +04/+05. It's unclear how
Kzyl-O
rda oblast moved into the fifth
# to +04/+05. It's unclear how
Qyzylo
rda oblast moved into the fifth
# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
#
# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
...
...
@@ -1670,25 +1670,25 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
# 2:00, specified DST rules. It acknowledged that Kazakhstan was
# located in the fourth and the fifth time belts and specified the
# border between them to be located east of
Ku
stanay and Aktyubinsk
# oblasts (notably including Turgai and
Kzyl-O
rda oblasts into the fifth
# border between them to be located east of
Qo
stanay and Aktyubinsk
# oblasts (notably including Turgai and
Qyzylo
rda oblasts into the fifth
# time belt).
#
# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyra
u and Ku
stanay oblasts; from
# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)
[*]
....
# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyra
ū and Qo
stanay oblasts; from
# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)....
#
# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
# from 1992-03-27 No. 284
# http://adilet.zan.kz/rus/docs/P920000284_
# cancels extra hour ("decree time") for Uralsk and
Kzyl-O
rda oblasts
# cancels extra hour ("decree time") for Uralsk and
Qyzylo
rda oblasts
# since the last Sunday of March 1992, while keeping them in the fourth
# and the fifth time belts respectively.
#
# 3. Order of the Prime Minister of the Republic of Kazakhstan
# from 1994-09-23 No. 384
# http://adilet.zan.kz/rus/docs/R940000384_
# cancels the extra hour ("decree time") on the territory of Mang
ystau
# cancels the extra hour ("decree time") on the territory of Mang
ghystaū
# oblast since the last Sunday of September 1994 (saying that time on
# the territory would correspond to the third time belt as a
# result)....
...
...
@@ -1702,14 +1702,11 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# 5. Act of the Government of the Republic of Kazakhstan
# from 1999-03-26 No. 305
# http://adilet.zan.kz/rus/docs/P990000305_
# cancels the extra hour ("decree time") for Atyra
u
oblast since the
# cancels the extra hour ("decree time") for Atyra
ū
oblast since the
# last Sunday of March 1999 while retaining the oblast in the fourth
# time belt.
#
# This means change from +05/+06 to +04/+05.
#
# There is no zone for Atyrau currently (listed under Asia/Aqtau in
# zone1970.tab).[*]
# This means change from +05/+06 to +04/+05....
#
# 6. Act of the Government of the Republic of Kazakhstan
# from 2000-11-23 No. 1749
...
...
@@ -1719,10 +1716,10 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# The only changes I noticed are in definition of the border between the
# fourth and the fifth time belts. They account for changes in spelling
# and administrative division (splitting of Turgai oblast in 1997
# probably changed time in territories incorporated into
K
ostanay oblast
# (including Arkalyk) from +06/+07 to +05/+06) and move
K
yzylorda oblast
# probably changed time in territories incorporated into
Q
ostanay oblast
# (including Arkalyk) from +06/+07 to +05/+06) and move
Q
yzylorda oblast
# from being in the fifth time belt and not using decree time into the
# fourth time belt (no change in practice).
[*]
# fourth time belt (no change in practice).
#
# 7. Act of the Government of the Republic of Kazakhstan
# from 2003-12-29 No. 1342
...
...
@@ -1732,7 +1729,7 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# 8. Act of the Government of the Republic of Kazakhstan
# from 2004-07-20 No. 775
# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
# modified the 2000-11-23 act to move
Kostanay and K
yzylorda oblasts into
# modified the 2000-11-23 act to move
Qostanay and Q
yzylorda oblasts into
# the fifth time belt and add Aktobe oblast to the list of regions not
# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
# zones (+04/+05 and +06/+07). The changes were to be implemented
...
...
@@ -1744,14 +1741,14 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# http://adilet.zan.kz/rus/docs/P040001059_
# modified the 2000-11-23 act to remove exceptions from the "decree time"
# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
# 2004-07-20 act to implement changes for Atyra
u
, West Kazakhstan,
#
Kostanay, Kyzylorda and Mangystau
oblasts by not moving clocks
# during the 20
1
4 transition to "winter" time.
# 2004-07-20 act to implement changes for Atyra
ū
, West Kazakhstan,
#
Qostanay, Qyzylorda and Mangghystaū
oblasts by not moving clocks
# during the 20
0
4 transition to "winter" time.
#
# This means transition from +04/+05 to +05/+06 for Atyra
u
oblast (no
# This means transition from +04/+05 to +05/+06 for Atyra
ū
oblast (no
# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
# +06/+07 for
Kostanay oblast (K
ostanay and Arkalyk, no zones currently)
# and Asia/Qyzylorda on 2004-10-31 at 3:00....
[*]
# +06/+07 for
Qostanay oblast (Q
ostanay and Arkalyk, no zones currently)
# and Asia/Qyzylorda on 2004-10-31 at 3:00....
#
# 10. Act of the Government of the Republic of Kazakhstan
# from 2005-03-15 No. 231
...
...
@@ -1767,14 +1764,9 @@ Zone Asia/Amman 2:23:44 - LMT 1931
# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
# act was to be enacted on the last Sunday of March 1992.
# From Paul Eggert (2016-04-15):
# The tables below should reflect Stepan Golosunov's remarks above,
# except for the items marked "[*]" which I haven't gotten to yet.
# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay
# to handle changes from 1992 through 2004 that we did not previously
# know about.
# From Paul Eggert (2016-11-07):
# The tables below reflect Golosunov's remarks, with exceptions as noted.
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
# Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
...
...
@@ -1787,6 +1779,8 @@ Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata
6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s
6:00 - +06
# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
# This currently includes Qostanay (aka Kostanay, Kustanay) (KZ-KUS);
# see comments below.
Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Apr 1
...
...
@@ -1798,7 +1792,21 @@ Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
6:00 RussiaAsia +06/+07 1992 Mar 29 2:00s
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
6:00 - +06
# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
# The following zone is like Asia/Qyzylorda except for being one
# hour earlier from 1991-09-29 to 1992-03-29. The 1991/2 rules for
# Qostenay are unclear partly because of the 1997 Turgai
# reorganization, so this zone is commented out for now.
#Zone Asia/Qostanay 4:14:20 - LMT 1924 May 2
# 4:00 - +04 1930 Jun 21
# 5:00 - +05 1981 Apr 1
# 5:00 1:00 +06 1981 Oct 1
# 6:00 - +06 1982 Apr 1
# 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
# 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
# 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
# 6:00 - +06
#
# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Apr 1
...
...
@@ -1808,14 +1816,11 @@ Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s
5:00 - +05
# Qostanay (KZ-KUS)
# Mangghystau (KZ-MAN)
# Mangghystaū (KZ-MAN)
# Aqtau was not founded until 1963, but it represents an inhabited region,
# so include time stamps before 1963.
Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1963
5:00 - +05 1981 Oct 1
6:00 - +06 1982 Apr 1
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
...
...
@@ -1823,7 +1828,17 @@ Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2
5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s
4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s
5:00 - +05
# Atyraū (KZ-ATY) is like Mangghystaū except it switched from
# +04/+05 to +05/+06 in spring 1999, not fall 1994.
Zone Asia/Atyrau 3:27:44 - LMT 1924 May 2
4:00 - +04 1930 Jun 21
5:00 - +05 1981 Oct 1
6:00 - +06 1982 Apr 1
5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s
5:00 RussiaAsia +05/+06 1999 Mar 28 2:00s
4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s
5:00 - +05
# West Kazakhstan (KZ-ZAP)
# From Paul Eggert (2016-03-18):
# The 1989 transition is from USSR act No. 227 (1989-03-14).
...
...
@@ -2639,7 +2654,7 @@ Rule Palestine 2016 max - Oct lastSat 1:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Zion EET
1948 May 15
2:00 Zion EET
/EEST
1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
...
...
@@ -2652,7 +2667,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Palestine EE%sT
Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
2:00 Zion EET
1948 May 15
2:00 Zion EET
/EEST
1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
...
...
test/sun/util/calendar/zi/tzdata/europe
浏览文件 @
08bbd5f0
...
...
@@ -924,7 +924,7 @@ Zone Europe/Sofia 1:33:16 - LMT 1880
# Cyprus
# Please see the 'asia' file for Asia/Nicosia.
# Czech Republic
# Czech Republic
/ Czechia
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Czech 1945 only - Apr 8 2:00s 1:00 S
Rule Czech 1945 only - Nov 18 2:00s 0 -
...
...
@@ -2624,10 +2624,9 @@ Zone Europe/Astrakhan 3:12:12 - LMT 1924 May
3:00 - +03 2016 Mar 27 2:00s
4:00 - +04
# From Paul Eggert (2016-
03-18
):
# From Paul Eggert (2016-
11-11
):
# Europe/Volgograd covers:
# 34 RU-VGG Volgograd Oblast
# 64 RU-SAR Saratov Oblast
# The 1988 transition is from USSR act No. 5 (1988-01-04).
Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
...
...
@@ -2640,6 +2639,27 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3
4:00 - +04 2014 Oct 26 2:00s
3:00 - +03
# From Paul Eggert (2016-11-11):
# Europe/Saratov covers:
# 64 RU-SAR Saratov Oblast
# From Yuri Konotopov (2016-11-11):
# Dec 4, 2016 02:00 UTC+3.... Saratov Region's local time will be ... UTC+4.
# From Stepan Golosunov (2016-11-11):
# ... Byalokoz listed Saratov on 03:04:18.
# From Stepan Golosunov (2016-11-22):
# http://publication.pravo.gov.ru/Document/View/0001201611220031
Zone Europe/Saratov 3:04:18 - LMT 1919 Jul 1 0:00u
3:00 - +03 1930 Jun 21
4:00 Russia +04/+05 1988 Mar 27 2:00s
3:00 Russia +03/+04 1991 Mar 31 2:00s
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 2016 Dec 4 2:00s
4:00 - +04
# From Paul Eggert (2016-03-18):
# Europe/Kirov covers:
# 43 RU-KIR Kirov Oblast
...
...
test/sun/util/calendar/zi/tzdata/iso3166.tab
浏览文件 @
08bbd5f0
...
...
@@ -98,7 +98,7 @@ CO Colombia
CR Costa Rica
CU Cuba
CV Cape Verde
CW Cura
c
ao
CW Cura
ç
ao
CX Christmas Island
CY Cyprus
CZ Czech Republic
...
...
test/sun/util/calendar/zi/tzdata/zone.tab
浏览文件 @
08bbd5f0
...
...
@@ -262,7 +262,8 @@ KY +1918-08123 America/Cayman
KZ +4315+07657 Asia/Almaty Kazakhstan (most areas)
KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe
KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau
KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau
KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev
KZ +5113+05121 Asia/Oral West Kazakhstan
LA +1758+10236 Asia/Vientiane
LB +3353+03530 Asia/Beirut
...
...
@@ -353,14 +354,15 @@ RS +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
RU +4457+03406 Europe/Simferopol MSK+00 - Crimea
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
, Saratov
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan
RU +5
312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
RU +5
134+04602 Europe/Saratov MSK+01 - Saratov
RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk
RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg MSK+02 - Urals
RU +5500+07324 Asia/Omsk MSK+03 - Omsk
RU +5502+08255 Asia/Novosibirsk MSK+0
3
- Novosibirsk
RU +5502+08255 Asia/Novosibirsk MSK+0
4
- Novosibirsk
RU +5322+08345 Asia/Barnaul MSK+04 - Altai
RU +5630+08458 Asia/Tomsk MSK+04 - Tomsk
RU +5345+08707 Asia/Novokuznetsk MSK+04 - Kemerovo
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录