From 62914ae39351bf6de3c2f7619a715c18391c6f28 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 20 Aug 2022 16:19:34 +0800 Subject: [PATCH] fix: fix duplication of localized resource names. --- .../Mvc/Localization/LanguageAppService.cs | 5 ++++- .../Mvc/Localization/ResourceAppService.cs | 16 ++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs index 7cd6ff4b2..17f723d81 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageAppService.cs +++ b/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, DisplayName = l.DisplayName, FlagIcon = l.FlagIcon - }).OrderBy(l => l.CultureName).ToList()); + }) + .OrderBy(l => l.CultureName) + .DistinctBy(l => l.CultureName) + .ToList()); } } } diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs index 829b34ce9..815b5e096 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs +++ b/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> GetListAsync() { - var resources = _localizationOptions.Resources.Select(x => new ResourceDto - { - Name = x.Value.ResourceName, - DisplayName = x.Value.ResourceName, - Description = x.Value.ResourceName, - }).OrderBy(l => l.Name); + var resources = _localizationOptions + .Resources + .Select(x => new ResourceDto + { + Name = x.Value.ResourceName, + DisplayName = x.Value.ResourceName, + Description = x.Value.ResourceName, + }) + .OrderBy(l => l.Name) + .DistinctBy(l => l.Name); return Task.FromResult(new ListResultDto(resources.ToList())); }