Skip to content

Commit

Permalink
ICU-23022 Update ICU data to TZDB 2025a.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yqwed
Yqwed committed Jan 30, 2025
1 parent 92b52ae commit 7bcc062
Show file tree
Hide file tree
Showing 7 changed files with 1,023 additions and 999 deletions.
1,962 changes: 989 additions & 973 deletions icu4c/source/common/localefallback_data.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion icu4c/source/data/misc/metaZones.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
metaZones:table(nofallback){
mapTimezones{
Acre{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/misc/timezoneTypes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
timezoneTypes:table(nofallback){
bcpTypeAlias{
tz{
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/misc/windowsZones.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// © 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml
// Generated using tools/cldr/cldr-to-icu/
windowsZones:table(nofallback){
mapTimezones{
"AUS Central Standard Time"{
Expand Down
38 changes: 16 additions & 22 deletions icu4c/source/data/misc/zoneinfo64.txt
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
//---------------------------------------------------------
//---------------------------------------------------------
// Copyright (C) 2016 and later: Unicode, Inc. and others.
// License & terms of use: http://www.unicode.org/copyright.html
//---------------------------------------------------------
// Build tool: tz2icu
// Build date: Thu Sep 19 09:34:01 2024
// Build date: Thu Jan 30 14:17:55 2025
// tz database: ftp://ftp.iana.org/tz/
// tz version: 2024b
// ICU version: 76.0.1
// tz version: 2025a
// ICU version: 77.0.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
// >> !!! >>> DO NOT EDIT <<< !!! <<
//---------------------------------------------------------

zoneinfo64:table(nofallback) {
TZVersion { "2024b" }
TZVersion { "2025a" }
Zones:array {
/* ACT */ :int { 357 } //Z#0
/* AET */ :int { 369 } //Z#1
Expand Down Expand Up @@ -278,12 +278,9 @@ zoneinfo64:table(nofallback) {
} //Z#76
/* America/Aruba */ :int { 191 } //Z#77
/* America/Asuncion */ :table {
trans:intvector { -1206389360, 86760000, 134017200, 181368000, 194497200, 212990400, 226033200, 244526400, 257569200, 276062400, 291783600, 307598400, 323406000, 339220800, 354942000, 370756800, 386478000, 402292800, 418014000, 433828800, 449636400, 465451200, 481172400, 496987200, 512708400, 528523200, 544244400, 560059200, 575866800, 591681600, 607402800, 625032000, 638938800, 654753600, 670474800, 686721600, 699418800, 718257600, 733546800, 749448000, 762318000, 780984000, 793767600, 812520000, 825649200, 844574400, 856666800, 876024000, 888721200, 907473600, 920775600, 938923200, 952225200, 970372800, 983674800, 1002427200, 1018148400, 1030852800, 1049598000, 1062907200, 1081047600, 1097985600, 1110682800, 1129435200, 1142132400, 1160884800, 1173582000, 1192939200, 1205031600, 1224388800, 1236481200, 1255838400, 1270954800, 1286078400, 1302404400, 1317528000, 1333854000, 1349582400, 1364094000, 1381032000 }
trans:intvector { -1206389360, 86760000, 134017200, 181368000, 194497200, 212990400, 226033200, 244526400, 257569200, 276062400, 291783600, 307598400, 323406000, 339220800, 354942000, 370756800, 386478000, 402292800, 418014000, 433828800, 449636400, 465451200, 481172400, 496987200, 512708400, 528523200, 544244400, 560059200, 575866800, 591681600, 607402800, 625032000, 638938800, 654753600, 670474800, 686721600, 699418800, 718257600, 733546800, 749448000, 762318000, 780984000, 793767600, 812520000, 825649200, 844574400, 856666800, 876024000, 888721200, 907473600, 920775600, 938923200, 952225200, 970372800, 983674800, 1002427200, 1018148400, 1030852800, 1049598000, 1062907200, 1081047600, 1097985600, 1110682800, 1129435200, 1142132400, 1160884800, 1173582000, 1192939200, 1205031600, 1224388800, 1236481200, 1255838400, 1270954800, 1286078400, 1302404400, 1317528000, 1333854000, 1349582400, 1364094000, 1381032000, 1395543600, 1412481600, 1426993200, 1443931200, 1459047600, 1475380800, 1490497200, 1506830400, 1521946800, 1538884800, 1553396400, 1570334400, 1584846000, 1601784000, 1616900400, 1633233600, 1648350000, 1664683200, 1679799600, 1696132800, 1711249200, 1728187200, 1728961200 }
typeOffsets:intvector { -13840, 0, -14400, 0, -14400, 3600, -10800, 0 }
typeMap:bin { "0103010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
finalRule { "Para" }
finalRaw:int { -14400 }
finalYear:int { 2014 }
typeMap:bin { "01030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010203" }
} //Z#78
/* America/Atikokan */ :int { 183 } //Z#79
/* America/Atka */ :int { 59 } //Z#80
Expand Down Expand Up @@ -1391,10 +1388,10 @@ zoneinfo64:table(nofallback) {
links:intvector { 296, 328 }
} //Z#296
/* Asia/Manila */ :table {
transPre32:intvector { -1, 350346256, -1, 2065645456 }
trans:intvector { -1046678400, -1038733200, -873273600, -794221200, -496224000, -489315600, 259344000, 275151600 }
typeOffsets:intvector { -57360, 0, 28800, 0, 28800, 3600, 29040, 0, 32400, 0 }
typeMap:bin { "03010201040102010201" }
transPre32:intvector { -1, 350346264, -1, 2075884096 }
trans:intvector { -1046678400, -1040115600, -885024000, -880016400, -783594000, -760093200, -496224000, -491562000, 228326400, 243702000, 643219200, 649177200 }
typeOffsets:intvector { -57368, 0, 28800, 0, 28800, 3600, 29032, 0, 32400, 0 }
typeMap:bin { "0301020102040201020102010201" }
} //Z#297
/* Asia/Muscat */ :int { 267 } //Z#298
/* Asia/Nicosia */ :table {
Expand Down Expand Up @@ -2815,24 +2812,21 @@ zoneinfo64:table(nofallback) {
Palestine:intvector {
2, -30, -7, 7200, 0, 9, -30, -7, 7200, 0, 3600
} //_#16
Para:intvector {
9, 1, -1, 0, 0, 2, 22, -1, 0, 0, 3600
} //_#17
SystemV:intvector {
3, -30, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#18
} //_#17
Thule:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
} //_#19
} //_#18
Troll:intvector {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 7200
} //_#20
} //_#19
US:intvector {
2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600
} //_#21
} //_#20
Zion:intvector {
2, 23, -6, 7200, 0, 9, -31, -1, 7200, 0, 3600
} //_#22
} //_#21
}
Regions:array {
"AU", //Z#0 ACT
Expand Down
16 changes: 15 additions & 1 deletion icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ private static Map<String, String> buildDefaultScriptTable() {
t.put("ha_SD", "Arab");
t.put("hac", "Arab");
t.put("hak", "Hans");
t.put("hak_TW", "Hant");
t.put("har", "Ethi");
t.put("haz", "Arab");
t.put("hbo", "Hebr");
Expand Down Expand Up @@ -553,6 +554,7 @@ private static Map<String, String> buildDefaultScriptTable() {
t.put("lwm", "Thai");
t.put("lya", "Tibt");
t.put("lzh", "Hans");
t.put("lzz_GE", "Geor");
t.put("mag", "Deva");
t.put("mai", "Deva");
t.put("man_GN", "Nkoo");
Expand Down Expand Up @@ -616,6 +618,7 @@ private static Map<String, String> buildDefaultScriptTable() {
t.put("myz", "Mand");
t.put("mzn", "Arab");
t.put("nan", "Hans");
t.put("nan_TW", "Hant");
t.put("nao", "Deva");
t.put("ncd", "Deva");
t.put("ncq", "Laoo");
Expand Down Expand Up @@ -723,6 +726,7 @@ private static Map<String, String> buildDefaultScriptTable() {
t.put("pll", "Mymr");
t.put("pmh", "Brah");
t.put("pnt", "Grek");
t.put("pnt_RU", "Cyrl");
t.put("pra", "Khar");
t.put("prc", "Arab");
t.put("prd", "Arab");
Expand Down Expand Up @@ -787,7 +791,6 @@ private static Map<String, String> buildDefaultScriptTable() {
t.put("sds", "Arab");
t.put("sel", "Cyrl");
t.put("sfm", "Plrd");
t.put("sga", "Ogam");
t.put("sgh", "Cyrl");
t.put("sgj", "Deva");
t.put("sgr", "Arab");
Expand Down Expand Up @@ -1098,30 +1101,36 @@ private static Map<String, String> buildParentLocaleTable() {
t.put("en_CM", "en_001");
t.put("en_CX", "en_001");
t.put("en_CY", "en_001");
t.put("en_CZ", "en_150");
t.put("en_DE", "en_150");
t.put("en_DG", "en_001");
t.put("en_DK", "en_150");
t.put("en_DM", "en_001");
t.put("en_Dsrt", "root");
t.put("en_ER", "en_001");
t.put("en_ES", "en_150");
t.put("en_FI", "en_150");
t.put("en_FJ", "en_001");
t.put("en_FK", "en_001");
t.put("en_FM", "en_001");
t.put("en_FR", "en_150");
t.put("en_GB", "en_001");
t.put("en_GD", "en_001");
t.put("en_GG", "en_001");
t.put("en_GH", "en_001");
t.put("en_GI", "en_001");
t.put("en_GM", "en_001");
t.put("en_GS", "en_001");
t.put("en_GY", "en_001");
t.put("en_HK", "en_001");
t.put("en_HU", "en_150");
t.put("en_ID", "en_001");
t.put("en_IE", "en_001");
t.put("en_IL", "en_001");
t.put("en_IM", "en_001");
t.put("en_IN", "en_001");
t.put("en_IO", "en_001");
t.put("en_IT", "en_150");
t.put("en_JE", "en_001");
t.put("en_JM", "en_001");
t.put("en_KE", "en_001");
Expand All @@ -1143,13 +1152,17 @@ private static Map<String, String> buildParentLocaleTable() {
t.put("en_NF", "en_001");
t.put("en_NG", "en_001");
t.put("en_NL", "en_150");
t.put("en_NO", "en_150");
t.put("en_NR", "en_001");
t.put("en_NU", "en_001");
t.put("en_NZ", "en_001");
t.put("en_PG", "en_001");
t.put("en_PK", "en_001");
t.put("en_PL", "en_150");
t.put("en_PN", "en_001");
t.put("en_PT", "en_150");
t.put("en_PW", "en_001");
t.put("en_RO", "en_150");
t.put("en_RW", "en_001");
t.put("en_SB", "en_001");
t.put("en_SC", "en_001");
Expand All @@ -1158,6 +1171,7 @@ private static Map<String, String> buildParentLocaleTable() {
t.put("en_SG", "en_001");
t.put("en_SH", "en_001");
t.put("en_SI", "en_150");
t.put("en_SK", "en_150");
t.put("en_SL", "en_001");
t.put("en_SS", "en_001");
t.put("en_SX", "en_001");
Expand Down
Binary file modified icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/zoneinfo64.res
View file
Binary file not shown.

0 comments on commit 7bcc062

Please sign in to comment.