diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-04 21:57:11 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-12 23:18:38 +0200 |
| commit | 5cfb379aa63689435077c8f1ebc10c98f625238c (patch) | |
| tree | 8493e6f87a7e244905479c990ba6afedff0742e8 /Emby.Server.Implementations/HttpServer/WebSocketConnection.cs | |
| parent | 4be3f5f1f9ff8bd0333033d6ad9c99711da03f96 (diff) | |
Use native middleware
Diffstat (limited to 'Emby.Server.Implementations/HttpServer/WebSocketConnection.cs')
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/WebSocketConnection.cs | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs index 6dc6d9d289..17070c39ba 100644 --- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs +++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs @@ -1,6 +1,5 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.Globalization; using System.IO.Pipelines; using System.Net; @@ -9,7 +8,6 @@ using System.Text; using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using Emby.Server.Implementations.Localization; using Jellyfin.Extensions.Json; using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net.WebSocketMessages; @@ -73,12 +71,6 @@ namespace Emby.Server.Implementations.HttpServer public IPAddress? RemoteEndPoint { get; } /// <summary> - /// Gets or initializes the culture fallback chain captured from the - /// <c>Accept-Language</c> header of the upgrade request. - /// </summary> - public IReadOnlyList<string>? RequestCultureFallback { get; init; } - - /// <summary> /// Gets or initializes the UI culture name captured from the upgrade request. /// </summary> public string? RequestUICulture { get; init; } @@ -98,22 +90,18 @@ namespace Emby.Server.Implementations.HttpServer /// <inheritdoc /> public void ApplyRequestCulture() { - if (RequestCultureFallback is not null) + if (string.IsNullOrEmpty(RequestUICulture)) { - LocalizationManager.RequestCultureFallback = RequestCultureFallback; + return; } - if (!string.IsNullOrEmpty(RequestUICulture)) + try { - try - { - CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(RequestUICulture); - } - catch (CultureNotFoundException) - { - // Jellyfin culture codes (e.g. "es_419") aren't always valid .NET cultures — - // skip setting CurrentUICulture; RequestCultureFallback above carries the chain. - } + CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(RequestUICulture); + } + catch (CultureNotFoundException) + { + // Codes that aren't valid .NET cultures are ignored. } } |
