Delayed initialization of the language.

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Localization;
+using Microsoft.AspNetCore.RequestLocalization;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Auditing;
@@ -50,40 +51,8 @@ namespace Microsoft.AspNetCore.Builder
 
         public static IApplicationBuilder UseAbpRequestLocalization(this IApplicationBuilder app, Action<RequestLocalizationOptions> optionsAction = null)
         {
-            IReadOnlyList<LanguageInfo> languages;
+            app.ApplicationServices.GetRequiredService<IAbpRequestLocalizationOptionsProvider>().InitLocalizationOptions(optionsAction);
-            string defaultLanguage;
+            return app.UseMiddleware<AbpRequestLocalizationMiddleware>();
-
-            using (var scope = app.ApplicationServices.CreateScope())
-            {
-                var languageProvider = scope.ServiceProvider.GetRequiredService<ILanguageProvider>();
-                languages = AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync());
-
-                var settingProvider = scope.ServiceProvider.GetRequiredService<ISettingProvider>();
-                defaultLanguage = AsyncHelper.RunSync(() => settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage));
-            }
-
-            var options = !languages.Any()
-                ? new RequestLocalizationOptions()
-                : new RequestLocalizationOptions
-                {
-                    DefaultRequestCulture = DefaultGetRequestCulture(defaultLanguage, languages),
-
-                    SupportedCultures = languages
-                        .Select(l => l.CultureName)
-                        .Distinct()
-                        .Select(c => new CultureInfo(c))
-                        .ToArray(),
-
-                    SupportedUICultures = languages
-                        .Select(l => l.UiCultureName)
-                        .Distinct()
-                        .Select(c => new CultureInfo(c))
-                        .ToArray()
-                };
-
-            optionsAction?.Invoke(options);
-
-            return app.UseRequestLocalization(options);
         }
 
         public static IApplicationBuilder UseAbpExceptionHandling(this IApplicationBuilder app)
@@ -96,17 +65,5 @@ namespace Microsoft.AspNetCore.Builder
             app.Properties[ExceptionHandlingMiddlewareMarker] = true;
             return app.UseMiddleware<AbpExceptionHandlingMiddleware>();
         }
-
-        private static RequestCulture DefaultGetRequestCulture(string defaultLanguage, IReadOnlyList<LanguageInfo> languages)
-        {
-            if (defaultLanguage == null)
-            {
-                var firstLanguage = languages.First();
-                return new RequestCulture(firstLanguage.CultureName, firstLanguage.UiCultureName);
-            }
-
-            var (cultureName, uiCultureName) = LocalizationSettingHelper.ParseLanguageSetting(defaultLanguage);
-            return new RequestCulture(cultureName, uiCultureName);
-        }
     }
 }

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/AbpRequestLocalizationMiddleware.cs

@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Localization;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
+
+namespace Microsoft.AspNetCore.RequestLocalization
+{
+    public class AbpRequestLocalizationMiddleware : IMiddleware, ITransientDependency
+    {
+        private readonly IAbpRequestLocalizationOptionsProvider _requestLocalizationOptionsProvider;
+
+        public AbpRequestLocalizationMiddleware(
+            IAbpRequestLocalizationOptionsProvider requestLocalizationOptionsProvider)
+        {
+            _requestLocalizationOptionsProvider = requestLocalizationOptionsProvider;
+        }
+
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            var options = Options.Create(_requestLocalizationOptionsProvider.GetLocalizationOptions());
+            var middleware = new RequestLocalizationMiddleware(next, options);
+            await middleware.Invoke(context);
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/DefaultAbpRequestLocalizationOptionsProvider.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Localization;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Localization;
+using Volo.Abp.Settings;
+using Volo.Abp.Threading;
+
+namespace Microsoft.AspNetCore.RequestLocalization
+{
+    public class DefaultAbpRequestLocalizationOptionsProvider : IAbpRequestLocalizationOptionsProvider, ISingletonDependency
+    {
+        private readonly ILanguageProvider _languageProvider;
+        private readonly ISettingProvider _settingProvider;
+        private Lazy<RequestLocalizationOptions> _lazyRequestLocalizationOptions;
+
+        public DefaultAbpRequestLocalizationOptionsProvider(ILanguageProvider languageProvider,
+            ISettingProvider settingProvider)
+        {
+            _languageProvider = languageProvider;
+            _settingProvider = settingProvider;
+        }
+
+        public void InitLocalizationOptions(Action<RequestLocalizationOptions> optionsAction = null)
+        {
+            _lazyRequestLocalizationOptions = new Lazy<RequestLocalizationOptions>(() =>
+            {
+                var languages = AsyncHelper.RunSync(_languageProvider.GetLanguagesAsync);
+                var defaultLanguage = AsyncHelper.RunSync(() =>
+                    _settingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage));
+
+                var options = !languages.Any()
+                    ? new RequestLocalizationOptions()
+                    : new RequestLocalizationOptions
+                    {
+                        DefaultRequestCulture = DefaultGetRequestCulture(defaultLanguage, languages),
+
+                        SupportedCultures = languages
+                            .Select(l => l.CultureName)
+                            .Distinct()
+                            .Select(c => new CultureInfo(c))
+                            .ToArray(),
+
+                        SupportedUICultures = languages
+                            .Select(l => l.UiCultureName)
+                            .Distinct()
+                            .Select(c => new CultureInfo(c))
+                            .ToArray()
+                    };
+
+                optionsAction?.Invoke(options);
+                return options;
+            }, true);
+        }
+
+        public RequestLocalizationOptions GetLocalizationOptions()
+        {
+            return _lazyRequestLocalizationOptions.Value;
+        }
+
+        private static RequestCulture DefaultGetRequestCulture(string defaultLanguage, IReadOnlyList<LanguageInfo> languages)
+        {
+            if (defaultLanguage == null)
+            {
+                var firstLanguage = languages.First();
+                return new RequestCulture(firstLanguage.CultureName, firstLanguage.UiCultureName);
+            }
+
+            var (cultureName, uiCultureName) = LocalizationSettingHelper.ParseLanguageSetting(defaultLanguage);
+            return new RequestCulture(cultureName, uiCultureName);
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/RequestLocalization/IAbpRequestLocalizationOptionsProvider.cs

@@ -0,0 +1,12 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+
+namespace Microsoft.AspNetCore.RequestLocalization
+{
+    public interface IAbpRequestLocalizationOptionsProvider
+    {
+        void InitLocalizationOptions(Action<RequestLocalizationOptions> optionsAction = null);
+
+        RequestLocalizationOptions GetLocalizationOptions();
+    }
+}