diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index 375888bfe8..1256e769f3 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -34,7 +34,7 @@ 'IDLE': 0, 'ACTIVE': 1, 'WARNING': 2, - 'ERROR': 3, + 'ERROR': 3 }; /** @@ -52,10 +52,11 @@ }; var applicationID = "2D4B1DA3"; - var messageNamespace = 'urn:x-cast:com.connectsdk'; - //var applicationID = "F4EB2E8E"; - //var messageNamespace = 'urn:x-cast:com.google.cast.mediabrowser.v3'; + // This is the beta version used for testing new changes + //applicationID = '27C4EB5B'; + + var messageNamespace = 'urn:x-cast:com.connectsdk'; var CastPlayer = function () { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 31af33a6dd..5377fef4d5 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -95,9 +95,10 @@ elem.innerHTML = ''; - var deferred = DeferredBuilder.Deferred(); - deferred.resolve(); - return deferred.promise(); + return new Promise(function (resolve, reject) { + + resolve(); + }); } } diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 76dff622e2..4848388f2e 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -115,7 +115,7 @@ Dashboard.alert({ - message: Globalize.translate('ErrorAddingEmbyConnectAccount') + message: Globalize.translate('ErrorAddingEmbyConnectAccount', 'apps@emby.media') }); }); diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json index 9789586b81..24fbf61ec0 100644 --- a/dashboard-ui/strings/javascript/javascript.json +++ b/dashboard-ui/strings/javascript/javascript.json @@ -402,7 +402,7 @@ "MessagePleaseRestart": "Please restart to finish updating.", "ButtonRestart": "Restart", "ButtonRefresh": "Refresh", - "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from the server.", + "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from Emby Server.", "ButtonHide": "Hide", "MessageSettingsSaved": "Settings saved.", "ButtonSignOut": "Sign Out", @@ -928,7 +928,7 @@ "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button.", "ErrorAddingMediaPathToVirtualFolder": "There was an error adding the media path. Please ensure the path is valid and the Emby Server process has access to that location.", "ErrorRemovingEmbyConnectAccount": "There was an error removing the Emby Connect account. Please ensure you have an active internet connection and try again.", - "ErrorAddingEmbyConnectAccount": "There was an error adding the Emby Connect account. Please ensure the Emby account has been activated by following the instructions in the email sent after creating the account. If this email was not received please send an email to apps@emby.media from the email address used with the Emby account.", + "ErrorAddingEmbyConnectAccount": "There was an error adding the Emby Connect account. Please ensure the Emby account has been activated by following the instructions in the email sent after creating the account. If you did not receive this email then please send an email to {0} from the email address used with the Emby account.", "HeaderFavoriteArtists": "Favorite Artists", "HeaderFavoriteSongs": "Favorite Songs", "HeaderConfirmPluginInstallation": "Confirm Plugin Installation",