diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 8da5d1fa60..976d4c43b7 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -38,7 +38,7 @@ .libraryPage > .ui-content { padding-top: 10px; - padding-bottom: 70px; + padding-bottom: 120px; } .libraryPage .currentUsername { diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index 3bfe01a0a0..b74682aeea 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -30,9 +30,9 @@ })[0]; - var message = 'The following file will be deleted:

' + item.OriginalPath + '

Are you sure you wish to proceed?

'; + var message = Globalize.translate('MessageFileWillBeDeleted') + '

' + item.OriginalPath + '

' + Globalize.translate('MessageSureYouWishToProceed') + '

'; - Dashboard.confirm(message, "Delete File", function (confirmResult) { + Dashboard.confirm(message, Globalize.translate('HeaderDeleteFile'), function (confirmResult) { if (confirmResult) { @@ -107,17 +107,17 @@ return; } - var message = 'The following file will be moved from:

' + item.OriginalPath + '

to:

' + item.TargetPath + '

'; + var message = Globalize.translate('MessageFollowingFileWillBeMovedFrom') + '

' + item.OriginalPath + '

' + Globalize.translate('MessageDestinationTo') + '

' + item.TargetPath + '

'; if (item.DuplicatePaths.length) { - message += '

In addition the following dupliates will be deleted:

'; + message += '

' + Globalize.translate('MessageDuplicatesWillBeDeleted') + '

'; message += '

' + item.DuplicatePaths.join('
') + '

'; } - message += '

Are you sure you wish to proceed?

'; + message += '

' + Globalize.translate('MessageSureYouWishToProceed') + '

'; - Dashboard.confirm(message, "Organize File", function (confirmResult) { + Dashboard.confirm(message, Globalize.translate('HeaderOrganizeFile'), function (confirmResult) { if (confirmResult) { @@ -184,15 +184,15 @@ var color = null; if (status == 'SkippedExisting') { - status = 'Skipped'; + status = Globalize.translate('StatusSkipped'); } else if (status == 'Failure') { color = '#cc0000'; - status = 'Failed'; + status = Globalize.translate('StatusFailed'); } if (status == 'Success') { color = 'green'; - status = 'Success'; + status = Globalize.translate('StatusSuccess'); } if (enhance && enhance) { @@ -221,8 +221,8 @@ if (item.Status != 'Success') { - html += ''; - html += ''; + html += ''; + html += ''; } html += ''; diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js index a217d3e157..60b87c59d1 100644 --- a/dashboard-ui/scripts/autoorganizetv.js +++ b/dashboard-ui/scripts/autoorganizetv.js @@ -2,7 +2,9 @@ function updateSeasonPatternHelp(page, value) { - var replacementHtmlResult = 'Result: ' + value.replace('%s', '1').replace('%0s', '01').replace('%00s', '001'); + var resultValue = value.replace('%s', '1').replace('%0s', '01').replace('%00s', '001'); + + var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', resultValue); $('.seasonFolderFieldDescription', page).html(replacementHtmlResult); } @@ -40,7 +42,7 @@ value = getEpisodeFileName(value, false); - var replacementHtmlResult = 'Result: ' + value; + var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', value); $('.episodePatternDescription', page).html(replacementHtmlResult); } @@ -49,7 +51,7 @@ value = getEpisodeFileName(value, true); - var replacementHtmlResult = 'Result: ' + value; + var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', value); $('.multiEpisodePatternDescription', page).html(replacementHtmlResult); } @@ -112,9 +114,9 @@ picker.close(); }, - header: "Select Watch Folder", + header: Globalize.translate('HeaderSelectWatchFolder'), - instruction: "Browse or enter the path to your watch folder. The folder must be writeable." + instruction: Globalize.translate('HeaderSelectWatchFolderHelp') }); }); diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index d171ecbfc5..5faa2692da 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -466,21 +466,6 @@ html: text, image: imgUrl }; - - //var playstate = session.PlayState; - - //if (playstate) { - - // if (playstate.PlayMethod == 'DirectPlay') { - // return 'Direct playing'; - // } - // if (playstate.PlayMethod == 'DirectStream') { - // return 'Direct streaming'; - // } - // if (playstate.PlayMethod == 'Transcode') { - // text = text + '
Transcoding
'; - // } - //} }, getUsersHtml: function (session) { @@ -776,7 +761,7 @@ $('#pUpdateNow', page).show(); - $('#newVersionNumber', page).html("Version " + version.versionStr + " is now available for download."); + $('#newVersionNumber', page).html(Globalize.translate('VersionXIsAvailableForDownload').replace('{0}', version.versionStr)); } }).fail(function () { @@ -845,9 +830,9 @@ var update = updates[i]; - html += '

A new version of ' + update.name + ' is available!

'; + html += '

' + Globalize.translate('NewVersionOfSomethingAvailable').replace('{0}', update.name) + '

'; - html += ''; + html += ''; } elem.html(html).trigger('create'); @@ -912,7 +897,7 @@ restart: function () { - Dashboard.confirm("Are you sure you wish to restart Media Browser Server?", "Restart", function (result) { + Dashboard.confirm(Globalize.translate('MessageConfirmRestart'), Globalize.translate('HeaderRestart'), function (result) { if (result) { $('#btnRestartServer').buttonEnabled(false); @@ -925,7 +910,7 @@ shutdown: function () { - Dashboard.confirm("Are you sure you wish to shutdown Media Browser Server?", "Shutdown", function (result) { + Dashboard.confirm(Globalize.translate('MessageConfirmShutdown'), Globalize.translate('HeaderShutdown'), function (result) { if (result) { $('#btnRestartServer').buttonEnabled(false);