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

ICU-22923 Workaround for addLikelySubtags(und-Latn-RS) bug

Browse source
This commit is contained in:
Mihai Nita 2025-03-10 19:11:46 +00:00
parent cc9adb6c32
commit 457157a92a
8 changed files with 2039 additions and 2044 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4058
icu4c/source/data/misc/langInfo.txt
View file

File diff suppressed because it is too large Load diff

6
icu4c/source/data/unit/da.txt
View file

@ -2444,9 +2444,9 @@ da{
}
pressure{
inch-ofhg{
dnam{"# Hg"}
one{"{0} # Hg"}
other{"{0} # Hg"}
dnam{"″ Hg"}
one{"{0} ″ Hg"}
other{"{0} ″ Hg"}
}
millimeter-ofhg{
dnam{"mmHg"}

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

@ -5923,11 +5923,6 @@ testLikelySubtagsLineFn(void *context,
return;
}
if ((uprv_strcmp(source.c_str(), "und-Latn-RS") == 0 )
&& THIS->logKnownIssue("ICU-22976", "unexpected likely subtags for und-Latn-RS")) {
return;
}
Locale actualMax(l);
actualMax.addLikelySubtags(*pErrorCode);
if (addLikely == "FAIL") {

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

@ -5723,13 +5723,9 @@ public class ULocaleTest extends CoreTestFmwk {
assertEquals("addLikelySubtags(" + test.source + ") should be unchanged",
l, ULocale.addLikelySubtags(l));
} else {
if (test.source.equals("und-Latn-RS")
&& logKnownIssue("ICU-23052", "addLikelySubtags(und-Latn-RS) bug") ) {
return;
}
assertEquals("addLikelySubtags(" + test.source + ")",
test.addLikely, ULocale.addLikelySubtags(l).toLanguageTag());
}
assertEquals("addLikelySubtags(" + test.source + ")",
test.addLikely, ULocale.addLikelySubtags(l).toLanguageTag());
}
if (test.removeFavorRegion.equals("FAIL")) {
assertEquals("minimizeSubtags(" + test.source + ") should be unchanged",
l, ULocale.minimizeSubtags(l));

BIN
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/icuver.res
View file

Binary file not shown.

BIN
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/langInfo.res
View file

Binary file not shown.

BIN
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/unit/da.res
View file

Binary file not shown.

4
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/localedistance/LikelySubtagsBuilder.java
View file

@ -270,8 +270,10 @@ final class LikelySubtagsBuilder {
// Add the special case for "und-Latn" => "en-Latn-US" (which is a bit of a
// hack for language matching).
// TODO: Find out the history of this line and document it better.
// Temporary patch. Needs an update of the ICU algorithm to match CLDR.
// See https://unicode-org.atlassian.net/browse/ICU-23052
set(lsrTable, "und", "Latn", "", lsr("en", "Latn", "US"));
set(lsrTable, "und", "Latn", "RS", lsr("sr", "Latn", "RS"));
logger.fine(lsrTable::toString);
// Ensure that if "und-RR" => "ll-Ssss-RR", then we also add "Ssss" => "RR".