unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Re-apply HA fork patches on upstream v12.0 #3

Merged
benvin merged 2139 commits from benvin/rebase-v12 into main 2026-09-12 12:48:36 +10:00
Conversation 1 Commits 2139 Files Changed 1122
+10 -3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 94d5326411 - Show all commits
Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+4 -1
View File
@@ -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)
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+6 -2
View File
@@ -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))
{