Merge pull request #17160 from 854562/truncate-language-strings

Truncate ISO-639-2 language display names at first delimiter

1 files changed, 8 insertions, 6 deletions

diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 203e565ac7..989701350c 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -732,9 +732,10 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.LocalizedDefault = _localization.GetLocalizedString("Default");
                 stream.LocalizedExternal = _localization.GetLocalizedString("External");
                 stream.LocalizedOriginal = _localization.GetLocalizedString("Original");
-                stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language)
-                    ? null
-                    : _localization.FindLanguageInfo(stream.Language)?.DisplayName;
+                if (!string.IsNullOrEmpty(stream.Language))
+                {
+                    stream.LocalizedLanguage = _localization.GetLanguageDisplayName(stream.Language);
+                }
 
                 stream.Channels = streamInfo.Channels;
 
@@ -773,9 +774,10 @@ namespace MediaBrowser.MediaEncoding.Probing
                 stream.LocalizedForced = _localization.GetLocalizedString("Forced");
                 stream.LocalizedExternal = _localization.GetLocalizedString("External");
                 stream.LocalizedHearingImpaired = _localization.GetLocalizedString("HearingImpaired");
-                stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language)
-                    ? null
-                    : _localization.FindLanguageInfo(stream.Language)?.DisplayName;
+                if (!string.IsNullOrEmpty(stream.Language))
+                {
+                    stream.LocalizedLanguage = _localization.GetLanguageDisplayName(stream.Language);
+                }
 
                 if (string.IsNullOrEmpty(stream.Title))
                 {