From a1dd65cfdba3fc6084f9598f6ecbd54eec856416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 26 Aug 2022 17:28:03 +0300 Subject: [PATCH] Fix permission-management module for localization changes. --- .../Components/PermissionManagementModal.razor.cs | 4 ++-- .../PermissionManagementModal.cshtml.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 36358c1b95..364fd5c300 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/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; diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs index 30057eea82..feb8481f27 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs +++ b/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;