Fixed fallback logic for blazor attribute localization

pull/6293/head
Mladen Macanovic 5 years ago
parent 66a3d3c492
commit 741b7f1390

@ -32,9 +32,20 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly
{
foreach (var argument in arguments)
{
yield return stringLocalizer[$"DisplayName:{argument}"]
?? stringLocalizer[argument]
?? argument;
// first try to localize with "DisplayName:{Name}"
string localization = stringLocalizer[$"DisplayName:{argument}"];
if (!string.IsNullOrEmpty(localization) && !localization.StartsWith("DisplayName:"))
yield return localization;
// then try to localize with just "{Name}"
localization = stringLocalizer[argument];
if (!string.IsNullOrEmpty(localization) && localization != argument)
yield return localization;
// no localization found so just return what we got
yield return argument;
}
}
}

Loading…
Cancel
Save