From 0727475abfff42e32626d2def071a189168e7da1 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 23 Jun 2014 12:05:19 -0400 Subject: update translations --- .../Channels/ChannelManager.cs | 6 ++ .../Collections/ManualCollectionsFolder.cs | 9 ++- .../Dto/DtoService.cs | 2 +- .../Library/LibraryManager.cs | 13 +--- .../LiveTv/LiveTvManager.cs | 28 +++++-- .../Localization/JavaScript/ar.json | 18 +++-- .../Localization/JavaScript/ca.json | 18 +++-- .../Localization/JavaScript/cs.json | 18 +++-- .../Localization/JavaScript/da.json | 18 +++-- .../Localization/JavaScript/de.json | 18 +++-- .../Localization/JavaScript/el.json | 18 +++-- .../Localization/JavaScript/en_GB.json | 18 +++-- .../Localization/JavaScript/en_US.json | 18 +++-- .../Localization/JavaScript/es.json | 16 +++- .../Localization/JavaScript/es_MX.json | 26 ++++--- .../Localization/JavaScript/fr.json | 18 +++-- .../Localization/JavaScript/he.json | 18 +++-- .../Localization/JavaScript/it.json | 84 +++++++++++--------- .../Localization/JavaScript/javascript.json | 7 +- .../Localization/JavaScript/kk.json | 28 ++++--- .../Localization/JavaScript/ms.json | 18 +++-- .../Localization/JavaScript/nb.json | 18 +++-- .../Localization/JavaScript/nl.json | 22 ++++-- .../Localization/JavaScript/pt_BR.json | 26 ++++--- .../Localization/JavaScript/pt_PT.json | 18 +++-- .../Localization/JavaScript/ru.json | 28 ++++--- .../Localization/JavaScript/sv.json | 24 ++++-- .../Localization/JavaScript/vi.json | 18 +++-- .../Localization/JavaScript/zh_TW.json | 18 +++-- .../Localization/Server/ar.json | 49 ++++++++++-- .../Localization/Server/ca.json | 49 ++++++++++-- .../Localization/Server/cs.json | 49 ++++++++++-- .../Localization/Server/da.json | 49 ++++++++++-- .../Localization/Server/de.json | 49 ++++++++++-- .../Localization/Server/el.json | 49 ++++++++++-- .../Localization/Server/en_GB.json | 49 ++++++++++-- .../Localization/Server/en_US.json | 49 ++++++++++-- .../Localization/Server/es.json | 49 ++++++++++-- .../Localization/Server/es_MX.json | 49 ++++++++++-- .../Localization/Server/fr.json | 49 ++++++++++-- .../Localization/Server/he.json | 49 ++++++++++-- .../Localization/Server/it.json | 49 ++++++++++-- .../Localization/Server/kk.json | 57 +++++++++++--- .../Localization/Server/ms.json | 49 ++++++++++-- .../Localization/Server/nb.json | 49 ++++++++++-- .../Localization/Server/nl.json | 49 ++++++++++-- .../Localization/Server/pt_BR.json | 89 +++++++++++++++------- .../Localization/Server/pt_PT.json | 49 ++++++++++-- .../Localization/Server/ru.json | 69 ++++++++++++----- .../Localization/Server/server.json | 8 +- .../Localization/Server/sv.json | 49 ++++++++++-- .../Localization/Server/vi.json | 49 ++++++++++-- .../Localization/Server/zh_TW.json | 49 ++++++++++-- .../Sorting/AlbumArtistComparer.cs | 5 +- 54 files changed, 1380 insertions(+), 417 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs index 98e7593cf..188a26c60 100644 --- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs +++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs @@ -119,6 +119,12 @@ namespace MediaBrowser.Server.Implementations.Channels channels = channels.Where(i => (GetChannelProvider(i) is ISupportsLatestMedia) == val) .ToList(); } + if (query.IsFavorite.HasValue) + { + var val = query.IsFavorite.Value; + channels = channels.Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite == val) + .ToList(); + } if (user != null) { diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs index 94bbc08da..c58b9181b 100644 --- a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs +++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs @@ -1,5 +1,5 @@ -using System.Linq; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; +using System.Linq; namespace MediaBrowser.Server.Implementations.Collections { @@ -32,5 +32,10 @@ namespace MediaBrowser.Server.Implementations.Collections { get { return Model.Entities.CollectionType.BoxSets; } } + + public override string GetClientTypeName() + { + return typeof (CollectionFolder).Name; + } } } \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index c7c93057d..348d3cb26 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -932,7 +932,7 @@ namespace MediaBrowser.Server.Implementations.Dto if (hasAlbumArtist != null) { - dto.AlbumArtist = hasAlbumArtist.AlbumArtist; + dto.AlbumArtist = hasAlbumArtist.AlbumArtists.FirstOrDefault(); } // Add video info diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 521a6f843..64e0a6662 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1480,18 +1480,7 @@ namespace MediaBrowser.Server.Implementations.Library { return items .OfType