diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-04 23:57:34 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2026-05-12 23:18:38 +0200 |
| commit | 93d7a1cf20442e4a82b2819f8a5bdbe4f6c0ae97 (patch) | |
| tree | 8cca087d1f574b445b9823e9eda280928c7d0331 | |
| parent | 5cfb379aa63689435077c8f1ebc10c98f625238c (diff) | |
Cleanup
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/WebSocketConnection.cs | 15 | ||||
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/WebSocketManager.cs | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs index 17070c39ba..e9bf3b93a7 100644 --- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs +++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs @@ -71,9 +71,9 @@ namespace Emby.Server.Implementations.HttpServer public IPAddress? RemoteEndPoint { get; } /// <summary> - /// Gets or initializes the UI culture name captured from the upgrade request. + /// Gets or initializes the UI culture captured from the upgrade request. /// </summary> - public string? RequestUICulture { get; init; } + public CultureInfo? RequestUICulture { get; init; } /// <inheritdoc /> public Func<WebSocketMessageInfo, Task>? OnReceive { get; set; } @@ -90,19 +90,12 @@ namespace Emby.Server.Implementations.HttpServer /// <inheritdoc /> public void ApplyRequestCulture() { - if (string.IsNullOrEmpty(RequestUICulture)) + if (RequestUICulture is null) { return; } - try - { - CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo(RequestUICulture); - } - catch (CultureNotFoundException) - { - // Codes that aren't valid .NET cultures are ignored. - } + CultureInfo.CurrentUICulture = RequestUICulture; } /// <inheritdoc /> diff --git a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs index dcdfda5472..072034c4bf 100644 --- a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs +++ b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs @@ -48,17 +48,13 @@ namespace Emby.Server.Implementations.HttpServer _logger.LogInformation("WS {IP} request", context.Connection.RemoteIpAddress); WebSocket webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false); - - // Capture the culture set by RequestLocalizationMiddleware so it can be - // restored both when processing incoming messages and when periodic - // listeners produce server-initiated payloads on background tasks. var connection = new WebSocketConnection( _loggerFactory.CreateLogger<WebSocketConnection>(), webSocket, authorizationInfo, context.GetNormalizedRemoteIP()) { - RequestUICulture = CultureInfo.CurrentUICulture.Name + RequestUICulture = CultureInfo.CurrentUICulture }; connection.OnReceive = result => { |