From af39e55416097b21b51ec9fcfa190bb0660d2f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 31 Aug 2022 10:23:46 +0300 Subject: [PATCH] Remove option: GetFromExternalStore --- .../AbpApplicationConfigurationAppService.cs | 18 +++++++++--------- .../External/AbpExternalLocalizationOptions.cs | 5 ----- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 37c509a285..8a3a004d63 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs @@ -215,15 +215,15 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp localizationConfig.Languages.AddRange(await _languageProvider.GetLanguagesAsync()); - var resourceNames = _localizationOptions.Resources.Values.Select(x => x.ResourceName); - - if (_externalLocalizationOptions.GetFromExternalStore) - { - var externalResourceNames = await LazyServiceProvider - .LazyGetRequiredService() - .GetResourceNamesAsync(); - resourceNames = resourceNames.Union(externalResourceNames); - } + var externalResourceNames = await LazyServiceProvider + .LazyGetRequiredService() + .GetResourceNamesAsync(); + + var resourceNames = _localizationOptions + .Resources + .Values + .Select(x => x.ResourceName) + .Union(externalResourceNames); foreach (var resourceName in resourceNames) { diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/External/AbpExternalLocalizationOptions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/External/AbpExternalLocalizationOptions.cs index bc2a19a26c..617ca3cf4e 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/External/AbpExternalLocalizationOptions.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/External/AbpExternalLocalizationOptions.cs @@ -6,9 +6,4 @@ public class AbpExternalLocalizationOptions /// Default: true. /// public bool SaveToExternalStore { get; set; } = true; - - /// - /// Default: false. - /// - public bool GetFromExternalStore { get; set; } } \ No newline at end of file