Skip to content

Fix Neutral Culture Names #56321

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
merged 5 commits into from
Jul 28, 2021
Merged

Fix Neutral Culture Names #56321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fd5b77
Fix Neutral Culture Names
tarekgh Jul 26, 2021
6daac69
Fix the test
tarekgh Jul 26, 2021
9982d69
Fix the test
tarekgh Jul 27, 2021
9e1be3b
Fix failing tests on Mac
tarekgh Jul 27, 2021
08398f3
Fix typo in the test
tarekgh Jul 27, 2021
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
19 changes: 17 additions & 2 deletions src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ namespace System.Globalization.Tests
{
public class CultureInfoEnglishName
{
// Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
public static bool SupportFullGlobalizationData => PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid;

public static IEnumerable<object[]> EnglishName_TestData()
{
yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

// Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
if (SupportFullGlobalizationData)
{
yield return new object[] { "en-US", "English (United States)" };
yield return new object[] { "fr-FR", "French (France)" };
yield return new object[] { "uz-Cyrl", "Uzbek (Cyrillic)" };
}
else
{
Expand All @@ -33,5 +36,17 @@ public void EnglishName(string name, string expected)
CultureInfo myTestCulture = new CultureInfo(name);
Assert.Equal(expected, myTestCulture.EnglishName);
}

[ConditionalFact(nameof(SupportFullGlobalizationData))]
public void ChineseNeutralEnglishName()
{
CultureInfo ci = new CultureInfo("zh-Hans");
Assert.True(ci.EnglishName == "Chinese (Simplified)" || ci.EnglishName == "Chinese, Simplified",
$"'{ci.EnglishName}' not equal to `Chinese (Simplified)` nor `Chinese, Simplified`");

ci = new CultureInfo("zh-HanT");
Assert.True(ci.EnglishName == "Chinese (Traditional)" || ci.EnglishName == "Chinese, Traditional",
$"'{ci.EnglishName}' not equal to `Chinese (Traditional)` nor `Chinese, Traditional`");
}
}
}
14 changes: 12 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 @@ -969,7 +969,12 @@ internal string EnglishName
// If its neutral use the language name
if (IsNeutralCulture)
{
englishDisplayName = EnglishLanguageName;
englishDisplayName = GetLocaleInfoCore(LocaleStringData.EnglishDisplayName);
if (string.IsNullOrEmpty(englishDisplayName))
{
englishDisplayName = EnglishLanguageName;
}

// differentiate the legacy display names
switch (_sName)
{
Expand Down Expand Up @@ -1026,7 +1031,12 @@ internal string NativeName
// If its neutral use the language name
if (IsNeutralCulture)
{
nativeDisplayName = NativeLanguageName;
nativeDisplayName = GetLocaleInfoCore(LocaleStringData.NativeDisplayName);
if (string.IsNullOrEmpty(nativeDisplayName))
{
nativeDisplayName = NativeLanguageName;
}

// differentiate the legacy display names
switch (_sName)
{
Expand Down