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 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Emby.Server.Implementations/Library/MediaSourceManager.cs') 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) -- cgit v1.2.3