Merge remote-tracking branch 'upstream/master' into search-rebased

1 files changed, 24 insertions, 0 deletions

diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index f6a4ae7d6e..1802440dc4 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Net.Http;
@@ -6,6 +7,7 @@ using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 using Emby.Server.Implementations.EntryPoints;
+using Emby.Server.Implementations.Localization;
 using Jellyfin.Api.Middleware;
 using Jellyfin.Database.Implementations;
 using Jellyfin.LiveTv.Extensions;
@@ -22,6 +24,7 @@ using MediaBrowser.Controller.Extensions;
 using MediaBrowser.XbmcMetadata;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -127,6 +130,25 @@ namespace Jellyfin.Server
             services.AddHlsPlaylistGenerator();
             services.AddLiveTvServices();
 
+            var serverUICulture = _serverConfigurationManager.Configuration.UICulture;
+            if (string.IsNullOrEmpty(serverUICulture))
+            {
+                serverUICulture = "en-US";
+            }
+
+            CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(serverUICulture);
+
+            services.Configure<RequestLocalizationOptions>(options =>
+            {
+                var supportedUICultures = LocalizationManager.GetSupportedUICultures();
+                options.SupportedCultures = supportedUICultures;
+                options.SupportedUICultures = supportedUICultures;
+                options.DefaultRequestCulture = new RequestCulture(serverUICulture);
+                options.ApplyCurrentCultureToResponseHeaders = true;
+                options.FallBackToParentCultures = true;
+                options.FallBackToParentUICultures = true;
+            });
+
             services.AddHostedService<RecordingsHost>();
             services.AddHostedService<AutoDiscoveryHost>();
             services.AddHostedService<NfoUserDataSaver>();
@@ -168,6 +190,8 @@ namespace Jellyfin.Server
 
                 mainApp.UseCors();
 
+                mainApp.UseRequestLocalization();
+
                 if (config.RequireHttps && _serverApplicationHost.ListenWithHttps)
                 {
                     mainApp.UseHttpsRedirection();