Merge branch 'rel-4.0' into dev

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpBlazorMessageLocalizerHelper.cs

@@ -32,9 +32,16 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
         {
             foreach (var argument in arguments)
             {
-                yield return stringLocalizer[$"DisplayName:{argument}"]
+                // first try to localize with "DisplayName:{Name}"
-                    ?? stringLocalizer[argument]
+                var localization = stringLocalizer[$"DisplayName:{argument}"];
-                    ?? argument;
+
+                if (localization.ResourceNotFound)
+                {
+                    // then try to localize with just "{Name}"
+                    localization = stringLocalizer[argument];
+                }
+
+                yield return localization;
             }
         }
     }