Revert DynamicLocalizationPreference

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)

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs

@@ -50,26 +50,26 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer
     public IEnumerable<LocalizedString> GetAllStrings(
         bool includeParentCultures,
         bool includeBaseLocalizers,
-        DynamicLocalizationPreference dynamicLocalizationPreference)
+        bool includeDynamicContributors)
     {
         return GetAllStrings(
             CultureInfo.CurrentUICulture.Name,
             includeParentCultures,
             includeBaseLocalizers,
-            dynamicLocalizationPreference
+            includeDynamicContributors
         );
     }
 
     public async Task<IEnumerable<LocalizedString>> 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<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers, DynamicLocalizationPreference dynamicLocalizationPreference)
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers, bool includeDynamicContributors)
         {
-            return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers, dynamicLocalizationPreference);
+            return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers, includeDynamicContributors);
         }
 
         public Task<IEnumerable<LocalizedString>> GetAllStringsAsync(bool includeParentCultures)
@@ -325,12 +325,12 @@ public class AbpDictionaryBasedStringLocalizer : IAbpStringLocalizer
             return _innerLocalizer.GetAllStringsAsync(includeParentCultures);
         }
 
-        public Task<IEnumerable<LocalizedString>> GetAllStringsAsync(bool includeParentCultures, bool includeBaseLocalizers, DynamicLocalizationPreference dynamicLocalizationPreference)
+        public Task<IEnumerable<LocalizedString>> GetAllStringsAsync(bool includeParentCultures, bool includeBaseLocalizers, bool includeDynamicContributors)
         {
             return _innerLocalizer.GetAllStringsAsync(
                 includeParentCultures,
                 includeBaseLocalizers,
-                dynamicLocalizationPreference
+                includeDynamicContributors
             );
         }
 

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/DynamicLocalizationPreference.cs

@@ -1,7 +0,0 @@
-namespace Volo.Abp.Localization;
-
-public enum DynamicLocalizationPreference : byte
-{
-    Include = 0,
-    Exclude = 1
-}

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/IAbpStringLocalizer.cs

@@ -9,7 +9,7 @@ public interface IAbpStringLocalizer : IStringLocalizer
     IEnumerable<LocalizedString> GetAllStrings(
         bool includeParentCultures,
         bool includeBaseLocalizers,
-        DynamicLocalizationPreference dynamicLocalizationPreference
+        bool includeDynamicContributors
     );
 
     Task<IEnumerable<LocalizedString>> GetAllStringsAsync(
@@ -19,7 +19,7 @@ public interface IAbpStringLocalizer : IStringLocalizer
     Task<IEnumerable<LocalizedString>> GetAllStringsAsync(
         bool includeParentCultures,
         bool includeBaseLocalizers,
-        DynamicLocalizationPreference dynamicLocalizationPreference
+        bool includeDynamicContributors
     );
 
     Task<IEnumerable<string>> GetSupportedCulturesAsync();

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceContributorList.cs

@@ -32,11 +32,11 @@ public class LocalizationResourceContributorList : List<ILocalizationResourceCon
     public void Fill(
         string cultureName, 
         Dictionary<string, LocalizedString> 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<ILocalizationResourceCon
     public async Task FillAsync(
         string cultureName, 
         Dictionary<string, LocalizedString> dictionary,
-        DynamicLocalizationPreference dynamicLocalizationPreference = DynamicLocalizationPreference.Include)
+        bool includeDynamicContributors = true)
     {
         foreach (var contributor in this)
         {
-            if (dynamicLocalizationPreference == DynamicLocalizationPreference.Exclude && contributor.IsDynamic)
+            if (!includeDynamicContributors && contributor.IsDynamic)
             {
                 continue;
             }

framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs

@@ -311,7 +311,7 @@ public class AbpLocalization_Tests : AbpIntegratedTest<AbpLocalizationTestModule
         using (CultureHelper.Use("tr"))
         {
             var localizedStrings = _localizer
-                .GetAllStrings(true, includeBaseLocalizers: true, dynamicLocalizationPreference: DynamicLocalizationPreference.Include)
+                .GetAllStrings(true, includeBaseLocalizers: true, includeDynamicContributors: true)
                 .ToList();
 
             localizedStrings.ShouldContain(
@@ -340,7 +340,7 @@ public class AbpLocalization_Tests : AbpIntegratedTest<AbpLocalizationTestModule
         using (CultureHelper.Use("tr"))
         {
             var localizedStrings = _localizer
-                .GetAllStrings(true, includeBaseLocalizers: false, dynamicLocalizationPreference: DynamicLocalizationPreference.Include)
+                .GetAllStrings(true, includeBaseLocalizers: false, includeDynamicContributors: true)
                 .ToList();
 
             localizedStrings.ShouldNotContain(