Skip to content

Commit d469e62

Browse files
committed
ICU-22220 CLDR release-43-alpha1 to ICU main
1 parent bd065d4 commit d469e62

2,765 files changed

Lines changed: 142747 additions & 7372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

icu4c/source/common/localefallback_data.h

Lines changed: 1175 additions & 468 deletions
Large diffs are not rendered by default.

icu4c/source/common/uscript.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,20 @@ uscript_getCode(const char* nameOrAbbrOrLocale,
114114
}
115115

116116
triedCode = false;
117-
if(uprv_strchr(nameOrAbbrOrLocale, '-')==nullptr && uprv_strchr(nameOrAbbrOrLocale, '_')==nullptr ){
117+
const char* lastSepPtr = uprv_strrchr(nameOrAbbrOrLocale, '-');
118+
if (lastSepPtr==nullptr) {
119+
lastSepPtr = uprv_strrchr(nameOrAbbrOrLocale, '_');
120+
}
121+
// Favor interpretation of nameOrAbbrOrLocale as a script alias if either
122+
// 1. nameOrAbbrOrLocale does not contain -/_. Handles Han, Mro, Nko, etc.
123+
// 2. The last instance of -/_ is at offset 3, and the portion after that is
124+
// longer than 4 characters (i.e. not a script or region code). This handles
125+
// Old_Hungarian, Old_Italic, etc. ("old" is a valid language code)
126+
// 3. The last instance of -/_ is at offset 7, and the portion after that is
127+
// 3 characters. This handles New_Tai_Lue ("new" is a valid language code).
128+
if (lastSepPtr==nullptr
129+
|| (lastSepPtr-nameOrAbbrOrLocale == 3 && uprv_strlen(nameOrAbbrOrLocale) > 8)
130+
|| (lastSepPtr-nameOrAbbrOrLocale == 7 && uprv_strlen(nameOrAbbrOrLocale) == 11) ) {
118131
/* try long and abbreviated script names first */
119132
UScriptCode code = (UScriptCode) u_getPropertyValueEnum(UCHAR_SCRIPT, nameOrAbbrOrLocale);
120133
if(code!=USCRIPT_INVALID_CODE) {

icu4c/source/data/curr/af.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,10 @@ af{
11211121
one{"Liberiese dollar"}
11221122
other{"Liberiese dollar"}
11231123
}
1124+
LSL{
1125+
one{"Lesotho loti"}
1126+
other{"Lesotho loti"}
1127+
}
11241128
LTL{
11251129
one{"Litause litas"}
11261130
other{"Litause litas"}

icu4c/source/data/curr/am.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,10 @@ am{
11041104
one{"የላይቤሪያ ዶላር"}
11051105
other{"የላይቤሪያ ዶላር"}
11061106
}
1107+
LSL{
1108+
one{"የሌሶቶ ሎቲ"}
1109+
other{"የሌሶቶ ሎቲ"}
1110+
}
11071111
LTL{
11081112
one{"ሊቱዌንያን ሊታስ"}
11091113
other{"ሊቱዌንያን ሊታስ"}

icu4c/source/data/curr/bn.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,6 +1532,10 @@ bn{
15321532
one{"লিবেরিয়ান ডলার"}
15331533
other{"লিবেরিয়ান ডলার"}
15341534
}
1535+
LSL{
1536+
one{"লেসুটু লোটি"}
1537+
other{"লেসুটু লোটি"}
1538+
}
15351539
LTL{
15361540
one{"লিথুইনিয়ান লিটা"}
15371541
other{"লিথুইনিয়ান লিটা"}

icu4c/source/data/curr/bs_Cyrl.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,9 @@ bs_Cyrl{
11331133
"Зимбабвеански долар (2008)",
11341134
}
11351135
}
1136+
Currencies%narrow{
1137+
BYN{"BYN"}
1138+
}
11361139
CurrencyPlurals{
11371140
ADP{
11381141
few{"андорске пезете"}

icu4c/source/data/curr/ceb.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,9 @@ ceb{
632632
"Zambian Kwacha",
633633
}
634634
}
635+
Currencies%narrow{
636+
BYN{"BYN"}
637+
}
635638
CurrencyPlurals{
636639
AED{
637640
one{"UAE dirham"}

icu4c/source/data/curr/eu.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,6 +2520,10 @@ eu{
25202520
one{"rand hegoafrikar"}
25212521
other{"rand hegoafrikar"}
25222522
}
2523+
ZMK{
2524+
one{"Zambiako kwacha (1968–2012)"}
2525+
other{"Zambiako kwacha (1968–2012)"}
2526+
}
25232527
ZMW{
25242528
one{"kwacha zambiar"}
25252529
other{"kwacha zambiar"}

icu4c/source/data/curr/fa.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,10 @@ fa{
11581158
one{"بولیویانوی بولیوی"}
11591159
other{"بولیویانوی بولیوی"}
11601160
}
1161+
BOP{
1162+
one{"پزوی بولیوی"}
1163+
other{"پزوی بولیوی"}
1164+
}
11611165
BRL{
11621166
one{"رئال برزیل"}
11631167
other{"رئال برزیل"}

icu4c/source/data/curr/ff_Adlm.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,4 +1581,8 @@ ff_Adlm{
15811581
other{"𞤳𞤢𞤱𞤢𞤧𞤢𞥄𞤶𞤭 𞤟𞤢𞤥𞤦𞤭𞤲𞤳𞤮"}
15821582
}
15831583
}
1584+
CurrencyUnitPatterns{
1585+
one{"{0} {1}"}
1586+
other{"{0} {1}"}
1587+
}
15841588
}

0 commit comments

Comments
 (0)