Add Accept-Language header support for per-request localization

Emby.Server.Implementations/HttpServer/WebSocketConnection.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Buffers;
+using System.Collections.Generic;
+using System.Globalization;
 using System.IO.Pipelines;
 using System.Net;
 using System.Net.WebSockets;
@@ -7,6 +9,7 @@ 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;
@@ -69,6 +72,17 @@ namespace Emby.Server.Implementations.HttpServer
         /// <inheritdoc />
         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; }
+
         /// <inheritdoc />
         public Func<WebSocketMessageInfo, Task>? OnReceive { get; set; }
 
@@ -81,6 +95,28 @@ namespace Emby.Server.Implementations.HttpServer
         /// <inheritdoc />
         public WebSocketState State => _socket.State;
 
+        /// <inheritdoc />
+        public void ApplyRequestCulture()
+        {
+            if (RequestCultureFallback is not null)
+            {
+                LocalizationManager.RequestCultureFallback = RequestCultureFallback;
+            }
+
+            if (!string.IsNullOrEmpty(RequestUICulture))
+            {
+                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.
+                }
+            }
+        }
+
         /// <inheritdoc />
         public async Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken)
         {

Emby.Server.Implementations/HttpServer/WebSocketManager.cs

@@ -4,9 +4,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.Localization;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Net;
 using Microsoft.AspNetCore.Http;
@@ -48,13 +50,22 @@ namespace Emby.Server.Implementations.HttpServer
 
                 WebSocket webSocket = await context.WebSockets.AcceptWebSocketAsync().ConfigureAwait(false);
 
+                // Capture the culture context set by AcceptLanguageMiddleware 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())
                 {
-                    OnReceive = ProcessWebSocketMessageReceived
+                    RequestCultureFallback = LocalizationManager.RequestCultureFallback,
+                    RequestUICulture = CultureInfo.CurrentUICulture.Name
+                };
+                connection.OnReceive = result =>
+                {
+                    connection.ApplyRequestCulture();
+                    return ProcessWebSocketMessageReceived(result);
                 };
                 await using (connection.ConfigureAwait(false))
                 {

Emby.Server.Implementations/Localization/Core/en-US.json

@@ -1,45 +1,29 @@
 {
-    "Albums": "Albums",
     "AppDeviceValues": "App: {0}, Device: {1}",
-    "Application": "Application",
     "Artists": "Artists",
     "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
     "Books": "Books",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-    "Channels": "Channels",
     "ChapterNameValue": "Chapter {0}",
     "Collections": "Collections",
     "Default": "Default",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "DeviceOnlineWithName": "{0} is connected",
     "External": "External",
     "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
     "Favorites": "Favorites",
     "Folders": "Folders",
     "Forced": "Forced",
     "Genres": "Genres",
-    "HeaderAlbumArtists": "Album artists",
     "HeaderContinueWatching": "Continue Watching",
-    "HeaderFavoriteAlbums": "Favorite Albums",
-    "HeaderFavoriteArtists": "Favorite Artists",
     "HeaderFavoriteEpisodes": "Favorite Episodes",
     "HeaderFavoriteShows": "Favorite Shows",
-    "HeaderFavoriteSongs": "Favorite Songs",
     "HeaderLiveTV": "Live TV",
     "HeaderNextUp": "Next Up",
-    "HeaderRecordingGroups": "Recording Groups",
     "HearingImpaired": "Hearing Impaired",
     "HomeVideos": "Home Videos",
     "Inherit": "Inherit",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
     "LabelIpAddressValue": "IP address: {0}",
     "LabelRunningTimeValue": "Running time: {0}",
     "Latest": "Latest",
-    "MessageApplicationUpdated": "Jellyfin Server has been updated",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
+    "LyricDownloadFailureFromForItem": "Lyrics failed to download from {0} for {1}",
     "MixedContent": "Mixed content",
     "Movies": "Movies",
     "Music": "Music",
@@ -66,24 +50,15 @@
     "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
     "Original": "Original",
     "Photos": "Photos",
-    "Playlists": "Playlists",
-    "Plugin": "Plugin",
     "PluginInstalledWithName": "{0} was installed",
     "PluginUninstalledWithName": "{0} was uninstalled",
     "PluginUpdatedWithName": "{0} was updated",
-    "ProviderValue": "Provider: {0}",
     "ScheduledTaskFailedWithName": "{0} failed",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
     "Shows": "Shows",
-    "Songs": "Songs",
     "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
     "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-    "Sync": "Sync",
-    "System": "System",
     "TvShows": "TV Shows",
     "Undefined": "Undefined",
-    "User": "User",
     "UserCreatedWithName": "User {0} has been created",
     "UserDeletedWithName": "User {0} has been deleted",
     "UserDownloadingItemWithValues": "{0} is downloading {1}",
@@ -91,11 +66,8 @@
     "UserOfflineFromDevice": "{0} has disconnected from {1}",
     "UserOnlineFromDevice": "{0} is online from {1}",
     "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
     "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
     "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-    "ValueSpecialEpisodeName": "Special - {0}",
     "VersionNumber": "Version {0}",
     "TasksMaintenanceCategory": "Maintenance",
     "TasksLibraryCategory": "Library",
@@ -121,8 +93,8 @@
     "TaskUpdatePluginsDescription": "Downloads and installs updates for plugins that are configured to update automatically.",
     "TaskCleanTranscode": "Clean Transcode Directory",
     "TaskCleanTranscodeDescription": "Deletes transcode files more than one day old.",
-    "TaskRefreshChannels": "Refresh Channels",
-    "TaskRefreshChannelsDescription": "Refreshes internet channel information.",
+    "TasksRefreshChannels": "Refresh Channels",
+    "TasksRefreshChannelsDescription": "Refreshes internet channel information.",
     "TaskDownloadMissingLyrics": "Download missing lyrics",
     "TaskDownloadMissingLyricsDescription": "Downloads lyrics for songs",
     "TaskDownloadMissingSubtitles": "Download missing subtitles",

Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -3,10 +3,12 @@ using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Extensions;
 using Jellyfin.Extensions.Json;
@@ -26,21 +28,36 @@ namespace Emby.Server.Implementations.Localization
         private const string RatingsPath = "Emby.Server.Implementations.Localization.Ratings.";
         private const string CulturesPath = "Emby.Server.Implementations.Localization.iso6392.txt";
         private const string CountriesPath = "Emby.Server.Implementations.Localization.countries.json";
+        private const string CoreResourcePrefix = "Emby.Server.Implementations.Localization.Core.";
         private static readonly Assembly _assembly = typeof(LocalizationManager).Assembly;
         private static readonly string[] _unratedValues = ["n/a", "unrated", "not rated", "nr"];
 
+        /// <summary>
+        /// Gets the mapping from BCP-47 hyphenated culture codes to Jellyfin's underscore-based codes.
+        /// </summary>
+        public static readonly FrozenDictionary<string, string> Bcp47ToJellyfinMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["es-419"] = "es_419",
+            ["es-DO"] = "es_DO",
+            ["ur-PK"] = "ur_PK"
+        }.ToFrozenDictionary(StringComparer.OrdinalIgnoreCase);
+
         private readonly IServerConfigurationManager _configurationManager;
         private readonly ILogger<LocalizationManager> _logger;
 
         private readonly Dictionary<string, Dictionary<string, ParentalRatingScore?>> _allParentalRatings = new(StringComparer.OrdinalIgnoreCase);
 
-        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries = new(StringComparer.OrdinalIgnoreCase);
+        private static readonly AsyncLocal<IReadOnlyList<string>?> _requestCultureFallback = new();
+
+        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _cultureOnlyDictionaries = new(StringComparer.OrdinalIgnoreCase);
 
         private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
 
         private readonly ConcurrentDictionary<string, CultureDto?> _cultureCache = new(StringComparer.OrdinalIgnoreCase);
         private List<CultureDto> _cultures = [];
 
+        private static readonly IReadOnlyList<LocalizationOption> _localizationOptions = BuildLocalizationOptions();
+
         private FrozenDictionary<string, string> _iso6392BtoT = null!;
 
         /// <summary>
@@ -54,6 +71,41 @@ namespace Emby.Server.Implementations.Localization
         {
             _configurationManager = configurationManager;
             _logger = logger;
+
+            _configurationManager.ConfigurationUpdated += OnConfigurationUpdated;
+        }
+
+        /// <summary>
+        /// Gets or sets the per-request culture fallback chain resolved from Accept-Language.
+        /// Each entry is a Jellyfin culture code (e.g. "de", "nl", "en-US") in priority order.
+        /// </summary>
+        public static IReadOnlyList<string>? RequestCultureFallback
+        {
+            get => _requestCultureFallback.Value;
+            set => _requestCultureFallback.Value = value;
+        }
+
+        /// <summary>
+        /// Checks whether a translation resource file exists for the given culture code.
+        /// </summary>
+        /// <param name="culture">The culture code to check (e.g. "de", "pt-BR", "es_419").</param>
+        /// <returns><c>true</c> if an embedded translation resource exists for the culture.</returns>
+        public static bool HasTranslation(string culture)
+        {
+            var resourceName = CoreResourcePrefix + GetResourceFilename(culture);
+            return _assembly.GetManifestResourceInfo(resourceName) is not null;
+        }
+
+        private static void OnConfigurationUpdated(object? sender, EventArgs e)
+        {
+            if (sender is IServerConfigurationManager configManager)
+            {
+                var uiCulture = configManager.Configuration.UICulture;
+                if (!string.IsNullOrEmpty(uiCulture))
+                {
+                    CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(uiCulture);
+                }
+            }
         }
 
         /// <summary>
@@ -419,6 +471,27 @@ namespace Emby.Server.Implementations.Localization
 
         /// <inheritdoc />
         public string GetLocalizedString(string phrase)
+        {
+            var fallback = _requestCultureFallback.Value;
+            if (fallback is not null)
+            {
+                foreach (var culture in fallback)
+                {
+                    var dict = GetLocalizationDictionary(culture);
+                    if (dict.TryGetValue(phrase, out var value))
+                    {
+                        return value;
+                    }
+                }
+
+                return phrase;
+            }
+
+            return GetLocalizedString(phrase, CultureInfo.CurrentUICulture.Name);
+        }
+
+        /// <inheritdoc />
+        public string GetServerLocalizedString(string phrase)
         {
             return GetLocalizedString(phrase, _configurationManager.Configuration.UICulture);
         }
@@ -436,6 +509,12 @@ namespace Emby.Server.Implementations.Localization
                 culture = DefaultCulture;
             }
 
+            // Normalize BCP-47 hyphenated codes to Jellyfin's underscore-based codes
+            if (Bcp47ToJellyfinMap.TryGetValue(culture, out var mapped))
+            {
+                culture = mapped;
+            }
+
             var dictionary = GetLocalizationDictionary(culture);
 
             if (dictionary.TryGetValue(phrase, out var value))
@@ -443,6 +522,15 @@ namespace Emby.Server.Implementations.Localization
                 return value;
             }
 
+            if (!string.Equals(culture, DefaultCulture, StringComparison.OrdinalIgnoreCase))
+            {
+                var fallback = GetLocalizationDictionary(DefaultCulture);
+                if (fallback.TryGetValue(phrase, out var fallbackValue))
+                {
+                    return fallbackValue;
+                }
+            }
+
             return phrase;
         }
 
@@ -450,28 +538,19 @@ namespace Emby.Server.Implementations.Localization
         {
             ArgumentException.ThrowIfNullOrEmpty(culture);
 
-            const string Prefix = "Core";
-
-            return _dictionaries.GetOrAdd(
+            return _cultureOnlyDictionaries.GetOrAdd(
                 culture,
-                static (key, localizationManager) => localizationManager.GetDictionary(Prefix, key, DefaultCulture + ".json").GetAwaiter().GetResult(),
+                static (key, localizationManager) =>
+                {
+                    var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                    var namespaceName = localizationManager.GetType().Namespace + ".Core";
+                    localizationManager.CopyInto(dictionary, namespaceName + "." + GetResourceFilename(key)).GetAwaiter().GetResult();
+
+                    return dictionary;
+                },
                 this);
         }
 
-        private async Task<Dictionary<string, string>> GetDictionary(string prefix, string culture, string baseFilename)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(culture);
-
-            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            var namespaceName = GetType().Namespace + "." + prefix;
-
-            await CopyInto(dictionary, namespaceName + "." + baseFilename).ConfigureAwait(false);
-            await CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture)).ConfigureAwait(false);
-
-            return dictionary;
-        }
-
         private async Task CopyInto(IDictionary<string, string> dictionary, string resourcePath)
         {
             using var stream = _assembly.GetManifestResourceStream(resourcePath);
@@ -508,77 +587,68 @@ namespace Emby.Server.Implementations.Localization
         /// <inheritdoc />
         public IEnumerable<LocalizationOption> GetLocalizationOptions()
         {
-            yield return new LocalizationOption("Afrikaans", "af");
-            yield return new LocalizationOption("العربية", "ar");
-            yield return new LocalizationOption("Беларуская", "be");
-            yield return new LocalizationOption("Български", "bg-BG");
-            yield return new LocalizationOption("বাংলা (বাংলাদেশ)", "bn");
-            yield return new LocalizationOption("Català", "ca");
-            yield return new LocalizationOption("Čeština", "cs");
-            yield return new LocalizationOption("Cymraeg", "cy");
-            yield return new LocalizationOption("Dansk", "da");
-            yield return new LocalizationOption("Deutsch", "de");
-            yield return new LocalizationOption("English (United Kingdom)", "en-GB");
-            yield return new LocalizationOption("English", "en-US");
-            yield return new LocalizationOption("Ελληνικά", "el");
-            yield return new LocalizationOption("Esperanto", "eo");
-            yield return new LocalizationOption("Español", "es");
-            yield return new LocalizationOption("Español americano", "es_419");
-            yield return new LocalizationOption("Español (Argentina)", "es-AR");
-            yield return new LocalizationOption("Español (Dominicana)", "es_DO");
-            yield return new LocalizationOption("Español (México)", "es-MX");
-            yield return new LocalizationOption("Eesti", "et");
-            yield return new LocalizationOption("Basque", "eu");
-            yield return new LocalizationOption("فارسی", "fa");
-            yield return new LocalizationOption("Suomi", "fi");
-            yield return new LocalizationOption("Filipino", "fil");
-            yield return new LocalizationOption("Français", "fr");
-            yield return new LocalizationOption("Français (Canada)", "fr-CA");
-            yield return new LocalizationOption("Galego", "gl");
-            yield return new LocalizationOption("Schwiizerdütsch", "gsw");
-            yield return new LocalizationOption("עִבְרִית", "he");
-            yield return new LocalizationOption("हिन्दी", "hi");
-            yield return new LocalizationOption("Hrvatski", "hr");
-            yield return new LocalizationOption("Magyar", "hu");
-            yield return new LocalizationOption("Bahasa Indonesia", "id");
-            yield return new LocalizationOption("Íslenska", "is");
-            yield return new LocalizationOption("Italiano", "it");
-            yield return new LocalizationOption("日本語", "ja");
-            yield return new LocalizationOption("Qazaqşa", "kk");
-            yield return new LocalizationOption("한국어", "ko");
-            yield return new LocalizationOption("Lietuvių", "lt");
-            yield return new LocalizationOption("Latviešu", "lv");
-            yield return new LocalizationOption("Македонски", "mk");
-            yield return new LocalizationOption("മലയാളം", "ml");
-            yield return new LocalizationOption("मराठी", "mr");
-            yield return new LocalizationOption("Bahasa Melayu", "ms");
-            yield return new LocalizationOption("Norsk bokmål", "nb");
-            yield return new LocalizationOption("नेपाली", "ne");
-            yield return new LocalizationOption("Nederlands", "nl");
-            yield return new LocalizationOption("Norsk nynorsk", "nn");
-            yield return new LocalizationOption("ਪੰਜਾਬੀ", "pa");
-            yield return new LocalizationOption("Polski", "pl");
-            yield return new LocalizationOption("Pirate", "pr");
-            yield return new LocalizationOption("Português", "pt");
-            yield return new LocalizationOption("Português (Brasil)", "pt-BR");
-            yield return new LocalizationOption("Português (Portugal)", "pt-PT");
-            yield return new LocalizationOption("Românește", "ro");
-            yield return new LocalizationOption("Русский", "ru");
-            yield return new LocalizationOption("Slovenčina", "sk");
-            yield return new LocalizationOption("Slovenščina", "sl-SI");
-            yield return new LocalizationOption("Shqip", "sq");
-            yield return new LocalizationOption("Српски", "sr");
-            yield return new LocalizationOption("Svenska", "sv");
-            yield return new LocalizationOption("தமிழ்", "ta");
-            yield return new LocalizationOption("తెలుగు", "te");
-            yield return new LocalizationOption("ภาษาไทย", "th");
-            yield return new LocalizationOption("Türkçe", "tr");
-            yield return new LocalizationOption("Українська", "uk");
-            yield return new LocalizationOption("اُردُو", "ur_PK");
-            yield return new LocalizationOption("Tiếng Việt", "vi");
-            yield return new LocalizationOption("汉语 (简体字)", "zh-CN");
-            yield return new LocalizationOption("漢語 (繁體字)", "zh-TW");
-            yield return new LocalizationOption("廣東話 (香港)", "zh-HK");
+            return _localizationOptions;
+        }
+
+        private static IReadOnlyList<LocalizationOption> BuildLocalizationOptions()
+        {
+            var options = new List<LocalizationOption>();
+            var prefix = CoreResourcePrefix;
+
+            foreach (var resource in _assembly.GetManifestResourceNames())
+            {
+                if (!resource.StartsWith(prefix, StringComparison.Ordinal)
+                    || !resource.EndsWith(".json", StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                // Extract culture code from resource name: "...Core.de.json" -> "de", "...Core.pt-BR.json" -> "pt-BR"
+                var code = resource[prefix.Length..^5];
+
+                // Skip the base language file — en-US is added explicitly below
+                if (code.Equals(DefaultCulture, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                var displayName = GetDisplayName(code);
+                options.Add(new LocalizationOption(displayName, code));
+            }
+
+            // Ensure en-US is always present
+            options.Add(new LocalizationOption("English", DefaultCulture));
+
+            options.Sort((a, b) => string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+            return options;
+        }
+
+        private static string GetDisplayName(string cultureCode)
+        {
+            // Handle Jellyfin-specific codes that aren't valid CultureInfo names
+            if (Bcp47ToJellyfinMap.Values.Contains(cultureCode))
+            {
+                // Convert underscore to hyphen for CultureInfo lookup
+                var normalized = cultureCode.Replace('_', '-');
+                try
+                {
+                    return CultureInfo.GetCultureInfo(normalized).NativeName;
+                }
+                catch (CultureNotFoundException)
+                {
+                    return cultureCode;
+                }
+            }
+
+            try
+            {
+                return CultureInfo.GetCultureInfo(cultureCode).NativeName;
+            }
+            catch (CultureNotFoundException)
+            {
+                // Custom/novelty codes like "pr" (Pirate) — fall back to code itself
+                return cultureCode;
+            }
         }
 
         /// <inheritdoc />