ICU-13552 tzdata2018c updates to ICU trunk. ICU override for Europe/Dublin was commented out in icuzones.
X-SVN-Rev: 40798
This commit is contained in:
Yoshito Umaoka
parent
a222a6fa25
commit
32ba591832
@ -3,9 +3,9 @@
|
||||
// License & terms of use: http://www.unicode.org/copyright.html#License
|
||||
//---------------------------------------------------------
|
||||
// Build tool: tz2icu
|
||||
// Build date: Tue Jan 23 18:02:21 2018
|
||||
// Build date: Tue Jan 23 20:51:55 2018
|
||||
// tz database: ftp://ftp.iana.org/tz/
|
||||
// tz version: 2018b
|
||||
// tz version: 2018c
|
||||
// ICU version: 60.1
|
||||
//---------------------------------------------------------
|
||||
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
|
||||
@ -13,7 +13,7 @@
|
||||
//---------------------------------------------------------
|
||||
|
||||
zoneinfo64:table(nofallback) {
|
||||
TZVersion { "2018b" }
|
||||
TZVersion { "2018c" }
|
||||
Zones:array {
|
||||
/* ACT */ :int { 354 } //Z#0
|
||||
/* AET */ :int { 366 } //Z#1
|
||||
@ -1650,7 +1650,7 @@ zoneinfo64:table(nofallback) {
|
||||
} //Z#322
|
||||
/* Asia/Tokyo */ :table {
|
||||
transPre32:intvector { -1, 1707254896 }
|
||||
trans:intvector { -683794800, -672393600, -654764400, -640944000, -620290800, -609494400, -588841200, -578044800 }
|
||||
trans:intvector { -683802000, -672314400, -654771600, -640864800, -620298000, -609415200, -588848400, -577965600 }
|
||||
typeOffsets:intvector { 33539, 0, 32400, 0, 32400, 3600 }
|
||||
typeMap:bin { "010201020102010201" }
|
||||
links:intvector { 323, 527, 529 }
|
||||
@ -2145,10 +2145,10 @@ zoneinfo64:table(nofallback) {
|
||||
} //Z#451
|
||||
/* Europe/Dublin */ :table {
|
||||
transPre32:intvector { -1, 1473317596 }
|
||||
trans:intvector { -1691962479, -1680471279, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -733356000, -719445600, -699487200, -684972000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 }
|
||||
typeOffsets:intvector { -1500, 0, -1521, 0, -1521, 3600, 0, 0, 0, 3600 }
|
||||
typeMap:bin { "01020304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" }
|
||||
finalRule { "Eire--ICU" }
|
||||
trans:intvector { -1691962479, -1680471279, -1664143200, -1650146400, -1633903200, -1617487200, -1601848800, -1586037600, -1570399200, -1552168800, -1538344800, -1522533600, -1507500000, -1490565600, -1473631200, -1460930400, -1442786400, -1428876000, -1410732000, -1396216800, -1379282400, -1364767200, -1348437600, -1333317600, -1315778400, -1301263200, -1284328800, -1269813600, -1253484000, -1238364000, -1221429600, -1206914400, -1189980000, -1175464800, -1159135200, -1143410400, -1126476000, -1111960800, -1095631200, -1080511200, -1063576800, -1049061600, -1032127200, -1017612000, -1001282400, -986162400, -969228000, -950479200, -942012000, -733356000, -719445600, -699487200, -684972000, -668037600, -654732000, -636588000, -622072800, -605743200, -590623200, -574293600, -558568800, -542239200, -527119200, -512604000, -496274400, -481154400, -464220000, -449704800, -432165600, -417650400, -401320800, -386200800, -369266400, -354751200, -337816800, -323301600, -306972000, -291852000, -276732000, -257983200, -245282400, -226533600, -213228000, -195084000, -182383200, -163634400, -150933600, -132184800, -119484000, -100735200, -88034400, -68680800, -59004000, -37242000, 57722400, 69818400, 89172000, 101268000, 120621600, 132717600, 152071200, 164167200, 183520800, 196221600, 214970400, 227671200, 246420000, 259120800, 278474400, 290570400, 309924000, 322020000, 341373600, 354675600, 372819600, 386125200, 404269200, 417574800, 435718800, 449024400, 467773200, 481078800, 499222800, 512528400, 530672400, 543978000, 562122000, 575427600, 593571600, 606877200, 625626000, 638326800, 657075600, 670381200, 688525200, 701830800, 719974800, 733280400, 751424400, 764730000, 782874000, 796179600, 814323600, 828234000, 846378000 }
|
||||
typeOffsets:intvector { -1500, 0, -1521, 0, -1521, 3600, 0, 0, 0, 3600, 3600, 0 }
|
||||
typeMap:bin { "0102030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030405030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403040304030403" }
|
||||
finalRule { "EU" }
|
||||
finalRaw:int { 0 }
|
||||
finalYear:int { 1997 }
|
||||
links:intvector { 401, 452 }
|
||||
@ -3111,69 +3111,63 @@ 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
|
||||
Eire--ICU:intvector {
|
||||
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600
|
||||
} //_#13
|
||||
Fiji:intvector {
|
||||
10, 1, -1, 7200, 0, 0, 14, -1, 10800, 0, 3600
|
||||
} //_#14
|
||||
} //_#12
|
||||
Haiti:intvector {
|
||||
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
|
||||
} //_#15
|
||||
} //_#13
|
||||
Iran:intvector {
|
||||
2, 21, 0, 0, 0, 8, 21, 0, 0, 0, 3600
|
||||
} //_#16
|
||||
} //_#14
|
||||
Jordan:intvector {
|
||||
2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
|
||||
} //_#17
|
||||
} //_#15
|
||||
LH:intvector {
|
||||
9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800
|
||||
} //_#18
|
||||
} //_#16
|
||||
Lebanon:intvector {
|
||||
2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600
|
||||
} //_#19
|
||||
} //_#17
|
||||
Mexico:intvector {
|
||||
3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
|
||||
} //_#20
|
||||
} //_#18
|
||||
Moldova:intvector {
|
||||
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
|
||||
} //_#21
|
||||
} //_#19
|
||||
Morocco:intvector {
|
||||
2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600
|
||||
} //_#22
|
||||
} //_#20
|
||||
NZ:intvector {
|
||||
8, -30, -1, 7200, 1, 3, 1, -1, 7200, 1, 3600
|
||||
} //_#23
|
||||
} //_#21
|
||||
Palestine:intvector {
|
||||
2, -31, -7, 3600, 0, 9, -31, -7, 3600, 0, 3600
|
||||
} //_#24
|
||||
} //_#22
|
||||
Para:intvector {
|
||||
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
|
||||
} //_#25
|
||||
} //_#23
|
||||
Syria:intvector {
|
||||
2, -31, -6, 0, 0, 9, -31, -6, 0, 0, 3600
|
||||
} //_#26
|
||||
} //_#24
|
||||
SystemV:intvector {
|
||||
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
|
||||
} //_#27
|
||||
} //_#25
|
||||
Thule:intvector {
|
||||
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
|
||||
} //_#28
|
||||
} //_#26
|
||||
Troll:intvector {
|
||||
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
|
||||
} //_#29
|
||||
} //_#27
|
||||
US:intvector {
|
||||
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
|
||||
} //_#30
|
||||
} //_#28
|
||||
WS:intvector {
|
||||
8, -30, -1, 10800, 0, 3, 1, -1, 14400, 0, 3600
|
||||
} //_#31
|
||||
} //_#29
|
||||
Zion:intvector {
|
||||
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
|
||||
} //_#32
|
||||
} //_#30
|
||||
}
|
||||
Regions:array {
|
||||
"AU", //Z#0 ACT
|
||||
|
||||
@ -78,6 +78,21 @@ Link Asia/Ho_Chi_Minh VST
|
||||
#
|
||||
Link America/Regina Canada/East-Saskatchewan # removed from backward in 2017c
|
||||
|
||||
|
||||
# Note:
|
||||
# Following section was added for tz database 2018a and 2018b.
|
||||
# ICU has a bug handling negative DST, and we also don't want to
|
||||
# flip sumer time name and winter time name for Dublin at least for
|
||||
# now. Because the change had major impacts to tz database external
|
||||
# consumers, the tz database maintainer once reverted the Europe/Dublin
|
||||
# rules (same as 2017c or older) in 2018c. The tz database maintainer
|
||||
# thinks the changes in 2018a should be brought back when external
|
||||
# tz database consumers are ready to adopt the change. We don't know
|
||||
# what CLDR TC want to do with this for now. But if tz database brings
|
||||
# back the change, and CLDR TC (and ICU TC) want to keep the display name
|
||||
# unchanged, then we can uncomment the block below to restore ICU
|
||||
# custom override. (Yoshito 2018-01-23)
|
||||
|
||||
#
|
||||
# tzdata2018a changed Europe/Dublin to use IST (UTC+1) as the standard time
|
||||
# of the region, and GMT (UTC) as the daylight saving time with negative
|
||||
@ -89,26 +104,26 @@ Link America/Regina Canada/East-Saskatchewan # removed from backward in 2017c
|
||||
#
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
||||
# 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
|
||||
# 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
|
||||
# Link Europe/Dublin--ICU Eire--ICU
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b25843386b6a46ffb45b9d4dc4694cf84f183bf995ea8579653b6420e1ea3c9
|
||||
oid sha256:5dc7e055663128ae9a1dae471f9a7cdaf5c28e8177b2231e8b0341c3dc8bb842
|
||||
size 12475727
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2747db532b79bf23a4cab51918391b24a8d873a751a44852485882785f53057c
|
||||
size 92805
|
||||
oid sha256:00c43dc113177aa5a0ffda563ac2822f3dc92fdb7ae748a5938529e32a0b67d9
|
||||
size 92739
|
||||
|
||||
Loading…
Reference in New Issue
Block a user