Browse Source

fix(localization): filter duplicate resources

pull/848/head
colin 2 years ago
parent
commit
e86be31d48
  1. 2
      aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextAppService.cs

2
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();

Loading…
Cancel
Save