2 files changed, 19 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 1e0d77fe51..2bcce168cf 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -40,11 +40,6 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         private readonly List<(IWebSocketConnection Connection, CancellationTokenSource CancellationTokenSource, TStateType State)> _activeConnections = new();
 
-        /// <summary>
-        /// The logger.
-        /// </summary>
-        protected readonly ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> Logger;
-
         private readonly Task _messageConsumerTask;
 
         protected BasePeriodicWebSocketListener(ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> logger)
@@ -57,6 +52,11 @@ namespace MediaBrowser.Controller.Net
         }
 
         /// <summary>
+        /// Gets the Logger.
+        /// </summary>
+        protected ILogger<BasePeriodicWebSocketListener<TReturnDataType, TStateType>> Logger { get; }
+
+        /// <summary>
         /// Gets the type used for the messages sent to the client.
         /// </summary>
         /// <value>The type.</value>
@@ -209,6 +209,11 @@ namespace MediaBrowser.Controller.Net
                 var (connection, cts, state) = tuple;
                 var cancellationToken = cts.Token;
 
+                // Restore the culture context captured when the connection was established
+                // so that GetDataToSendForConnection produces a localized payload matching
+                // the client's Accept-Language preference rather than the server default.
+                connection.ApplyRequestCulture();
+
                 var data = await GetDataToSendForConnection(connection).ConfigureAwait(false);
                 if (data is null)
                 {
diff --git a/MediaBrowser.Controller/Net/IWebSocketConnection.cs b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
index bdc0f9a10f..48431e75c3 100644
--- a/MediaBrowser.Controller/Net/IWebSocketConnection.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
@@ -77,5 +77,14 @@ namespace MediaBrowser.Controller.Net
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task ReceiveAsync(CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Applies the culture context captured when the connection was established
+        /// (from the upgrade request's <c>Accept-Language</c> header) to the current
+        /// async flow. Server-initiated message senders should call this before
+        /// localising any payload so that the response uses the client's preferred
+        /// language rather than the server default.
+        /// </summary>
+        void ApplyRequestCulture();
     }
 }