From a2ca4a7b84e89957547a9fb04a190b139c86e72f Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Fri, 20 Nov 2026 07:25:01 -0500 Subject: Backport pull request #18072 from jellyfin/release-12.z Keep language variants distinguishable Original-merge: 060233101dc336560b2f97d251fe7a9f8241b763 Merged-by: crobibero Backported-by: Cody Robibero --- Emby.Server.Implementations/Library/MediaSourceManager.cs | 8 +------- Emby.Server.Implementations/Library/MediaStreamSelector.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'Emby.Server.Implementations/Library') diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs index e9bba05839..4513cefde8 100644 --- a/Emby.Server.Implementations/Library/MediaSourceManager.cs +++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs @@ -481,13 +481,7 @@ namespace Emby.Server.Implementations.Library return []; } - var culture = _localizationManager.FindLanguageInfo(language); - if (culture is not null) - { - return culture.Name.Contains('-', StringComparison.OrdinalIgnoreCase) ? [culture.Name] : culture.ThreeLetterISOLanguageNames; - } - - return [language]; + return _localizationManager.GetMediaStreamLanguageCodes(language); } private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection) diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs index 631179ffcf..31e36af3b8 100644 --- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs +++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs @@ -46,6 +46,7 @@ namespace Emby.Server.Implementations.Library .ThenByDescending(x => x.IsDefault) .ThenByDescending(x => !x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages)) .ThenByDescending(x => x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages)) + .ThenBy(x => GetLanguageRank(x.Language, preferredLanguages)) .ThenByDescending(x => x.IsForced && IsLanguageUndefined(x.Language)) .ThenByDescending(x => x.IsForced) .ToList(); @@ -158,6 +159,13 @@ namespace Emby.Server.Implementations.Library preferredLanguages.Contains(language, StringComparison.OrdinalIgnoreCase); } + // Earlier preferences win among matches: a pt-br preference lists [pt-br, por] and must pick the pt-br track. + private static int GetLanguageRank(string language, IReadOnlyList preferredLanguages) + { + var index = preferredLanguages.FindIndex(x => string.Equals(x, language, StringComparison.OrdinalIgnoreCase)); + return index == -1 ? int.MaxValue : index; + } + private static bool IsLanguageUndefined(string language) { // Check for null, empty, or known placeholders -- cgit v1.2.3