From 5b78fa68a544eff4216cf9dba0fe0fa64915d1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 5 Sep 2022 19:01:23 +0300 Subject: [PATCH] Revert DynamicLocalizationPreference --- .../AbpApplicationLocalizationAppService.cs | 2 +- .../AbpDictionaryBasedStringLocalizer.cs | 36 +++++++++---------- .../DynamicLocalizationPreference.cs | 7 ---- .../Abp/Localization/IAbpStringLocalizer.cs | 4 +-- .../LocalizationResourceContributorList.cs | 8 ++--- .../Abp/Localization/AbpLocalization_Tests.cs | 4 +-- 6 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 framework/src/Volo.Abp.Localization/Volo/Abp/Localization/DynamicLocalizationPreference.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationLocalizationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationLocalizationAppService.cs index e8b2a245bd..01d97ca34d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationLocalizationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationLocalizationAppService.cs @@ -59,7 +59,7 @@ public class AbpApplicationLocalizationAppService : var localizedStringsWithDynamics = await localizer.GetAllStringsAsync( includeParentCultures: true, includeBaseLocalizers: false, - dynamicLocalizationPreference: DynamicLocalizationPreference.Include + includeDynamicContributors: true ); foreach (var localizedString in localizedStringsWithDynamics) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs index 13a635c27d..cf5c1ebb82 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs @@ -50,26 +50,26 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer public IEnumerable GetAllStrings( bool includeParentCultures, bool includeBaseLocalizers, - DynamicLocalizationPreference dynamicLocalizationPreference) + bool includeDynamicContributors) { return GetAllStrings( CultureInfo.CurrentUICulture.Name, includeParentCultures, includeBaseLocalizers, - dynamicLocalizationPreference + includeDynamicContributors ); } public async Task> GetAllStringsAsync( bool includeParentCultures, bool includeBaseLocalizers, - DynamicLocalizationPreference dynamicLocalizationPreference) + bool includeDynamicContributors) { return await GetAllStringsAsync( CultureInfo.CurrentUICulture.Name, includeParentCultures, includeBaseLocalizers, - dynamicLocalizationPreference + includeDynamicContributors ); } @@ -169,7 +169,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer string cultureName, bool includeParentCultures = true, bool includeBaseLocalizers = true, - DynamicLocalizationPreference dynamicLocalizationPreference = DynamicLocalizationPreference.Include) + bool includeDynamicContributors = true) { //TODO: Can be optimized (example: if it's already default dictionary, skip overriding) @@ -187,7 +187,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer var baseLocalizedString = baseLocalizer.GetAllStrings( includeParentCultures, includeBaseLocalizers, // Always true, I know! - dynamicLocalizationPreference + includeDynamicContributors ); foreach (var localizedString in baseLocalizedString) @@ -208,18 +208,18 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer //Fill all strings from default culture if (!Resource.DefaultCultureName.IsNullOrEmpty()) { - Resource.Contributors.Fill(Resource.DefaultCultureName, allStrings, dynamicLocalizationPreference); + Resource.Contributors.Fill(Resource.DefaultCultureName, allStrings, includeDynamicContributors); } //Overwrite all strings from the language based on country culture if (cultureName.Contains("-")) { - Resource.Contributors.Fill(CultureHelper.GetBaseCultureName(cultureName), allStrings, dynamicLocalizationPreference); + Resource.Contributors.Fill(CultureHelper.GetBaseCultureName(cultureName), allStrings, includeDynamicContributors); } } //Overwrite all strings from the original culture - Resource.Contributors.Fill(cultureName, allStrings, dynamicLocalizationPreference); + Resource.Contributors.Fill(cultureName, allStrings, includeDynamicContributors); return allStrings.Values.ToImmutableList(); } @@ -228,7 +228,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer string cultureName, bool includeParentCultures = true, bool includeBaseLocalizers = true, - DynamicLocalizationPreference dynamicLocalizationPreference = DynamicLocalizationPreference.Include) + bool includeDynamicContributors = true) { //TODO: Can be optimized (example: if it's already default dictionary, skip overriding) @@ -246,7 +246,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer var baseLocalizedString = await baseLocalizer.GetAllStringsAsync( includeParentCultures, includeBaseLocalizers, // Always true, I know! - dynamicLocalizationPreference + includeDynamicContributors ); foreach (var localizedString in baseLocalizedString) @@ -270,7 +270,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer await Resource.Contributors.FillAsync( Resource.DefaultCultureName, allStrings, - dynamicLocalizationPreference + includeDynamicContributors ); } @@ -280,7 +280,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer await Resource.Contributors.FillAsync( CultureHelper.GetBaseCultureName(cultureName), allStrings, - dynamicLocalizationPreference + includeDynamicContributors ); } } @@ -289,7 +289,7 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer await Resource.Contributors.FillAsync( cultureName, allStrings, - dynamicLocalizationPreference + includeDynamicContributors ); return allStrings.Values.ToImmutableList(); @@ -315,9 +315,9 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures); } - public IEnumerable GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers, DynamicLocalizationPreference dynamicLocalizationPreference) + public IEnumerable GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers, bool includeDynamicContributors) { - return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers, dynamicLocalizationPreference); + return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers, includeDynamicContributors); } public Task> GetAllStringsAsync(bool includeParentCultures) @@ -325,12 +325,12 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer return _innerLocalizer.GetAllStringsAsync(includeParentCultures); } - public Task> GetAllStringsAsync(bool includeParentCultures, bool includeBaseLocalizers, DynamicLocalizationPreference dynamicLocalizationPreference) + public Task> GetAllStringsAsync(bool includeParentCultures, bool includeBaseLocalizers, bool includeDynamicContributors) { return _innerLocalizer.GetAllStringsAsync( includeParentCultures, includeBaseLocalizers, - dynamicLocalizationPreference + includeDynamicContributors ); } diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/DynamicLocalizationPreference.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/DynamicLocalizationPreference.cs deleted file mode 100644 index 81b4d5b8f6..0000000000 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/DynamicLocalizationPreference.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.Abp.Localization; - -public enum DynamicLocalizationPreference : byte -{ - Include = 0, - Exclude = 1 -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/IAbpStringLocalizer.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/IAbpStringLocalizer.cs index e69ef01d0f..59fbbcb7b4 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/IAbpStringLocalizer.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/IAbpStringLocalizer.cs @@ -9,7 +9,7 @@ public interface IAbpStringLocalizer : IStringLocalizer IEnumerable GetAllStrings( bool includeParentCultures, bool includeBaseLocalizers, - DynamicLocalizationPreference dynamicLocalizationPreference + bool includeDynamicContributors ); Task> GetAllStringsAsync( @@ -19,7 +19,7 @@ public interface IAbpStringLocalizer : IStringLocalizer Task> GetAllStringsAsync( bool includeParentCultures, bool includeBaseLocalizers, - DynamicLocalizationPreference dynamicLocalizationPreference + bool includeDynamicContributors ); Task> GetSupportedCulturesAsync(); diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceContributorList.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceContributorList.cs index 8d575ed75c..6df15920da 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceContributorList.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceContributorList.cs @@ -32,11 +32,11 @@ public class LocalizationResourceContributorList : List dictionary, - DynamicLocalizationPreference dynamicLocalizationPreference = DynamicLocalizationPreference.Include) + bool includeDynamicContributors = true) { foreach (var contributor in this) { - if (dynamicLocalizationPreference == DynamicLocalizationPreference.Exclude && contributor.IsDynamic) + if (!includeDynamicContributors && contributor.IsDynamic) { continue; } @@ -48,11 +48,11 @@ public class LocalizationResourceContributorList : List dictionary, - DynamicLocalizationPreference dynamicLocalizationPreference = DynamicLocalizationPreference.Include) + bool includeDynamicContributors = true) { foreach (var contributor in this) { - if (dynamicLocalizationPreference == DynamicLocalizationPreference.Exclude && contributor.IsDynamic) + if (!includeDynamicContributors && contributor.IsDynamic) { continue; } diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs index 342e6d8708..ee0e929e32 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs +++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs @@ -311,7 +311,7 @@ public class AbpLocalization_Tests : AbpIntegratedTest