diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js index 4a4401a789..f62f2addfa 100644 --- a/dashboard-ui/scripts/scheduledtaskpage.js +++ b/dashboard-ui/scripts/scheduledtaskpage.js @@ -41,7 +41,9 @@ html += ScheduledTaskPage.getTriggerFriendlyName(trigger); html += ''; - html += 'Delete'; + html += ''; + html += Globalize.translate('Delete'); + html += ''; html += ''; } diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js index 5f41be4513..5de6c22dcb 100644 --- a/dashboard-ui/scripts/scheduledtaskspage.js +++ b/dashboard-ui/scripts/scheduledtaskspage.js @@ -53,15 +53,15 @@ if (task.State == "Idle") { - html += "Start"; + html += "" + Globalize.translate('ButtonStart') + ""; } else if (task.State == "Running") { - html += "Stop"; + html += "" + Globalize.translate('ButtonStop') + ""; } else { - html += ""; + html += ""; } html += ""; @@ -143,19 +143,19 @@ if (state == "Idle") { - elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').show().data("icon", "play").attr("title", "Start"); + elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').show().data("icon", "play").attr("title", Globalize.translate('ButtonStart')); elem.removeClass('ui-icon-stop').addClass('ui-icon-play'); } else if (state == "Running") { - elem = btnTask.addClass('btnStopTask').removeClass('btnStartTask').show().data("icon", "stop").attr("title", "Stop"); + elem = btnTask.addClass('btnStopTask').removeClass('btnStartTask').show().data("icon", "stop").attr("title", Globalize.translate('ButtonStop')); elem.removeClass('ui-icon-play').addClass('ui-icon-stop'); } else { - elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').hide().data("icon", "play").attr("title", "Start"); + elem = btnTask.addClass('btnStartTask').removeClass('btnStopTask').hide().data("icon", "play").attr("title", Globalize.translate('ButtonStart')); elem.removeClass('ui-icon-stop').addClass('ui-icon-play'); } diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js index f5f31631e4..39ab2b014d 100644 --- a/dashboard-ui/scripts/userparentalcontrol.js +++ b/dashboard-ui/scripts/userparentalcontrol.js @@ -44,7 +44,7 @@ html += '
'; - html += 'Media Folders'; + html += '' + Globalize.translate('HeaderMediaFolders') + ''; for (var i = 0, length = mediaFolders.length; i < length; i++) { @@ -69,7 +69,7 @@ html += '
'; - html += 'Channels'; + html += '' + Globalize.translate('HeaderChannels') + ''; for (var i = 0, length = channels.length; i < length; i++) { @@ -97,23 +97,23 @@ function loadUnratedItems(page, user) { var items = [ - { name: 'Books', value: 'Book' }, - { name: 'Games', value: 'Game' }, - { name: 'Internet Channel Content', value: 'ChannelContent' }, - { name: 'Live TV Channels', value: 'LiveTvChannel' }, - { name: 'Live TV Programs', value: 'LiveTvProgram' }, - { name: 'Movies', value: 'Movie' }, - { name: 'Music', value: 'Music' }, - { name: 'Trailers', value: 'Trailer' }, - { name: 'TV Shows', value: 'Series' }, - { name: 'Others', value: 'Other' } + { name: Globalize.translate('OptionBlockBooks'), value: 'Book' }, + { name: Globalize.translate('OptionBlockGames'), value: 'Game' }, + { name: Globalize.translate('OptionBlockChannelContent'), value: 'ChannelContent' }, + { name: Globalize.translate('OptionBlockLiveTvChannels'), value: 'LiveTvChannel' }, + { name: Globalize.translate('OptionBlockLiveTvPrograms'), value: 'LiveTvProgram' }, + { name: Globalize.translate('OptionBlockMovies'), value: 'Movie' }, + { name: Globalize.translate('OptionBlockMusic'), value: 'Music' }, + { name: Globalize.translate('OptionBlockTrailers'), value: 'Trailer' }, + { name: Globalize.translate('OptionBlockTvShows'), value: 'Series' }, + { name: Globalize.translate('OptionBlockOthers'), value: 'Other' } ]; var html = ''; html += '
'; - html += 'Block items with no rating information:'; + html += '' + Globalize.translate('HeaderBlockItemsWithNoRating') + ''; for (var i = 0, length = items.length; i < length; i++) { @@ -242,7 +242,7 @@ var promise3 = ApiClient.getParentalRatings(); - var promise4 = ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", {IsHidden: false})); + var promise4 = ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })); var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels")); diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js index 9c0d7a2dd9..9a3bcb9463 100644 --- a/dashboard-ui/scripts/wizardstartpage.js +++ b/dashboard-ui/scripts/wizardstartpage.js @@ -31,19 +31,33 @@ $(document).on('pageshow', "#wizardStartPage", function () { Dashboard.showLoadingMsg(); - var page = this; - var promise1 = ApiClient.getServerConfiguration(); + ApiClient.getPublicUsers().done(function (u) { - var promise2 = ApiClient.getJSON(ApiClient.getUrl("Localization/Options")); + var user = u.filter(function (i) { + return i.Configuration.IsAdministrator; + })[0]; - $.when(promise1, promise2).done(function (response1, response2) { + ApiClient.authenticateUserByName(user.Name, '').done(function (result) { - loadPage(page, response1[0], response2[0]); + user = result.User; + + Dashboard.setCurrentUser(user.Id, result.AccessToken); + + var promise1 = ApiClient.getServerConfiguration(); + + var promise2 = ApiClient.getJSON(ApiClient.getUrl("Localization/Options")); + + $.when(promise1, promise2).done(function (response1, response2) { + + loadPage(page, response1[0], response2[0]); + + }); + + }); }); - }); window.WizardStartPage = { diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index 4a8a7b3358..6509eb1c44 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -96,6 +96,9 @@ + + +