Skip to content

Fix Native Digits Support #71045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarekgh merged 6 commits into from
Jun 22, 2022
Merged

Fix Native Digits Support #71045

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49bbd2e
Fix Native Digits Support
tarekgh Jun 21, 2022
d311dde
Fix running the test on older ICU versions
tarekgh Jun 21, 2022
1604af3
Fix/add the comments
tarekgh Jun 21, 2022
e5a83d0
Address the feedback
tarekgh Jun 21, 2022
9a13ddf
Feedback
tarekgh Jun 22, 2022
3878055
Adding assert
tarekgh Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address the feedback
  • Loading branch information
@tarekgh
tarekgh committed Jun 21, 2022
commit e5a83d081ffb0463022fc966c56f5b9616607a91
13 changes: 6 additions & 7 deletions src/native/libs/System.Globalization.Native/pal_localeStringData.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ static UErrorCode GetLocaleInfoDecimalFormatSymbol(const char* locale,
UErrorCode status = U_ZERO_ERROR;
UNumberFormat* pFormat = unum_open(UNUM_DECIMAL, NULL, 0, locale, NULL, &status);

int32_t l = unum_getSymbol(pFormat, symbol, value, valueLength, &status);
int32_t lengthResult = unum_getSymbol(pFormat, symbol, value, valueLength, &status);
if (symbolLength != NULL)
{
*symbolLength = l;
*symbolLength = lengthResult;
}
unum_close(pFormat);
return status;
Expand Down Expand Up @@ -293,13 +293,12 @@ int32_t GlobalizationNative_GetLocaleInfoString(const UChar* localeName,
break;
case LocaleString_Digits:
{
// Native digit can be more than one character (e.g. ccp-Cakm-BD locale which using surrogate pairs to represent the native digit).
// Native digit can be more than one 16-bit character (e.g. ccp-Cakm-BD locale which using surrogate pairs to represent the native digit).
// We'll separate the native digits in the returned buffer by the character '\uFFFF'.
int charIndex = 0;
int symbolLength = 0;

int32_t symbolLength = 0;
status = GetDigitSymbol(locale, status, UNUM_ZERO_DIGIT_SYMBOL, 0, value, valueLength, &symbolLength);
charIndex += symbolLength;

int32_t charIndex = symbolLength;

if (U_SUCCESS(status) && (uint32_t)charIndex < (uint32_t)valueLength)
{
Expand Down