alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 18:14:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update translations

Browse Source
This commit is contained in:
Luke Pulverenti
2014-06-23 12:05:19 -04:00
parent eba1845f2a
commit 0727475abf
105 changed files with 1699 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
View File

@@ -25,6 +25,8 @@ namespace MediaBrowser.Controller.Channels
public float? VideoLevel { get; set; }
public float? Framerate { get; set; }
public bool? IsAnamorphic { get; set; }
public MediaProtocol Protocol { get; set; }
public ChannelMediaInfo()

24
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@@ -76,6 +76,20 @@ namespace MediaBrowser.Controller.Entities.Audio
[IgnoreDataMember]
public List<string> AllArtists
{
get
{
var list = AlbumArtists;
list.AddRange(Artists);
return list;
}
}
[IgnoreDataMember]
public List<string> AlbumArtists
{
get
{
@@ -85,10 +99,12 @@ namespace MediaBrowser.Controller.Entities.Audio
{
list.Add(AlbumArtist);
}
list.AddRange(Artists);
return list;
}
set
{
AlbumArtist = value.FirstOrDefault();
}
}
@@ -132,7 +148,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <returns><c>true</c> if the specified name has artist; otherwise, <c>false</c>.</returns>
public bool HasArtist(string name)
{
return Artists.Contains(name, StringComparer.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase);
return AllArtists.Contains(name, StringComparer.OrdinalIgnoreCase);
}
/// <summary>
@@ -168,7 +184,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
var info = GetItemLookupInfo<SongInfo>();
info.AlbumArtist = AlbumArtist;
info.AlbumArtists = AlbumArtists;
info.Album = Album;
info.Artists = Artists;

2
MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
View File

@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
public interface IHasAlbumArtist
{
string AlbumArtist { get; set; }
List<string> AlbumArtists { get; set; }
}
public interface IHasArtist

24
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@@ -33,6 +33,20 @@ namespace MediaBrowser.Controller.Entities.Audio
[IgnoreDataMember]
public List<string> AllArtists
{
get
{
var list = AlbumArtists;
list.AddRange(Artists);
return list;
}
}
[IgnoreDataMember]
public List<string> AlbumArtists
{
get
{
@@ -42,10 +56,13 @@ namespace MediaBrowser.Controller.Entities.Audio
{
list.Add(AlbumArtist);
}
list.AddRange(Artists);
return list;
}
set
{
AlbumArtist = value.FirstOrDefault();
}
}
/// <summary>
@@ -104,8 +121,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <returns><c>true</c> if the specified artist has artist; otherwise, <c>false</c>.</returns>
public bool HasArtist(string artist)
{
return string.Equals(AlbumArtist, artist, StringComparison.OrdinalIgnoreCase)
|| Artists.Contains(artist, StringComparer.OrdinalIgnoreCase);
return AllArtists.Contains(artist, StringComparer.OrdinalIgnoreCase);
}
public string AlbumArtist { get; set; }
@@ -144,7 +160,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
var id = GetItemLookupInfo<AlbumInfo>();
id.AlbumArtist = AlbumArtist;
id.AlbumArtists = AlbumArtists;
var artist = Parents.OfType<MusicArtist>().FirstOrDefault();

11
MediaBrowser.Controller/Providers/ItemLookupInfo.cs
View File

@@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Providers
/// Gets or sets the album artist.
/// </summary>
/// <value>The album artist.</value>
public string AlbumArtist { get; set; }
public List<string> AlbumArtists { get; set; }
/// <summary>
/// Gets or sets the artist provider ids.
@@ -78,6 +78,7 @@ namespace MediaBrowser.Controller.Providers
{
ArtistProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
SongInfos = new List<SongInfo>();
AlbumArtists = new List<string>();
}
}
@@ -137,9 +138,15 @@ namespace MediaBrowser.Controller.Providers
public class SongInfo : ItemLookupInfo
{
public string AlbumArtist { get; set; }
public List<string> AlbumArtists { get; set; }
public string Album { get; set; }
public List<string> Artists { get; set; }
public SongInfo()
{
Artists = new List<string>();
AlbumArtists = new List<string>();
}
}
public class SeriesInfo : ItemLookupInfo, IHasIdentities<SeriesIdentity>