ICU-20777 Merge the likelySubtags implemention

Change testdata/likelySubtags.txt to consider FAIL line ICU-20777 Fix Java Tests ICU-20777 Fix all issues ICU-20777 Incase timeout ICU-20777 ICU-20777 Skip Data Driven test
unicode-org · Aug 18, 2023 · ffc449d · ffc449d · github-actions · Aug 18, 2023
1 parent 27181e3
commit ffc449d
Show file tree

Hide file tree

Showing 24 changed files with 3,956 additions and 1,491 deletions.
diff --git a/icu4c/source/common/BUILD.bazel b/icu4c/source/common/BUILD.bazel
@@ -603,7 +603,9 @@ cc_library(
         "locbased.cpp",
         "locid.cpp",
         "loclikely.cpp",
+        "loclikelysubtags.cpp",
         "locmap.cpp",
+        "lsr.cpp",
         "resbund.cpp",
         "resource.cpp",
         "uloc.cpp",

diff --git a/icu4c/source/common/localematcher.cpp b/icu4c/source/common/localematcher.cpp
@@ -307,7 +307,7 @@ LSR getMaximalLsrOrUnd(const XLikelySubtags &likelySubtags, const Locale &locale
     if (U_FAILURE(errorCode) || locale.isBogus() || *locale.getName() == 0 /* "und" */) {
         return UND_LSR;
     } else {
-        return likelySubtags.makeMaximizedLsrFrom(locale, errorCode);
+        return likelySubtags.makeMaximizedLsrFrom(locale, false, errorCode);
     }
 }
 

diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
@@ -2080,14 +2080,18 @@ Locale::addLikelySubtags(UErrorCode& status) {
 
 void
 Locale::minimizeSubtags(UErrorCode& status) {
+    Locale::minimizeSubtags(false, status);
+}
+void
+Locale::minimizeSubtags(bool favorScript, UErrorCode& status) {
     if (U_FAILURE(status)) {
         return;
     }
 
     CharString minimizedLocaleID;
     {
         CharStringByteSink sink(&minimizedLocaleID);
-        ulocimp_minimizeSubtags(fullName, sink, &status);
+        ulocimp_minimizeSubtags(fullName, sink, favorScript, &status);
     }
 
     if (U_FAILURE(status)) {