summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--icu4c/source/data/misc/metaZones.txt9
-rw-r--r--icu4c/source/data/misc/zoneinfo64.txt61
-rw-r--r--icu4c/source/tools/tzcode/icuzones74
3 files changed, 92 insertions, 52 deletions
diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt
index a9c148a3a..ba47caa8d 100644
--- a/icu4c/source/data/misc/metaZones.txt
+++ b/icu4c/source/data/misc/metaZones.txt
@@ -1094,11 +1094,11 @@ metaZones:table(nofallback){
{
"Africa_Western",
"1994-03-20 22:00",
- "2017-09-03 01:00",
+ "2017-10-23 22:00",
}
{
"Africa_Central",
- "2017-09-03 01:00",
+ "2017-10-23 22:00",
"9999-12-31 23:59",
}
}
@@ -3132,6 +3132,11 @@ metaZones:table(nofallback){
{
"Pyongyang",
"2015-08-14 15:00",
+ "2018-05-05 08:30",
+ }
+ {
+ "Korea",
+ "2018-05-05 08:30",
"9999-12-31 23:59",
}
}
diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt
index 30fab0972..2178faa9f 100644
--- a/icu4c/source/data/misc/zoneinfo64.txt
+++ b/icu4c/source/data/misc/zoneinfo64.txt
@@ -3,9 +3,9 @@
// License & terms of use: http://www.unicode.org/copyright.html#License
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Wed Mar 28 09:18:39 2018
+// Build date: Fri May 4 03:52:35 2018
// tz database: ftp://ftp.iana.org/tz/
-// tz version: 2018d
+// tz version: 2018e
// ICU version: 61.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
@@ -13,7 +13,7 @@
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2018d" }
+ TZVersion { "2018e" }
Zones:array {
/* ACT */ :int { 354 } //Z#0
/* AET */ :int { 366 } //Z#1
@@ -175,9 +175,9 @@ zoneinfo64:table(nofallback) {
} //Z#57
/* Africa/Windhoek */ :table {
transPre32:intvector { -1, 1836796792 }
- trans:intvector { -2109288600, -860976000, -845254800, 764200800, 778640400, 796780800, 810090000, 828835200, 841539600, 860284800, 873594000, 891734400, 905043600, 923184000, 936493200, 954633600, 967942800, 986083200, 999392400, 1018137600, 1030842000, 1049587200, 1062896400, 1081036800, 1094346000, 1112486400, 1125795600, 1143936000, 1157245200, 1175385600, 1188694800, 1207440000, 1220749200, 1238889600, 1252198800, 1270339200, 1283648400, 1301788800, 1315098000, 1333238400, 1346547600, 1365292800, 1377997200, 1396742400, 1410051600, 1428192000, 1441501200, 1459641600, 1472950800, 1491091200, 1504400400 }
+ trans:intvector { -2109288600, -860976000, -845254800, 764200800, 778640400, 796780800, 810090000, 828835200, 841539600, 860284800, 873594000, 891734400, 905043600, 923184000, 936493200, 954633600, 967942800, 986083200, 999392400, 1018137600, 1030842000, 1049587200, 1062896400, 1081036800, 1094346000, 1112486400, 1125795600, 1143936000, 1157245200, 1175385600, 1188694800, 1207440000, 1220749200, 1238889600, 1252198800, 1270339200, 1283648400, 1301788800, 1315098000, 1333238400, 1346547600, 1365292800, 1377997200, 1396742400, 1410051600, 1428192000, 1441501200, 1459641600, 1472950800, 1491091200, 1504400400, 1508796000 }
typeOffsets:intvector { 4104, 0, 3600, 0, 3600, 3600, 5400, 0, 7200, 0, 7200, 3600 }
- typeMap:bin { "03040504010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020104" }
+ typeMap:bin { "0304050401020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010204" }
} //Z#58
/* America/Adak */ :table {
transPre32:intvector { -1, 1069743569, -1, 2106022494 }
@@ -1557,9 +1557,9 @@ zoneinfo64:table(nofallback) {
typeMap:bin { "02040203020301" }
} //Z#303
/* Asia/Pyongyang */ :table {
- trans:intvector { -1948782180, -1830414600, 1439564400 }
+ trans:intvector { -1948782180, -1830414600, 1439564400, 1525447800 }
typeOffsets:intvector { 30180, 0, 30600, 0, 32400, 0 }
- typeMap:bin { "010201" }
+ typeMap:bin { "01020102" }
} //Z#304
/* Asia/Qatar */ :table {
trans:intvector { -1577935568, 76190400 }
@@ -2291,9 +2291,9 @@ zoneinfo64:table(nofallback) {
/* Europe/Podgorica */ :int { 443 } //Z#475
/* Europe/Prague */ :table {
transPre32:intvector { -1, 1825565432 }
- trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -798073200, -780534000, -761180400, -746578800, -733359600, -716425200, -701910000, -684975600, -670460400, -654217200, -639010800, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
- typeOffsets:intvector { 3464, 0, 3600, 0, 3600, 3600 }
- typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ trans:intvector { -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -938905200, -857257200, -844556400, -828226800, -812502000, -796777200, -781052400, -765327600, -746578800, -733359600, -728517600, -721260000, -716425200, -701910000, -684975600, -670460400, -654217200, -639010800, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
+ typeOffsets:intvector { 3464, 0, 3600, -3600, 3600, 0, 3600, 3600 }
+ typeMap:bin { "02030203020302030203020302030203020102030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
finalRule { "EU" }
finalRaw:int { 3600 }
finalYear:int { 1997 }
@@ -3111,63 +3111,66 @@ zoneinfo64:table(nofallback) {
EUAsia:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600
} //_#11
+ Eire:intvector {
+ 9, -31, -1, 3600, 2, 2, -31, -1, 3600, 2, -3600
+ } //_#12
Fiji:intvector {
10, 1, -1, 7200, 0, 0, 14, -1, 10800, 0, 3600
- } //_#12
+ } //_#13
Haiti:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#13
+ } //_#14
Iran:intvector {
2, 21, 0, 0, 0, 8, 21, 0, 0, 0, 3600
- } //_#14
+ } //_#15
Jordan:intvector {
2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
- } //_#15
+ } //_#16
LH:intvector {
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
- } //_#16
+ } //_#17
Lebanon:intvector {
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
- } //_#17
+ } //_#18
Mexico:intvector {
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#18
+ } //_#19
Moldova:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
- } //_#19
+ } //_#20
Morocco:intvector {
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
- } //_#20
+ } //_#21
NZ:intvector {
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
- } //_#21
+ } //_#22
Palestine:intvector {
2, 22, -7, 3600, 0, 9, -31, -7, 3600, 0, 3600
- } //_#22
+ } //_#23
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
- } //_#23
+ } //_#24
Syria:intvector {
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
- } //_#24
+ } //_#25
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#25
+ } //_#26
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#26
+ } //_#27
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
- } //_#27
+ } //_#28
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
- } //_#28
+ } //_#29
WS:intvector {
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
- } //_#29
+ } //_#30
Zion:intvector {
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
- } //_#30
+ } //_#31
}
Regions:array {
"AU", //Z#0 ACT
diff --git a/icu4c/source/tools/tzcode/icuzones b/icu4c/source/tools/tzcode/icuzones
index 168a86f91..53d2d0d31 100644
--- a/icu4c/source/tools/tzcode/icuzones
+++ b/icu4c/source/tools/tzcode/icuzones
@@ -103,27 +103,59 @@ Link America/Regina Canada/East-Saskatchewan # removed from backward in 2017c
# Europe/Dublin data from the tz database.
#
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-# Rule Eire--ICU 1971 only - Oct 31 2:00u 0 GMT
-# Rule Eire--ICU 1972 1980 - Mar Sun>=16 2:00u 1:00 IST
-# Rule Eire--ICU 1972 1980 - Oct Sun>=23 2:00u 0 GMT
-# Rule Eire--ICU 1981 max - Mar lastSun 1:00u 1:00 IST
-# Rule Eire--ICU 1981 1989 - Oct Sun>=23 1:00u 0 GMT
-# Rule Eire--ICU 1990 1995 - Oct Sun>=22 1:00u 0 GMT
-# Rule Eire--ICU 1996 max - Oct lastSun 1:00u 0 GMT
+#
+# tzdata2018e suggests to use alternative zone definitions for use GB-Eire
+# and EU rule after Oct 27, 1968. (Yoshito 2018-05-04)
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-# Zone Europe/Dublin--ICU -0:25:00 - LMT 1880 Aug 2
-# -0:25:21 - DMT 1916 May 21 2:00s
-# -0:25:21 1:00 IST 1916 Oct 1 2:00s
-# 0:00 GB-Eire %s 1921 Dec 6 # independence
-# 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00s
-# 0:00 1:00 IST 1946 Oct 6 2:00s
-# 0:00 - GMT 1947 Mar 16 2:00s
-# 0:00 1:00 IST 1947 Nov 2 2:00s
-# 0:00 - GMT 1948 Apr 18 2:00s
-# 0:00 GB-Eire GMT/IST 1968 Oct 27
-# 0:00 Eire--ICU GMT/IST
-
-# Link Europe/Dublin--ICU Eire--ICU
+Zone Europe/Dublin--ICU -0:25:00 - LMT 1880 Aug 2
+ -0:25:21 - DMT 1916 May 21 2:00s
+ -0:25:21 1:00 IST 1916 Oct 1 2:00s
+ 0:00 GB-Eire %s 1921 Dec 6 # independence
+ 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00s
+ 0:00 1:00 IST 1946 Oct 6 2:00s
+ 0:00 - GMT 1947 Mar 16 2:00s
+ 0:00 1:00 IST 1947 Nov 2 2:00s
+ 0:00 - GMT 1948 Apr 18 2:00s
+ 0:00 GB-Eire GMT/IST 1968 Oct 27
+# The next line is for when negative SAVE values are used.
+# 1:00 Eire IST/GMT
+# These three lines are for when SAVE values are always nonnegative.
+ 1:00 - IST 1971 Oct 31 2:00u
+ 0:00 GB-Eire GMT/IST 1996
+ 0:00 EU GMT/IST
+
+Link Europe/Dublin--ICU Eire--ICU
+
+
+#
+# tzdata2018e also added another instance of negative DST - Africa/Windhoek
+#
+# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+# Vanguard section, for zic and other parsers that support negative DST.
+#Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
+#Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
+#Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT
+# Rearguard section, for parsers that do not support negative DST.
+Rule Namibia--ICU 1994 only - Mar 21 0:00 0 WAT
+Rule Namibia--ICU 1994 2017 - Sep Sun>=1 2:00 1:00 CAT
+Rule Namibia--ICU 1995 2017 - Apr Sun>=1 2:00 0 WAT
+
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Windhoek--ICU 1:08:24 - LMT 1892 Feb 8
+ 1:30 - +0130 1903 Mar
+ 2:00 - SAST 1942 Sep 20 2:00
+ 2:00 1:00 SAST 1943 Mar 21 2:00
+ 2:00 - SAST 1990 Mar 21 # independence
+# Vanguard section, for zic and other parsers that support negative DST.
+# 2:00 Namibia %s
+# Rearguard section, for parsers that do not support negative DST.
+ 2:00 - CAT 1994 Mar 21 0:00
+# From Paul Eggert (2017-04-07):
+# The official date of the 2017 rule change was 2017-10-24. See:
+# http://www.lac.org.na/laws/annoSTAT/Namibian%20Time%20Act%209%20of%202017.pdf
+ 1:00 Namibia--ICU %s 2017 Oct 24
+ 2:00 - CAT
+# End of rearguard section.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:20:08 +0000