From aa12a796256c7dcecb471d8c34ffda6391d0eac1 Mon Sep 17 00:00:00 2001 From: Matt Montgomery <33811686+ConfusedPolarBear@users.noreply.github.com> Date: Sun, 26 Apr 2020 16:19:58 -0500 Subject: [PATCH] Apply suggestions from code review --- .../quickconnectsettings.js | 19 ++++++++----------- src/controllers/auth/login.js | 4 ++-- src/controllers/user/quickconnect.js | 2 +- src/login.html | 2 +- src/mypreferencesmenu.html | 2 +- src/mypreferencesquickconnect.html | 4 ++-- src/quickconnect.html | 6 +++--- src/scripts/librarymenu.js | 2 +- src/strings/en-us.json | 10 ++++++++++ 9 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/components/quickconnectsettings/quickconnectsettings.js b/src/components/quickconnectsettings/quickconnectsettings.js index 59250df76a..6010fab5c3 100644 --- a/src/components/quickconnectsettings/quickconnectsettings.js +++ b/src/components/quickconnectsettings/quickconnectsettings.js @@ -2,8 +2,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa "use strict"; function authorizeRequest(event) { - var lookup = event.data.lookup; - var url = ApiClient.getUrl("/QuickConnect/Authorize"); + let lookup = event.data.lookup; + let url = ApiClient.getUrl("/QuickConnect/Authorize"); ApiClient.ajax({ type: "POST", url: url, @@ -23,12 +23,12 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa QuickConnectSettings.prototype.list = function(argPage) { ApiClient.getJSON("/QuickConnect/List").then(json => { let found = false; - var elem = $(argPage.querySelector("#quickConnectIncoming")); - elem.text("No pending login requests"); + var elem = argPage.querySelector('#quickConnectIncoming'); + elem.innerText = globalize.translate('QuickConnectNoPending'); for (var i = 0; i < json.length; i++) { if (!found) { - elem.html(""); + elem.innerHTML = ""; found = true; } @@ -40,13 +40,11 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa html += '
'; if (!current.Authenticated) { - html += 'authorize'; - } else { - html += " (authorized)"; + html += '' + globalize.translate('Authorize') + ''; } html += '
'; - elem.append(html); + elem.innerHTML += html; $("#qc" + current.Lookup).click({ lookup: current.Lookup }, authorizeRequest); $("#div" + current.Lookup).click({ lookup: current.Lookup }, authorizeRequest); @@ -68,7 +66,6 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa }).then((json) => { let message = json.Error; - console.log("message is \"" + message + "\""); if (message && message !== "") { console.error("Error activating quick connect. Error: ", json.Error); @@ -81,7 +78,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa } require(["toast"], function (toast) { - toast("Successfully activated"); + toast(globalize.translate("QuickConnectActivationSuccessful")); }); return true; diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js index ff36939fb2..86e8874e7e 100644 --- a/src/controllers/auth/login.js +++ b/src/controllers/auth/login.js @@ -167,8 +167,8 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout } Dashboard.alert({ - message: "Authorize request " + json.Code + " to continue", - title: "Quick Connect Code" + message: Globalize.translate('QuickConnectAuthorizeCode', json.Code), + title: Globalize.translate('QuickConnect') }); loading.show(); diff --git a/src/controllers/user/quickconnect.js b/src/controllers/user/quickconnect.js index 2b03dec415..035aef8f2f 100644 --- a/src/controllers/user/quickconnect.js +++ b/src/controllers/user/quickconnect.js @@ -20,7 +20,7 @@ define(["quickConnectSettings", "dom", "globalize", "loading", "userSettings", " let btn = view.querySelector("#btnQuickConnectActivate"); if (status === "Unavailable") { - btn.textContent = "Quick connect is not available on this server"; + btn.textContent = globalize.translate("QuickConnectNotAvailable"); btn.disabled = true; return false; } else if (status === "Available") { diff --git a/src/login.html b/src/login.html index 343b85906e..49472d8817 100644 --- a/src/login.html +++ b/src/login.html @@ -44,7 +44,7 @@
-
Failed to load incoming requests
+
${MessagePleaseWait}
diff --git a/src/quickconnect.html b/src/quickconnect.html index 7d7ec879a6..dff74eb836 100644 --- a/src/quickconnect.html +++ b/src/quickconnect.html @@ -3,16 +3,16 @@
-

Quick Connect

+

${QuickConnect}

- Quick connect is: Failed to load status + ${LabelCurrentStatus}
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 131dcf7472..e3ef65f22f 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -351,7 +351,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " icon: "devices" }); links.push({ - name: "Quick Connect", + name: globalize.translate("QuickConnect"), href: "quickconnect.html", pageIds: ["quickConnectPage", "quickConnectPage"], icon: "tap_and_play" diff --git a/src/strings/en-us.json b/src/strings/en-us.json index d5fc40ef01..ad390a0fe2 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -48,6 +48,7 @@ "AuthProviderHelp": "Select an Authentication Provider to be used to authenticate this user's password.", "Auto": "Auto", "AutoBasedOnLanguageSetting": "Auto (based on language setting)", + "Authorize": "authorize", "Backdrop": "Backdrop", "Backdrops": "Backdrops", "Banner": "Banner", @@ -63,6 +64,7 @@ "Browse": "Browse", "BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins.", "BurnSubtitlesHelp": "Determines if the server should burn in subtitles when transcoding videos. Avoiding this will greatly improve performance. Select Auto to burn image based formats (VOBSUB, PGS, SUB, IDX) and certain ASS or SSA subtitles.", + "ButtonActivate": "Activate", "ButtonAdd": "Add", "ButtonAddImage": "Add Image", "ButtonAddMediaLibrary": "Add Media Library", @@ -140,6 +142,7 @@ "ButtonTrailer": "Trailer", "ButtonUninstall": "Uninstall", "ButtonUp": "Up", + "ButtonUseQuickConnect": "Use Quick Connect", "ButtonViewWebsite": "View website", "ButtonWebsite": "Website", "CancelRecording": "Cancel recording", @@ -231,6 +234,7 @@ "EnableNextVideoInfoOverlayHelp": "At the end of a video, display info about the next video coming up in the current playlist.", "EnablePhotos": "Display photos", "EnablePhotosHelp": "Images will be detected and displayed alongside other media files.", + "EnableQuickConnect": "Enable quick connect on this server", "EnableStreamLooping": "Auto-loop live streams", "EnableStreamLoopingHelp": "Enable this if live streams only contain a few seconds of data and need to be continuously requested. Enabling this when not needed may cause problems.", "EnableThemeSongs": "Theme songs", @@ -587,6 +591,7 @@ "LabelCountry": "Country:", "LabelCriticRating": "Critic rating:", "LabelCurrentPassword": "Current password:", + "LabelCurrentStatus": "Current status:", "LabelCustomCertificatePath": "Custom SSL certificate path:", "LabelCustomCertificatePathHelp": "Path to a PKCS #12 file containing a certificate and private key to enable TLS support on a custom domain.", "LabelCustomCss": "Custom CSS:", @@ -1260,6 +1265,11 @@ "Programs": "Programs", "Quality": "Quality", "QueueAllFromHere": "Queue all from here", + "QuickConnect": "Quick Connect", + "QuickConnectActivationSuccessful": "Successfully activated", + "QuickConnectAuthorizeCode": "Authorize request {0} to continue", + "QuickConnectNoPending": "No pending login requests", + "QuickConnectNotAvailable": "Quick connect is not available on this server", "Raised": "Raised", "Rate": "Rate", "RecentlyWatched": "Recently watched",