Merge pull request #848 from colinin/fix-dynamic-localization

fix(localization): filter duplicate resources
colinin · Jul 12, 2023 · d1367c2 · d1367c2
2 parents c7c0b90 + e86be31
commit d1367c2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs b/...Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs
@@ -55,6 +55,7 @@ public async virtual Task<ListResultDto<TextDifferenceDto>> GetListAsync(GetText
                 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 @@ public async virtual Task<ListResultDto<TextDifferenceDto>> GetListAsync(GetText
                 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();