Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
94d30dcb
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看板
提交
94d30dcb
编写于
1月 31, 2014
作者:
A
aefimov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8030822: (tz) Support tzdata2013i
Reviewed-by: coffeys
上级
cc465e7b
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
85 addition
and
51 deletion
+85
-51
make/data/tzdata/VERSION
make/data/tzdata/VERSION
+1
-1
make/data/tzdata/africa
make/data/tzdata/africa
+2
-3
make/data/tzdata/asia
make/data/tzdata/asia
+21
-9
make/data/tzdata/northamerica
make/data/tzdata/northamerica
+7
-1
src/share/classes/sun/util/resources/TimeZoneNames.java
src/share/classes/sun/util/resources/TimeZoneNames.java
+2
-2
src/share/classes/sun/util/resources/TimeZoneNamesBundle.java
...share/classes/sun/util/resources/TimeZoneNamesBundle.java
+1
-1
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
...share/classes/sun/util/resources/de/TimeZoneNames_de.java
+2
-2
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
...share/classes/sun/util/resources/es/TimeZoneNames_es.java
+2
-2
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
...share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
+2
-2
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
...share/classes/sun/util/resources/it/TimeZoneNames_it.java
+2
-2
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
...share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
+2
-2
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
...share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
+2
-2
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
...re/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
+2
-2
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
...share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
+2
-2
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
+2
-2
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
...re/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
+2
-2
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
+2
-3
test/sun/util/calendar/zi/tzdata/asia
test/sun/util/calendar/zi/tzdata/asia
+21
-9
test/sun/util/calendar/zi/tzdata/northamerica
test/sun/util/calendar/zi/tzdata/northamerica
+7
-1
未找到文件。
make/data/tzdata/VERSION
浏览文件 @
94d30dcb
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2013
h
tzdata2013
i
make/data/tzdata/africa
浏览文件 @
94d30dcb
...
...
@@ -500,14 +500,13 @@ Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
Rule Libya 2013 only - Oct lastFri 2:00 0 -
# The 1996 and 1997 entries are from Shanks & Pottenger;
# the IATA SSIM data contain some obvious errors.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4
# The 1996 and 1997 entries are from Shanks & Pottenger;
# the IATA SSIM data contain some obvious errors.
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
...
...
make/data/tzdata/asia
浏览文件 @
94d30dcb
...
...
@@ -1403,12 +1403,22 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
# switch back to standard time this winter, so the will stay on DST
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
#
# From Paul Eggert (2013-09-21):
# It's looking like this change will be permanent; see
# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
# So move Jordan to UTC+3 as of the abovementioned date.
# From Steffen Thorsen (2013-12-11):
# Jordan Times and other sources say that Jordan is going back to
# UTC+2 on 2013-12-19 at midnight:
# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime
# Official, in Arabic:
# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
# ... Our background/permalink about it
# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
# ...
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
# ... says midnight for the coming one and 1:00 for the ones in the future
# (and they will use DST again next year, using the normal schedule).
# From Paul Eggert (2013-12-11):
# As Steffen suggested, consider the past 21-month experiment to be DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
...
...
@@ -1438,11 +1448,13 @@ Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
Rule Jordan 2013 only - Dec 20 0:00 0 -
Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S
Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
2:00 Jordan EE%sT 2012 Oct 26 0:00s
3:00 - AST
2:00 Jordan EE%sT
# Kazakhstan
...
...
make/data/tzdata/northamerica
浏览文件 @
94d30dcb
...
...
@@ -2688,6 +2688,11 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
# to DST--and one more hour on 1999-04-04--when the announcers will have
# returned to Baltimore, which switches on that date.)
# From Steffen Thorsen (2013-11-11):
# DST start in Cuba in 2004 ... does not follow the same rules as the
# years before. The correct date should be Sunday 2004-03-28 00:00 ...
# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html
# From Evert van der Veer via Steffen Thorsen (2004-10-28):
# Cuba is not going back to standard time this year.
# From Paul Eggert (2006-03-22):
...
...
@@ -2877,7 +2882,8 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S
Rule Cuba 1997 only - Oct 12 0:00s 0 S
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D
Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D
Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D
...
...
src/share/classes/sun/util/resources/TimeZoneNames.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1996, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Alma-Ata Time"
,
"ALMT"
,
"Alma-Ata Summer Time"
,
"ALMST"
,
"Alma-Ata Time"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Anadyr Time"
,
"ANAT"
,
"Anadyr Summer Time"
,
"ANAST"
,
"Anadyr Time"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/TimeZoneNamesBundle.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 2005, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
4
, 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
...
...
src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Alma Ata Zeit"
,
"ALMT"
,
"Alma-Ata Sommerzeit"
,
"ALMST"
,
"Alma Ata Zeit"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Anadyr Zeit"
,
"ANAT"
,
"Anadyr Sommerzeit"
,
"ANAST"
,
"Anadyr Zeit"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Hora de Alma-Ata"
,
"ALMT"
,
"Hora de verano de Alma-Ata"
,
"ALMST"
,
"Hora de Alma-Ata"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Hora de Anadyr"
,
"ANAT"
,
"Hora de verano de Anadyr"
,
"ANAST"
,
"Hora de Anadyr"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Heure d'Alma-Ata"
,
"ALMT"
,
"Heure d'\u00e9t\u00e9 d'Alma-Ata"
,
"ALMST"
,
"Heure d'Alma-Ata"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Heure d'Anadyr"
,
"ANAT"
,
"Heure d'\u00e9t\u00e9 d'Anadyr"
,
"ANAST"
,
"Heure d'Anadyr"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Ora di Alma-Ata"
,
"ALMT"
,
"Ora estiva di Alma-Ata"
,
"ALMST"
,
"Ora di Alma-Ata"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Ora di Anadyr"
,
"ANAT"
,
"Ora estiva di Anadyr"
,
"ANAST"
,
"Ora di Anadyr"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"\u30a2\u30eb\u30de\u30a2\u30bf\u6642\u9593"
,
"ALMT"
,
"\u30a2\u30eb\u30de\u30a2\u30bf\u590f\u6642\u9593"
,
"ALMST"
,
"\u30A2\u30EB\u30DE\u30A2\u30BF\u6642\u9593"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u6642\u9593"
,
"ANAT"
,
"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u590f\u6642\u9593"
,
"ANAST"
,
"\u30A2\u30CA\u30C7\u30A3\u30EA\u6642\u9593"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"\uc54c\ub9c8\uc544\ud0c0 \uc2dc\uac04"
,
"ALMT"
,
"\uc54c\ub9c8\uc544\ud0c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"ALMST"
,
"\uC54C\uB9C8\uC544\uD0C0 \uD45C\uC900\uC2DC"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"\uc544\ub098\ub514\ub974 \uc2dc\uac04"
,
"ANAT"
,
"\uc544\ub098\ub514\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04"
,
"ANAST"
,
"\uC544\uB098\uB514\uB9AC \uD45C\uC900\uC2DC"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Fuso hor\u00e1rio de Alma-Ata"
,
"ALMT"
,
"Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata"
,
"ALMST"
,
"Hor\u00E1rio de Alma-Ata"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Fuso hor\u00e1rio de Anadyr"
,
"ANAT"
,
"Fuso hor\u00e1rio de ver\u00e3o de Anadyr"
,
"ANAST"
,
"Hor\u00E1rio de Anadyr"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Alma-Ata, normaltid"
,
"ALMT"
,
"Alma-Ata, sommartid"
,
"ALMST"
,
"Alma-Ata-tid"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"Anadyr, normaltid"
,
"ANAT"
,
"Anadyr, sommartid"
,
"ANAST"
,
"Anadyr-tid"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Alma-Ata \u65f6\u95f4"
,
"ALMT"
,
"Alma-Ata \u590f\u4ee4\u65f6"
,
"ALMST"
,
"Alma-Ata \u65F6\u95F4"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"\u963f\u90a3\u5e95\u6cb3\u65f6\u95f4"
,
"ANAT"
,
"\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u65f6"
,
"ANAST"
,
"\u963F\u90A3\u5E95\u6CB3\u65F6\u95F4"
,
"ANAT"
}},
...
...
src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
浏览文件 @
94d30dcb
/*
* Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 201
4
, 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
...
...
@@ -578,7 +578,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {
{
"Asia/Almaty"
,
new
String
[]
{
"Alma-Ata \u6642\u9593"
,
"ALMT"
,
"Alma-Ata \u590f\u4ee4\u6642\u9593"
,
"ALMST"
,
"\u963F\u62C9\u6728\u5716\u6642\u9593"
,
"ALMT"
}},
{
"Asia/Amman"
,
ARAS
T
},
{
"Asia/Amman"
,
EE
T
},
{
"Asia/Anadyr"
,
new
String
[]
{
"\u963f\u90a3\u5e95\u6cb3\u6642\u9593"
,
"ANAT"
,
"\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u6642\u9593"
,
"ANAST"
,
"\u963F\u90A3\u5E95\u6CB3\u6642\u9593"
,
"ANAT"
}},
...
...
test/sun/util/calendar/zi/tzdata/VERSION
浏览文件 @
94d30dcb
...
...
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
tzdata2013
h
tzdata2013
i
test/sun/util/calendar/zi/tzdata/africa
浏览文件 @
94d30dcb
...
...
@@ -500,14 +500,13 @@ Rule Libya 1997 only - Apr 4 0:00 1:00 S
Rule Libya 1997 only - Oct 4 0:00 0 -
Rule Libya 2013 only - Mar lastFri 1:00 1:00 S
Rule Libya 2013 only - Oct lastFri 2:00 0 -
# The 1996 and 1997 entries are from Shanks & Pottenger;
# the IATA SSIM data contain some obvious errors.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 1959
2:00 - EET 1982
1:00 Libya CE%sT 1990 May 4
# The 1996 and 1997 entries are from Shanks & Pottenger;
# the IATA SSIM data contain some obvious errors.
2:00 - EET 1996 Sep 30
1:00 Libya CE%sT 1997 Oct 4
2:00 - EET 2012 Nov 10 2:00
...
...
test/sun/util/calendar/zi/tzdata/asia
浏览文件 @
94d30dcb
...
...
@@ -1403,12 +1403,22 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
# switch back to standard time this winter, so the will stay on DST
# until about the same time next year (at least).
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
#
# From Paul Eggert (2013-09-21):
# It's looking like this change will be permanent; see
# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
# So move Jordan to UTC+3 as of the abovementioned date.
# From Steffen Thorsen (2013-12-11):
# Jordan Times and other sources say that Jordan is going back to
# UTC+2 on 2013-12-19 at midnight:
# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime
# Official, in Arabic:
# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
# ... Our background/permalink about it
# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
# ...
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
# ... says midnight for the coming one and 1:00 for the ones in the future
# (and they will use DST again next year, using the normal schedule).
# From Paul Eggert (2013-12-11):
# As Steffen suggested, consider the past 21-month experiment to be DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
...
...
@@ -1438,11 +1448,13 @@ Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S
Rule Jordan 2003 only - Oct 24 0:00s 0 -
Rule Jordan 2004 only - Oct 15 0:00s 0 -
Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 -
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
Rule Jordan 2013 only - Dec 20 0:00 0 -
Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S
Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Amman 2:23:44 - LMT 1931
2:00 Jordan EE%sT 2012 Oct 26 0:00s
3:00 - AST
2:00 Jordan EE%sT
# Kazakhstan
...
...
test/sun/util/calendar/zi/tzdata/northamerica
浏览文件 @
94d30dcb
...
...
@@ -2688,6 +2688,11 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose
# to DST--and one more hour on 1999-04-04--when the announcers will have
# returned to Baltimore, which switches on that date.)
# From Steffen Thorsen (2013-11-11):
# DST start in Cuba in 2004 ... does not follow the same rules as the
# years before. The correct date should be Sunday 2004-03-28 00:00 ...
# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html
# From Evert van der Veer via Steffen Thorsen (2004-10-28):
# Cuba is not going back to standard time this year.
# From Paul Eggert (2006-03-22):
...
...
@@ -2877,7 +2882,8 @@ Rule Cuba 1996 only - Oct 6 0:00s 0 S
Rule Cuba 1997 only - Oct 12 0:00s 0 S
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
Rule Cuba 2000 2003 - Apr Sun>=1 0:00s 1:00 D
Rule Cuba 2004 only - Mar lastSun 0:00s 1:00 D
Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录