lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port changes from #2773

Browse Source
This commit is contained in:
Pika 2020-04-08 18:40:38 -04:00
parent 1cf31229d8
commit d85ca5276b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -85,7 +85,12 @@ namespace MediaBrowser.Model.Entities
if (!string.IsNullOrEmpty(Language)) if (!string.IsNullOrEmpty(Language))
{ {
attributes.Add(StringHelper.FirstToUpper(Language)); // Get full language string i.e. eng -> English. Will not work for some languages which use ISO 639-2/B instead of /T codes.
string fullLanguage = CultureInfo
.GetCultures(CultureTypes.NeutralCultures)
.FirstOrDefault(r => r.ThreeLetterISOLanguageName.Equals(Language, StringComparison.OrdinalIgnoreCase))
?.DisplayName;
attributes.Add(StringHelper.FirstToUpper(fullLanguage ?? Language));
} }
if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase)) if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
@ -99,7 +104,7 @@ namespace MediaBrowser.Model.Entities
if (!string.IsNullOrEmpty(ChannelLayout)) if (!string.IsNullOrEmpty(ChannelLayout))
{ {
attributes.Add(ChannelLayout); attributes.Add(StringHelper.FirstToUpper(ChannelLayout));
} }
else if (Channels.HasValue) else if (Channels.HasValue)
{ {
@ -121,7 +126,7 @@ namespace MediaBrowser.Model.Entities
.ToString(); .ToString();
} }
return string.Join(" ", attributes); return string.Join(" - ", attributes);
} }
case MediaStreamType.Video: case MediaStreamType.Video: