From b7d7c8bf94513be16f0afd8a27c0951c4c493d1d Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 17 Jan 2023 12:52:55 +0300 Subject: [PATCH 1/3] Add ShortDisplayName to LanguageInfo --- .../Volo/Abp/Localization/LanguageInfo.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs index 38d2e973a0..770367d1e3 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs @@ -15,9 +15,13 @@ public class LanguageInfo : ILanguageInfo [NotNull] public virtual string DisplayName { get; protected set; } + [NotNull] + public virtual string ShortDisplayName { get; protected set; } + [CanBeNull] public virtual string FlagIcon { get; set; } + protected LanguageInfo() { @@ -49,5 +53,9 @@ public class LanguageInfo : ILanguageInfo DisplayName = !displayName.IsNullOrWhiteSpace() ? displayName : cultureName; + + var culture = new System.Globalization.CultureInfo(cultureName); + + ShortDisplayName = culture.TwoLetterISOLanguageName; } } From 340f8b5953f9134aaa94221bead118815fc9376f Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 17 Jan 2023 12:58:38 +0300 Subject: [PATCH 2/3] Refactor LanguageInfo --- .../Volo/Abp/Localization/LanguageInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs index 770367d1e3..6262eb85d9 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using JetBrains.Annotations; namespace Volo.Abp.Localization; @@ -53,9 +54,8 @@ public class LanguageInfo : ILanguageInfo DisplayName = !displayName.IsNullOrWhiteSpace() ? displayName : cultureName; - - var culture = new System.Globalization.CultureInfo(cultureName); - ShortDisplayName = culture.TwoLetterISOLanguageName; + ShortDisplayName = new CultureInfo(cultureName) + .TwoLetterISOLanguageName; } } From 3c65f820d137b5ea2b8e6fcf774077f4d911c696 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Tue, 17 Jan 2023 13:25:05 +0300 Subject: [PATCH 3/3] Change property name as TwoLetterISOLanguageName in LanguageInfo --- .../Volo/Abp/Localization/LanguageInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs index 6262eb85d9..9183b89c4e 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageInfo.cs @@ -17,7 +17,7 @@ public class LanguageInfo : ILanguageInfo public virtual string DisplayName { get; protected set; } [NotNull] - public virtual string ShortDisplayName { get; protected set; } + public virtual string TwoLetterISOLanguageName { get; protected set; } [CanBeNull] public virtual string FlagIcon { get; set; } @@ -55,7 +55,7 @@ public class LanguageInfo : ILanguageInfo ? displayName : cultureName; - ShortDisplayName = new CultureInfo(cultureName) + TwoLetterISOLanguageName = new CultureInfo(cultureName) .TwoLetterISOLanguageName; } }