Skip to content

Account for PredefinedCulturesOnly in CultureInfo LCID .ctor #87002

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 3 commits into from
Jun 2, 2023
Merged

Account for PredefinedCulturesOnly in CultureInfo LCID .ctor #87002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c108db
Account for PredefinedCulturesOnly in CultureInfo LCID .ctor (#86878)
OwnageIsMagic Jun 1, 2023
04c3fd6
add test case
OwnageIsMagic Jun 2, 2023
d63dfc2
fix test
OwnageIsMagic Jun 2, 2023
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
10 changes: 10 additions & 0 deletions src/libraries/System.Globalization/tests/Invariant/InvariantMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,16 @@ public void TestGetCultureInfo_PredefinedOnly_ReturnsSame()
Assert.Equal(CultureInfo.GetCultureInfo("en-US"), CultureInfo.GetCultureInfo("en-US", predefinedOnly: true));
}

[ConditionalTheory(nameof(PredefinedCulturesOnlyIsDisabled))]
[InlineData(0x0001)]
[InlineData(0x7c5C)]
[InlineData(0x03_0404)] // with sort id
[InlineData(0x007F)] // LOCALE_INVARIANT
public void TestCultureInfo_Ctor_Int32_ReturnsInvariant(int culture)
{
Assert.Equal(new CultureInfo(culture), CultureInfo.InvariantCulture);
}

private static byte[] GetExpectedInvariantOrdinalSortKey(ReadOnlySpan<char> input)
{
MemoryStream memoryStream = new MemoryStream();
Expand Down
10 changes: 10 additions & 0 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 @@ -868,6 +868,16 @@ internal static CultureData GetCultureData(int culture, bool bUseUserOverride)

if (GlobalizationMode.Invariant)
{
if (!GlobalizationMode.PredefinedCulturesOnly)
{
if (culture is < 1 or > 0xf_ffff)
{
throw new CultureNotFoundException(nameof(culture), culture, SR.Argument_CultureNotSupported);
}

return Invariant;
}

// LCID is not supported in the InvariantMode
throw new CultureNotFoundException(nameof(culture), culture, SR.Argument_CultureNotSupportedInInvariantMode);
}
Expand Down