Browse Source

Merge pull request #656 from colinin/Fix-Localization-Resource-Name-Deplication

fix: fix duplication of localized resource names.
pull/712/head
yx lin 3 years ago
committed by GitHub
parent
commit
c8c0a1aa0e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs
  2. 16
      aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs

5
aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs

@ -27,7 +27,10 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
UiCultureName = l.UiCultureName, UiCultureName = l.UiCultureName,
DisplayName = l.DisplayName, DisplayName = l.DisplayName,
FlagIcon = l.FlagIcon FlagIcon = l.FlagIcon
}).OrderBy(l => l.CultureName).ToList()); })
.OrderBy(l => l.CultureName)
.DistinctBy(l => l.CultureName)
.ToList());
} }
} }
} }

16
aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs

@ -21,12 +21,16 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
public virtual Task<ListResultDto<ResourceDto>> GetListAsync() public virtual Task<ListResultDto<ResourceDto>> GetListAsync()
{ {
var resources = _localizationOptions.Resources.Select(x => new ResourceDto var resources = _localizationOptions
{ .Resources
Name = x.Value.ResourceName, .Select(x => new ResourceDto
DisplayName = x.Value.ResourceName, {
Description = x.Value.ResourceName, Name = x.Value.ResourceName,
}).OrderBy(l => l.Name); DisplayName = x.Value.ResourceName,
Description = x.Value.ResourceName,
})
.OrderBy(l => l.Name)
.DistinctBy(l => l.Name);
return Task.FromResult(new ListResultDto<ResourceDto>(resources.ToList())); return Task.FromResult(new ListResultDto<ResourceDto>(resources.ToList()));
} }

Loading…
Cancel
Save