feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -245,7 +245,7 @@ Locale::getDisplayName(const Locale &displayLocale,
|
|||
return result;
|
||||
}
|
||||
|
||||
#if ! UCONFIG_NO_BREAK_ITERATION
|
||||
#if !UCONFIG_NO_BREAK_ITERATION
|
||||
|
||||
// -------------------------------------
|
||||
// Gets the objectLocale display name in the default locale language.
|
||||
|
|
@ -351,7 +351,7 @@ _getStringOrCopyKey(const char *path, const char *locale,
|
|||
}
|
||||
} else {
|
||||
/* no string from a resource bundle: convert the substitute */
|
||||
length=(int32_t)uprv_strlen(substitute);
|
||||
length = static_cast<int32_t>(uprv_strlen(substitute));
|
||||
u_charsToUChars(substitute, dest, uprv_min(length, destCapacity));
|
||||
errorCode = U_USING_DEFAULT_WARNING;
|
||||
}
|
||||
|
|
@ -835,7 +835,10 @@ uloc_getDisplayKeywordValue( const char* locale,
|
|||
}
|
||||
|
||||
/* get the keyword value */
|
||||
CharString keywordValue = ulocimp_getKeywordValue(locale, keyword, *status);
|
||||
CharString keywordValue;
|
||||
if (keyword != nullptr && *keyword != '\0') {
|
||||
keywordValue = ulocimp_getKeywordValue(locale, keyword, *status);
|
||||
}
|
||||
|
||||
/*
|
||||
* if the keyword is equal to currency .. then to get the display name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue