Skip to content

Commit

Permalink
ICU-22220 CLDR release-43-alpha1 to ICU main
Browse files Browse the repository at this point in the history
  • Loading branch information
pedberg-icu committed Feb 21, 2023
1 parent bd065d4 commit d469e62
Show file tree
Hide file tree
Showing 2,765 changed files with 142,747 additions and 7,372 deletions.
1,643 changes: 1,175 additions & 468 deletions icu4c/source/common/localefallback_data.h

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion icu4c/source/common/uscript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,20 @@ uscript_getCode(const char* nameOrAbbrOrLocale,
}

triedCode = false;
if(uprv_strchr(nameOrAbbrOrLocale, '-')==nullptr && uprv_strchr(nameOrAbbrOrLocale, '_')==nullptr ){
const char* lastSepPtr = uprv_strrchr(nameOrAbbrOrLocale, '-');
if (lastSepPtr==nullptr) {
lastSepPtr = uprv_strrchr(nameOrAbbrOrLocale, '_');
}
// Favor interpretation of nameOrAbbrOrLocale as a script alias if either
// 1. nameOrAbbrOrLocale does not contain -/_. Handles Han, Mro, Nko, etc.
// 2. The last instance of -/_ is at offset 3, and the portion after that is
// longer than 4 characters (i.e. not a script or region code). This handles
// Old_Hungarian, Old_Italic, etc. ("old" is a valid language code)
// 3. The last instance of -/_ is at offset 7, and the portion after that is
// 3 characters. This handles New_Tai_Lue ("new" is a valid language code).
if (lastSepPtr==nullptr
|| (lastSepPtr-nameOrAbbrOrLocale == 3 && uprv_strlen(nameOrAbbrOrLocale) > 8)
|| (lastSepPtr-nameOrAbbrOrLocale == 7 && uprv_strlen(nameOrAbbrOrLocale) == 11) ) {
/* try long and abbreviated script names first */
UScriptCode code = (UScriptCode) u_getPropertyValueEnum(UCHAR_SCRIPT, nameOrAbbrOrLocale);
if(code!=USCRIPT_INVALID_CODE) {
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/af.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,10 @@ af{
one{"Liberiese dollar"}
other{"Liberiese dollar"}
}
LSL{
one{"Lesotho loti"}
other{"Lesotho loti"}
}
LTL{
one{"Litause litas"}
other{"Litause litas"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/am.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,10 @@ am{
one{"የላይቤሪያ ዶላር"}
other{"የላይቤሪያ ዶላር"}
}
LSL{
one{"የሌሶቶ ሎቲ"}
other{"የሌሶቶ ሎቲ"}
}
LTL{
one{"ሊቱዌንያን ሊታስ"}
other{"ሊቱዌንያን ሊታስ"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/bn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,10 @@ bn{
one{"লিবেরিয়ান ডলার"}
other{"লিবেরিয়ান ডলার"}
}
LSL{
one{"লেসুটু লোটি"}
other{"লেসুটু লোটি"}
}
LTL{
one{"লিথুইনিয়ান লিটা"}
other{"লিথুইনিয়ান লিটা"}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/curr/bs_Cyrl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,9 @@ bs_Cyrl{
"Зимбабвеански долар (2008)",
}
}
Currencies%narrow{
BYN{"BYN"}
}
CurrencyPlurals{
ADP{
few{"андорске пезете"}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/curr/ceb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,9 @@ ceb{
"Zambian Kwacha",
}
}
Currencies%narrow{
BYN{"BYN"}
}
CurrencyPlurals{
AED{
one{"UAE dirham"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/eu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2520,6 +2520,10 @@ eu{
one{"rand hegoafrikar"}
other{"rand hegoafrikar"}
}
ZMK{
one{"Zambiako kwacha (1968–2012)"}
other{"Zambiako kwacha (1968–2012)"}
}
ZMW{
one{"kwacha zambiar"}
other{"kwacha zambiar"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/fa.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,10 @@ fa{
one{"بولیویانوی بولیوی"}
other{"بولیویانوی بولیوی"}
}
BOP{
one{"پزوی بولیوی"}
other{"پزوی بولیوی"}
}
BRL{
one{"رئال برزیل"}
other{"رئال برزیل"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/ff_Adlm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1581,4 +1581,8 @@ ff_Adlm{
other{"𞤳𞤢𞤱𞤢𞤧𞤢𞥄𞤶𞤭 𞤟𞤢𞤥𞤦𞤭𞤲𞤳𞤮"}
}
}
CurrencyUnitPatterns{
one{"{0} {1}"}
other{"{0} {1}"}
}
}
1 change: 1 addition & 0 deletions icu4c/source/data/curr/ga.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,7 @@ ga{
BRL{"R$"}
BSD{"$"}
BWP{"P"}
BYN{"BYN"}
BZD{"$"}
CAD{"$"}
CLP{"$"}
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/data/curr/gu.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,10 @@ gu{
one{"લિબેરિયન ડોલર"}
other{"લિબેરિયન ડોલર"}
}
LSL{
one{"લેસોથો લોતી"}
other{"લેસોથો લોતી"}
}
LTL{
one{"લિથુએનિયન લિતાસ"}
other{"લિથુએનિયન લિતાસ"}
Expand Down
Loading

0 comments on commit d469e62

Please sign in to comment.