From 2d30e866bc704fa9dc4b191d83c1a738c721fb25 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Thu, 13 May 2021 16:42:20 +1000
Subject: [PATCH] Fix loc'ble attributes resolution

---
 .../src/SRCategoryAttribute.cs                            | 8 +++-----
 .../src/SRDescriptionAttribute.cs                         | 5 +++--
 .../src/SRDisplayNameAttribute.cs                         | 5 +++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/System.Windows.Forms.Design/src/SRCategoryAttribute.cs b/src/System.Windows.Forms.Design/src/SRCategoryAttribute.cs
index 6b68caacbb2..88cc95c1676 100644
--- a/src/System.Windows.Forms.Design/src/SRCategoryAttribute.cs
+++ b/src/System.Windows.Forms.Design/src/SRCategoryAttribute.cs
@@ -9,13 +9,11 @@ namespace System.Windows.Forms
     [AttributeUsage(AttributeTargets.All)]
     internal sealed class SRCategoryAttribute : CategoryAttribute
     {
-        public SRCategoryAttribute(string category) : base(category)
+        public SRCategoryAttribute(string category)
+            : base(category)
         {
         }
 
-        protected override string GetLocalizedString(string value)
-        {
-            return value;
-        }
+        protected override string GetLocalizedString(string value) => SR.GetResourceString(value);
     }
 }
diff --git a/src/System.Windows.Forms.Design/src/SRDescriptionAttribute.cs b/src/System.Windows.Forms.Design/src/SRDescriptionAttribute.cs
index aac388f78c0..33fa7c2112c 100644
--- a/src/System.Windows.Forms.Design/src/SRDescriptionAttribute.cs
+++ b/src/System.Windows.Forms.Design/src/SRDescriptionAttribute.cs
@@ -11,7 +11,8 @@ internal sealed class SRDescriptionAttribute : DescriptionAttribute
     {
         private bool replaced;
 
-        public SRDescriptionAttribute(string description) : base(description)
+        public SRDescriptionAttribute(string description)
+            : base(description)
         {
         }
 
@@ -22,7 +23,7 @@ public override string Description
                 if (!replaced)
                 {
                     replaced = true;
-                    DescriptionValue = base.Description;
+                    DescriptionValue = SR.GetResourceString(base.Description);
                 }
 
                 return base.Description;
diff --git a/src/System.Windows.Forms.Design/src/SRDisplayNameAttribute.cs b/src/System.Windows.Forms.Design/src/SRDisplayNameAttribute.cs
index 1e96e300004..ea6f11831da 100644
--- a/src/System.Windows.Forms.Design/src/SRDisplayNameAttribute.cs
+++ b/src/System.Windows.Forms.Design/src/SRDisplayNameAttribute.cs
@@ -11,7 +11,8 @@ internal sealed class SRDisplayNameAttribute : DisplayNameAttribute
     {
         private bool replaced;
 
-        public SRDisplayNameAttribute(string displayName) : base(displayName)
+        public SRDisplayNameAttribute(string displayName)
+            : base(displayName)
         {
         }
 
@@ -22,7 +23,7 @@ public override string DisplayName
                 if (!replaced)
                 {
                     replaced = true;
-                    DisplayNameValue = base.DisplayName;
+                    DisplayNameValue = SR.GetResourceString(base.DisplayName);
                 }
 
                 return base.DisplayName;