update translations

3 files changed, 41 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index bd407f91b..0900cc1ef 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -79,16 +79,32 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
+                var list = AlbumArtists;
+
+                list.AddRange(Artists);
+
+                return list;
+
+            }
+        }
+
+        [IgnoreDataMember]
+        public List<string> AlbumArtists
+        {
+            get
+            {
                 var list = new List<string>();
 
                 if (!string.IsNullOrEmpty(AlbumArtist))
                 {
                     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 08eaf903e..ca079c3bf 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 277ec8b78..a4d9278e5 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -36,16 +36,33 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
+                var list = AlbumArtists;
+
+                list.AddRange(Artists);
+
+                return list;
+
+            }
+        }
+
+        [IgnoreDataMember]
+        public List<string> AlbumArtists
+        {
+            get
+            {
                 var list = new List<string>();
 
                 if (!string.IsNullOrEmpty(AlbumArtist))
                 {
                     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();