Fix Macedonian display name in ComponentModel CultureInfo converter (dotnet/corefx...
authorTarek Mahmoud Sayed <tarekms@microsoft.com>
Fri, 3 May 2019 14:23:42 +0000 (07:23 -0700)
committerStephen Toub <stoub@microsoft.com>
Fri, 3 May 2019 14:23:42 +0000 (10:23 -0400)
* Fix Macedonian display name in ComponentModel CultureInfo converter

* Fix the comment

Commit migrated from https://github.com/dotnet/corefx/commit/d86da53b536b5f327aeaa9292469ea1a151af594

src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/CultureInfoConverter.cs

index 6cbe647..2e1703f 100644 (file)
@@ -58,9 +58,9 @@ namespace System.ComponentModel
         /// </summary>
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            // Hack, Only when GetCultureName returns culture.Name, we use CultureInfoMapper 
+            // Only when GetCultureName returns culture.Name, we use CultureInfoMapper
             // (Since CultureInfoMapper will transfer Culture.DisplayName to Culture.Name).
-            // Otherwise, we just keep the value unchange.
+            // Otherwise, we just keep the value unchanged.
             if (value is string text)
             {
                 if (GetCultureName(CultureInfo.InvariantCulture).Equals(""))
@@ -434,7 +434,7 @@ namespace System.ComponentModel
                     {"Lower Sorbian (Germany)", "dsb-DE"},
                     {"Luxembourgish (Luxembourg)", "lb-LU"},
                     {"Macedonian", "mk"},
-                    {"Macedonian (Former Yugoslav Republic of Macedonia)", "mk-MK"},
+                    {"Macedonian (North Macedonia)", "mk-MK"},
                     {"Malay", "ms"},
                     {"Malay (Brunei Darussalam)", "ms-BN"},
                     {"Malay (Malaysia)", "ms-MY"},