From e86be31d489cbf1c444881e0742889747f462d9f Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 12 Jul 2023 19:10:14 +0800 Subject: [PATCH] fix(localization): filter duplicate resources --- .../LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs index 4a74681d8..168be3a77 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs +++ b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs @@ -55,6 +55,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization var filterResources = _localizationOptions.Resources .Select(r => r.Value) .Union(await _externalLocalizationStore.GetResourcesAsync()) + .DistinctBy(r => r.ResourceName) .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.ResourceName.Contains(input.Filter)) .OrderBy(r => r.ResourceName); @@ -69,6 +70,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization var resource = _localizationOptions.Resources .Select(r => r.Value) .Union(await _externalLocalizationStore.GetResourcesAsync()) + .DistinctBy(r => r.ResourceName) .Where(l => l.ResourceName.Equals(input.ResourceName)) .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.ResourceName.Contains(input.Filter)) .FirstOrDefault();