Browse Source

Fix permission-management module for localization changes.

pull/13845/head
Halil İbrahim Kalkan 4 years ago
parent
commit
a1dd65cfdb
  1. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs
  2. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs

4
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs

@ -281,13 +281,13 @@ public partial class PermissionManagementModal
return fallbackValue;
}
var resource = LocalizationOptions.Value.Resources.GetOrNull(resourceName);
var resource = LocalizationOptions.Value.Resources.GetOrDefault(resourceName);
if (resource == null)
{
return fallbackValue;
}
var result = new LocalizableString(resource.ResourceType, key).Localize(StringLocalizerFactory);
var result = new LocalizableString(key, resourceName).Localize(StringLocalizerFactory);
if (result.ResourceNotFound)
{
return fallbackValue;

4
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs

@ -114,13 +114,13 @@ public class PermissionManagementModal : AbpPageModel
return fallbackValue;
}
var resource = LocalizationOptions.Resources.GetOrNull(resourceName);
var resource = LocalizationOptions.Resources.GetOrDefault(resourceName);
if (resource == null)
{
return fallbackValue;
}
var result = new LocalizableString(resource.ResourceType, key).Localize(StringLocalizerFactory);
var result = new LocalizableString(key, resourceName).Localize(StringLocalizerFactory);
if (result.ResourceNotFound)
{
return fallbackValue;

Loading…
Cancel
Save