From dd3e0c94411892c978f39f8dee70324852517752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 31 Aug 2022 11:59:30 +0300
Subject: [PATCH] Update AbpApplicationLocalizationAppService.cs

---
 .../AbpApplicationLocalizationAppService.cs            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 8aa949a8b8..404186c254 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
@@ -28,14 +28,16 @@ public class AbpApplicationLocalizationAppService :
     {
         using (CultureHelper.Use(culture))
         {
-            var localizationConfig = new ApplicationLocalizationDto();
-        
             var resources = LocalizationOptions
                 .Resources
                 .Values
                 .Union(
                     await ExternalLocalizationStore.GetResourcesAsync()
-                );
+                ).ToArray();
+
+            var localizationConfig = new ApplicationLocalizationDto {
+                Resources = new Dictionary<string, ApplicationLocalizationResourceDto>(resources.Length)
+            };
 
             foreach (var resource in resources)
             {
@@ -46,7 +48,7 @@ public class AbpApplicationLocalizationAppService :
                 {
                     var localizedStrings = await localizer.GetAllStringsAsync(
                         includeParentCultures: true,
-                        includeBaseLocalizers: false, //TODO: Test this!
+                        includeBaseLocalizers: true, //TODO: Test this!
                         includeDynamicContributors: false
                     );