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

ICU-22169 Fixed ures_getFunctionalEquivalent() to check the resource bundles' %%Parent resources when ascending

Browse source 
the parent tree.
This commit is contained in:
Rich Gillam 2023-09-07 15:21:15 -07:00 • committed by Rich Gillam
parent 612cfbbfe4
commit 916452befc
2 changed files with 83 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
icu4c/source/common/uresbund.cpp
View file

@ -2974,6 +2974,31 @@ static UBool isLocaleInList(UEnumeration *locEnum, const char *locToSearch, UErr
return false;
}
static void getParentForFunctionalEquivalent(const char* localeID,
UResourceBundle* res,
UResourceBundle* bund1,
char* parent,
int32_t parentCapacity) {
// Get parent.
// First check for a parent from %%Parent resource (Note that in resource trees
// such as collation, data may have different parents than in parentLocales).
UErrorCode subStatus = U_ZERO_ERROR;
parent[0] = '\0';
if (res != NULL) {
ures_getByKey(res, "%%Parent", bund1, &subStatus);
if (U_SUCCESS(subStatus)) {
int32_t parentLen = parentCapacity;
ures_getUTF8String(bund1, parent, &parentLen, true, &subStatus);
}
}
// If none there, use normal truncation parent
if (U_FAILURE(subStatus) || parent[0] == 0) {
subStatus = U_ZERO_ERROR;
uloc_getParent(localeID, parent, parentCapacity, &subStatus);
}
}
U_CAPI int32_t U_EXPORT2
ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
const char *path, const char *resName, const char *keyword, const char *locid,
@ -3071,7 +3096,11 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
uprv_strcpy(found, ures_getLocaleByType(res, ULOC_VALID_LOCALE, &subStatus));
}
uloc_getParent(found,parent,sizeof(parent),&subStatus);
if (uprv_strcmp(found, parent) != 0) {
uprv_strcpy(parent, found);
} else {
getParentForFunctionalEquivalent(found,res,&bund1,parent,sizeof(parent));
}
ures_close(res);
} while(!defVal[0] && *found && uprv_strcmp(found, "root") != 0 && U_SUCCESS(*status));
@ -3145,10 +3174,33 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
}
}
subStatus = U_ZERO_ERROR;
uprv_strcpy(found, parent);
uloc_getParent(found,parent,1023,&subStatus);
UBool haveFound = false;
// At least for collations which may be aliased, we need to use the VALID locale
// as the parent instead of just truncating, as long as the VALID locale is not
// root and has a different language than the parent. Use of the VALID locale
// here is similar to the procedure used at the end of the previous do-while loop
// for all resource types.
if (res != NULL && uprv_strcmp(resName, "collations") == 0) {
subStatus = U_ZERO_ERROR;
const char *validLoc = ures_getLocaleByType(res, ULOC_VALID_LOCALE, &subStatus);
if (U_SUCCESS(subStatus) && validLoc != NULL && validLoc[0] != 0 && uprv_strcmp(validLoc, "root") != 0) {
char validLang[ULOC_LANG_CAPACITY];
char parentLang[ULOC_LANG_CAPACITY];
uloc_getLanguage(validLoc, validLang, ULOC_LANG_CAPACITY, &subStatus);
uloc_getLanguage(parent, parentLang, ULOC_LANG_CAPACITY, &subStatus);
if (U_SUCCESS(subStatus) && uprv_strcmp(validLang, parentLang) != 0) {
// validLoc is not root and has a different language than parent, use it instead
uprv_strcpy(found, validLoc);
haveFound = true;
}
}
subStatus = U_ZERO_ERROR;
}
if (!haveFound) {
uprv_strcpy(found, parent);
}
getParentForFunctionalEquivalent(found,res,&bund1,parent,1023);
ures_close(res);
} while(!full[0] && *found && U_SUCCESS(*status));
@ -3215,10 +3267,9 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
}
}
}
subStatus = U_ZERO_ERROR;
uprv_strcpy(found, parent);
uloc_getParent(found,parent,1023,&subStatus);
getParentForFunctionalEquivalent(found,res,&bund1,parent,1023);
ures_close(res);
} while(!full[0] && *found && U_SUCCESS(*status));
}

25
icu4c/source/test/cintltst/creststn.c
View file

@ -2710,6 +2710,31 @@ static void TestGetFunctionalEquivalent(void) {
"t", "nl@collation=stroke", "root",
"f", "nl_NL@collation=stroke", "root",
"f", "nl_NL_EEXT@collation=stroke", "root",
/* Additions to test aliased locales */
"f", "yue_HK", "zh@collation=stroke",
"f", "yue_Hant", "zh@collation=stroke",
"f", "yue_Hant_HK", "zh@collation=stroke",
"f", "yue@collation=stroke", "zh@collation=stroke",
"f", "yue@collation=pinyin", "zh",
"f", "yue_CN", "zh",
"f", "yue_Hans", "zh",
"f", "yue_Hans_CN", "zh",
"f", "yue_Hans@collation=pinyin", "zh",
"f", "yue_Hans@collation=stroke", "zh@collation=stroke",
"f", "mo", "mo",
"t", "no", "no",
"t", "nb", "no",
"t", "nn", "no",
"f", "ars", "ar",
/* Additions to test locales without resources */
"f", "en_CN", "root",
"f", "zh_Hant_CN", "zh@collation=stroke",
"f", "zh_Hant_US", "zh@collation=stroke",
"f", "zh_Hans_US", "zh",
"f", "yue_TW", "zh@collation=stroke",
"f", "yue_US", "zh@collation=stroke",
"f", "ja_CN", "ja",
"f", "ja_US", "ja",
NULL
};
#endif /* !UCONFIG_NO_COLLATION */