From 0727475abfff42e32626d2def071a189168e7da1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 23 Jun 2014 12:05:19 -0400
Subject: update translations

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    | 24 ++++++++++++++++++----
 .../Entities/Audio/IHasAlbumArtist.cs              |  2 +-
 .../Entities/Audio/MusicAlbum.cs                   | 24 ++++++++++++++++++----
 3 files changed, 41 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Controller/Entities')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index bd407f91b1..0900cc1eff 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -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;
 
diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
index 08eaf903e2..ca079c3bfe 100644
--- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities.Audio
 {
     public interface IHasAlbumArtist
     {
-        string AlbumArtist { get; set; }
+        List<string> AlbumArtists { get; set; }
     }
 
     public interface IHasArtist
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 277ec8b782..a4d9278e53 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -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();
 
-- 
cgit v1.2.3