diff options
| -rw-r--r-- | Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs index 7fa33c8639..b3c7fe131e 100644 --- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs +++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs @@ -173,7 +173,10 @@ public class MediaStreamRepository : IMediaStreamRepository if (!string.IsNullOrEmpty(dto.Language)) { var culture = _localization.FindLanguageInfo(dto.Language); - dto.LocalizedLanguage = culture?.DisplayName; + // Truncate at the first delimiter to avoid cluttered display names + dto.LocalizedLanguage = culture?.DisplayName is { } name + ? name.Split(';', ',')[0].Trim() + : null; } if (dto.Type is MediaStreamType.Audio) diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 06060988e2..98bdce0e9c 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -732,7 +732,9 @@ namespace MediaBrowser.MediaEncoding.Probing stream.LocalizedOriginal = _localization.GetLocalizedString("Original"); stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language) ? null - : _localization.FindLanguageInfo(stream.Language)?.DisplayName; + : _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name + ? name.Split(';', ',')[0].Trim() + : null; stream.Channels = streamInfo.Channels; @@ -773,7 +775,9 @@ namespace MediaBrowser.MediaEncoding.Probing stream.LocalizedHearingImpaired = _localization.GetLocalizedString("HearingImpaired"); stream.LocalizedLanguage = string.IsNullOrEmpty(stream.Language) ? null - : _localization.FindLanguageInfo(stream.Language)?.DisplayName; + : _localization.FindLanguageInfo(stream.Language)?.DisplayName is { } name + ? name.Split(';', ',')[0].Trim() + : null; if (string.IsNullOrEmpty(stream.Title)) { |