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
Fix/add the comments
  • Loading branch information
@tarekgh
tarekgh committed Jun 21, 2022
commit 1604af39993113a0984ed10cc6cdab56356adcab
6 changes: 4 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@ private string[] GetNativeDigits()
{
string[] result = NumberFormatInfo.s_asciiDigits;

// LOCALE_SNATIVEDIGITS (array of 10 single character strings).
// NLS LOCALE_SNATIVEDIGITS (array of 10 single character strings). In case of ICU, the buffer can be longer.
string digits = GetLocaleInfoCoreUserOverride(LocaleStringData.Digits);

// if digits.Length < NumberFormatInfo.s_asciiDigits.Length means the native digits setting is messed up in the host machine.
Expand All @@ -2156,7 +2156,7 @@ private string[] GetNativeDigits()
return result;
}

// None ASCII digits
// Non-ASCII digits

// Check if values coming from ICU separated by 0xFFFF
int ffffPos = digits.IndexOf('\uFFFF');
Expand All @@ -2172,6 +2172,8 @@ private string[] GetNativeDigits()
return result;
}

// ICU case

int start = 0;
int index = 0;

Expand Down