organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 05:25:34 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-22765 fix uloc_addLikelySubtags on "und@x=private"

Browse source
This commit is contained in:
Frank Tang 2024-10-15 10:20:39 -07:00 • committed by Frank Yung-Fong Tang
parent ca9fcca3c7
commit 1dcb4bcb2d
4 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/loclikelysubtags.cpp
View file

@ -527,7 +527,7 @@ LSR LikelySubtags::makeMaximizedLsrFrom(const Locale &locale,
return {};
}
const char *name = locale.getName();
if (uprv_isAtSign(name[0]) && name[1] == 'x' && name[2] == '=') { // name.startsWith("@x=")
if (!returnInputIfUnmatch && uprv_isAtSign(name[0]) && name[1] == 'x' && name[2] == '=') { // name.startsWith("@x=")
// Private use language tag x-subtag-subtag... which CLDR changes to
// und-x-subtag-subtag...
return LSR(name, "", "", LSR::EXPLICIT_LSR);

7
icu4c/source/test/cintltst/cloctst.c
View file

@ -3924,6 +3924,13 @@ const char* const basic_maximize_data[][2] = {
// ICU-22545 & ICU-22742
"ru_XC",
"ru_Cyrl_XC"
}, {
// ICU-22765
"und@x=private",
"en_Latn_US@x=private",
}, {
"th@x=private",
"th_Thai_TH@x=private",
}
};

9
icu4c/source/test/intltest/loctest.cpp
View file

@ -4124,6 +4124,15 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() {
"en_PSCRACK",
"en_Latn_US_PSCRACK",
"en__PSCRACK"
}, {
// ICU-22765
"th@x=private",
"th_Thai_TH@x=private",
"th@x=private",
}, {
"und@x=private",
"en_Latn_US@x=private",
"en@x=private",
}
};

10
icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java
View file

@ -4162,7 +4162,15 @@ public class ULocaleTest extends CoreTestFmwk {
"und_US",
"en_Latn_US",
"en"
}
}, {
"th@x=private",
"th_Thai_TH@x=private",
"th@x=private",
}, {
"und@x=private",
"en_Latn_US@x=private",
"en@x=private",
}
};
for (int i = 0; i < full_data.length; i++) {