diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index e033c5a63e..031e642ee7 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -45,14 +45,14 @@

${MessagePluginRequiresSubscription}

-

${LinkLearnMoreAboutSubscription}

+

${LinkLearnMoreAboutSubscription}

${MessagePremiumPluginRequiresMembership}

-

${LinkLearnMoreAboutSubscription}

+

${LinkLearnMoreAboutSubscription}

- \ No newline at end of file + diff --git a/dashboard-ui/bower_components/emby-webcomponents/displaysettings/displaysettings.template.html b/dashboard-ui/bower_components/emby-webcomponents/displaysettings/displaysettings.template.html index 01bd14221f..7cc7040d4b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/displaysettings/displaysettings.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/displaysettings/displaysettings.template.html @@ -55,7 +55,7 @@
${LabelDisplayLanguageHelp}
- ${LearnHowYouCanContribute} + ${LearnHowYouCanContribute}
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js b/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js index 8bd49a42be..50292c9f14 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js @@ -40,8 +40,8 @@ define(["globalize", "apphost", "loading", "alert", "emby-linkbutton"], function function showGuestGeneralErrorMessage() { var html; - appHost.supports("externallinks") && (html = globalize.translate("sharedcomponents#ErrorAddingGuestAccount1", 'https://emby.media/connect'), html += "

" + globalize.translate("sharedcomponents#ErrorAddingGuestAccount2", "apps@emby.media")); - var text = globalize.translate("sharedcomponents#ErrorAddingGuestAccount1", "https://emby.media/connect"); + appHost.supports("externallinks") && (html = globalize.translate("sharedcomponents#ErrorAddingGuestAccount1", 'https://github.com/jellyfin/jellyfin'), html += "

" + globalize.translate("sharedcomponents#ErrorAddingGuestAccount2", "apps@emby.media")); + var text = globalize.translate("sharedcomponents#ErrorAddingGuestAccount1", "https://github.com/jellyfin/jellyfin"); return text += "\n\n" + globalize.translate("sharedcomponents#ErrorAddingGuestAccount2", "apps@emby.media"), alert({ text: text, html: html @@ -57,7 +57,7 @@ define(["globalize", "apphost", "loading", "alert", "emby-linkbutton"], function function showLinkUserErrorMessage(username, statusCode) { var html, text; - return 502 === statusCode ? showConnectServerUnreachableErrorMessage() : (username ? (appHost.supports("externallinks") && (html = globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount1", 'https://emby.media/connect'), html += "

" + globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount2", "apps@emby.media")), text = globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount1", "https://emby.media/connect"), text += "\n\n" + globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount2", "apps@emby.media")) : html = text = globalize.translate("sharedcomponents#DefaultErrorMessage"), alert({ + return 502 === statusCode ? showConnectServerUnreachableErrorMessage() : (username ? (appHost.supports("externallinks") && (html = globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount1", 'https://github.com/jellyfin/jellyfin'), html += "

" + globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount2", "apps@emby.media")), text = globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount1", "https://github.com/jellyfin/jellyfin"), text += "\n\n" + globalize.translate("sharedcomponents#ErrorAddingEmbyConnectAccount2", "apps@emby.media")) : html = text = globalize.translate("sharedcomponents#DefaultErrorMessage"), alert({ text: text, html: html })) diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js index ff139c934e..ee61308267 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js @@ -204,7 +204,7 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter", navigator.share({ title: item.Name, text: item.Overview, - url: "https://emby.media" + url: "https://github.com/jellyfin/jellyfin" }); break; case "album": diff --git a/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js b/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js index a834f1e436..f9e96460d4 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js +++ b/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js @@ -142,7 +142,7 @@ define(["appSettings", "loading", "apphost", "iapManager", "events", "shell", "g function getTermsOfPurchaseHtml() { var html = "", termsOfPurchase = iapManager.getTermsOfPurchase ? iapManager.getTermsOfPurchase() : []; - return termsOfPurchase.length ? (html += "

" + globalize.translate("sharedcomponents#HeaderTermsOfPurchase") + "

", termsOfPurchase.push('' + globalize.translate("sharedcomponents#PrivacyPolicy") + ""), termsOfPurchase.push('' + globalize.translate("sharedcomponents#TermsOfUse") + ""), html += "") : html + return termsOfPurchase.length ? (html += "

" + globalize.translate("sharedcomponents#HeaderTermsOfPurchase") + "

", termsOfPurchase.push('' + globalize.translate("sharedcomponents#PrivacyPolicy") + ""), termsOfPurchase.push('' + globalize.translate("sharedcomponents#TermsOfUse") + ""), html += "") : html } function showInAppPurchaseElement(subscriptionOptions, unlockableProductInfo, dialogOptions, resolve, reject) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js index 1effed01d8..00d38e1cdc 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/router.js +++ b/dashboard-ui/bower_components/emby-webcomponents/router.js @@ -28,8 +28,8 @@ define(["loading", "globalize", "events", "viewManager", "layoutManager", "skinM case "ServerUpdateNeeded": require(["alert"], function(alert) { alert({ - text: globalize.translate("sharedcomponents#ServerUpdateNeeded", "https://emby.media"), - html: globalize.translate("sharedcomponents#ServerUpdateNeeded", 'https://emby.media') + text: globalize.translate("sharedcomponents#ServerUpdateNeeded", "https://github.com/jellyfin/jellyfin"), + html: globalize.translate("sharedcomponents#ServerUpdateNeeded", 'https://github.com/jellyfin/jellyfin') }).then(function() { appRouter.showSelectServer() }) @@ -413,4 +413,4 @@ define(["loading", "globalize", "events", "viewManager", "layoutManager", "skinM Backdrop: 1, Full: 2 }, appRouter.invokeShortcut = invokeShortcut, appRouter -}); \ No newline at end of file +}); diff --git a/dashboard-ui/components/guestinviter/connectlink.template.html b/dashboard-ui/components/guestinviter/connectlink.template.html index 6a5e32968d..793108da32 100644 --- a/dashboard-ui/components/guestinviter/connectlink.template.html +++ b/dashboard-ui/components/guestinviter/connectlink.template.html @@ -16,7 +16,7 @@
${LabelConnectUserNameHelp}
- ${ButtonLearnMoreAboutEmbyConnect} + ${ButtonLearnMoreAboutEmbyConnect}
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html index bc8bd67423..b5f30e1474 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.template.html +++ b/dashboard-ui/components/guestinviter/guestinviter.template.html @@ -14,7 +14,7 @@
${LabelConnectGuestUserNameHelp}
-
${ButtonLearnMoreAboutEmbyConnect}
+
${ButtonLearnMoreAboutEmbyConnect}
diff --git a/dashboard-ui/components/iap.js b/dashboard-ui/components/iap.js index 7d1096cd9d..99f86a1578 100644 --- a/dashboard-ui/components/iap.js +++ b/dashboard-ui/components/iap.js @@ -6,7 +6,7 @@ define(["globalize", "shell", "browser", "apphost"], function(globalize, shell, } function getPremiumInfoUrl() { - return "https://emby.media/premiere" + return "https://github.com/jellyfin/jellyfin" } function beginPurchase(feature, email) { @@ -54,4 +54,4 @@ define(["globalize", "shell", "browser", "apphost"], function(globalize, shell, getPeriodicMessageIntervalMs: getPeriodicMessageIntervalMs, getPremiumInfoUrl: getPremiumInfoUrl } -}); \ No newline at end of file +}); diff --git a/dashboard-ui/components/tvproviders/xmltv.template.html b/dashboard-ui/components/tvproviders/xmltv.template.html index b75c748113..0a2563d79a 100644 --- a/dashboard-ui/components/tvproviders/xmltv.template.html +++ b/dashboard-ui/components/tvproviders/xmltv.template.html @@ -57,10 +57,10 @@
- ${ButtonLearnMore} + ${ButtonLearnMore}

- \ No newline at end of file + diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html index 27815aba66..df98effcff 100644 --- a/dashboard-ui/connectlogin.html +++ b/dashboard-ui/connectlogin.html @@ -19,7 +19,7 @@ ${ButtonSignIn}
- + ${ButtonForgotPassword}
@@ -32,7 +32,7 @@

${HeaderNewUsers}

- + ${ButtonSignUp}
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 32a3f75243..d8d3f53f5a 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -115,7 +115,7 @@
- +

${HeaderLatestNews}

diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index bdf67e7fd8..3085526525 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -18,7 +18,7 @@
${LabelPreferredDisplayLanguageHelp}
- ${LabelReadHowYouCanContribute} + ${LabelReadHowYouCanContribute}
@@ -51,7 +51,7 @@
${OptionEnableAnonymousUsageReportingHelp}
- ${ButtonLearnMore} + ${ButtonLearnMore}
@@ -105,4 +105,4 @@ - \ No newline at end of file + diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html index 79f7d28081..8a5c514848 100644 --- a/dashboard-ui/myprofile.html +++ b/dashboard-ui/myprofile.html @@ -16,7 +16,7 @@

${MessageProfileInfoSynced}

-
${ButtonLearnMoreAboutEmbyConnect}
+
${ButtonLearnMoreAboutEmbyConnect}
diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 77c74e2867..b9cec196d8 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -29,7 +29,7 @@ define(["appSettings", "loading", "browser", "emby-linkbutton"], function(appSet break; case "ServerUpdateNeeded": Dashboard.alert({ - message: Globalize.translate("ServerUpdateNeeded", 'https://emby.media') + message: Globalize.translate("ServerUpdateNeeded", 'https://github.com/jellyfin/jellyfin') }); break; case "Unavailable": @@ -158,10 +158,10 @@ define(["appSettings", "loading", "browser", "emby-linkbutton"], function(appSet var page = this; if (page.querySelector("#txtSignupEmail").value = "", page.querySelector("#txtSignupUsername").value = "", page.querySelector("#txtSignupPassword").value = "", page.querySelector("#txtSignupPasswordConfirm").value = "", browser.safari && AppInfo.isNativeApp) page.querySelector(".embyIntroDownloadMessage").innerHTML = Globalize.translate("EmbyIntroDownloadMessageWithoutLink"); else { - page.querySelector(".embyIntroDownloadMessage").innerHTML = Globalize.translate("EmbyIntroDownloadMessage", 'http://emby.media') + page.querySelector(".embyIntroDownloadMessage").innerHTML = Globalize.translate("EmbyIntroDownloadMessage", 'http://emby.media') } }), view.addEventListener("viewshow", function() { loadPage(view, params) }) } -}); \ No newline at end of file +}); diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 49013978d4..6b31a453a7 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -166,7 +166,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa apiClient.getSystemInfo().then(function(systemInfo) { view.querySelector(".serverNameHeader").innerHTML = systemInfo.ServerName; var localizedVersion = globalize.translate("LabelVersionNumber", systemInfo.Version); - systemInfo.SystemUpdateLevel && "Release" != systemInfo.SystemUpdateLevel && (localizedVersion += " " + globalize.translate("Option" + systemInfo.SystemUpdateLevel).toLowerCase()), systemInfo.CanSelfRestart ? view.querySelector("#btnRestartServer").classList.remove("hide") : view.querySelector("#btnRestartServer").classList.add("hide"), view.querySelector("#appVersionNumber").innerHTML = localizedVersion, systemInfo.SupportsHttps ? view.querySelector("#ports").innerHTML = globalize.translate("LabelRunningOnPorts", systemInfo.HttpServerPortNumber, systemInfo.HttpsPortNumber) : view.querySelector("#ports").innerHTML = globalize.translate("LabelRunningOnPort", systemInfo.HttpServerPortNumber), DashboardPage.renderUrls(view, systemInfo), DashboardPage.renderPendingInstallations(view, systemInfo), systemInfo.CanSelfUpdate ? (view.querySelector("#btnUpdateApplicationContainer").classList.remove("hide"), view.querySelector("#btnManualUpdateContainer").classList.add("hide")) : (view.querySelector("#btnUpdateApplicationContainer").classList.add("hide"), view.querySelector("#btnManualUpdateContainer").classList.remove("hide")), "synology" == systemInfo.PackageName ? view.querySelector("#btnManualUpdateContainer").innerHTML = globalize.translate("SynologyUpdateInstructions") : view.querySelector("#btnManualUpdateContainer").innerHTML = '' + globalize.translate("PleaseUpdateManually") + "", DashboardPage.renderPaths(view, systemInfo), renderHasPendingRestart(view, apiClient, systemInfo.HasPendingRestart) + systemInfo.SystemUpdateLevel && "Release" != systemInfo.SystemUpdateLevel && (localizedVersion += " " + globalize.translate("Option" + systemInfo.SystemUpdateLevel).toLowerCase()), systemInfo.CanSelfRestart ? view.querySelector("#btnRestartServer").classList.remove("hide") : view.querySelector("#btnRestartServer").classList.add("hide"), view.querySelector("#appVersionNumber").innerHTML = localizedVersion, systemInfo.SupportsHttps ? view.querySelector("#ports").innerHTML = globalize.translate("LabelRunningOnPorts", systemInfo.HttpServerPortNumber, systemInfo.HttpsPortNumber) : view.querySelector("#ports").innerHTML = globalize.translate("LabelRunningOnPort", systemInfo.HttpServerPortNumber), DashboardPage.renderUrls(view, systemInfo), DashboardPage.renderPendingInstallations(view, systemInfo), systemInfo.CanSelfUpdate ? (view.querySelector("#btnUpdateApplicationContainer").classList.remove("hide"), view.querySelector("#btnManualUpdateContainer").classList.add("hide")) : (view.querySelector("#btnUpdateApplicationContainer").classList.add("hide"), view.querySelector("#btnManualUpdateContainer").classList.remove("hide")), "synology" == systemInfo.PackageName ? view.querySelector("#btnManualUpdateContainer").innerHTML = globalize.translate("SynologyUpdateInstructions") : view.querySelector("#btnManualUpdateContainer").innerHTML = '' + globalize.translate("PleaseUpdateManually") + "", DashboardPage.renderPaths(view, systemInfo), renderHasPendingRestart(view, apiClient, systemInfo.HasPendingRestart) }) } @@ -399,7 +399,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa }, renderSupporterIcon: function(page, pluginSecurityInfo) { var imgUrl, text, supporterIconContainer = page.querySelector(".supporterIconContainer"); - pluginSecurityInfo.IsMBSupporter ? (supporterIconContainer.classList.remove("hide"), imgUrl = "css/images/supporter/supporterbadge.png", text = globalize.translate("MessageThankYouForSupporting"), supporterIconContainer.innerHTML = '') : supporterIconContainer.classList.add("hide") + pluginSecurityInfo.IsMBSupporter ? (supporterIconContainer.classList.remove("hide"), imgUrl = "css/images/supporter/supporterbadge.png", text = globalize.translate("MessageThankYouForSupporting"), supporterIconContainer.innerHTML = '') : supporterIconContainer.classList.add("hide") }, renderPendingInstallations: function(page, systemInfo) { if (!systemInfo.CompletedInstallations.length) return void page.querySelector("#collapsiblePendingInstallations").classList.add("hide"); @@ -481,7 +481,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa var supporterPromotionElem = page.querySelector(".supporterPromotion"); if (supporterPromotionElem && supporterPromotionElem.parentNode.removeChild(supporterPromotionElem), !pluginSecurityInfo.IsMBSupporter) { var html = '
", page.querySelector(".content-primary").insertAdjacentHTML("afterbegin", html) + html += '
' + globalize.translate("HeaderSupportTheTeam") + '
' + globalize.translate("TextEnjoyBonusFeatures") + "
", page.querySelector(".content-primary").insertAdjacentHTML("afterbegin", html) } }) }), @@ -542,4 +542,4 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa serverActivityLog && serverActivityLog.destroy() }) } -}); \ No newline at end of file +}); diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js index e8b9c8b75b..4ab8e951f2 100644 --- a/dashboard-ui/scripts/selectserver.js +++ b/dashboard-ui/scripts/selectserver.js @@ -63,8 +63,8 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu break; case "ServerUpdateNeeded": alertTextWithOptions({ - text: globalize.translate("core#ServerUpdateNeeded", "https://emby.media"), - html: globalize.translate("core#ServerUpdateNeeded", 'https://emby.media') + text: globalize.translate("core#ServerUpdateNeeded", "https://github.com/jellyfin/jellyfin"), + html: globalize.translate("core#ServerUpdateNeeded", 'https://github.com/jellyfin/jellyfin') }); break; default: @@ -243,4 +243,4 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu btnInviteMenu && showPendingInviteMenu(btnInviteMenu) }) } -}); \ No newline at end of file +}); diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js index bf0902d220..8fba24dece 100644 --- a/dashboard-ui/scripts/supporterkeypage.js +++ b/dashboard-ui/scripts/supporterkeypage.js @@ -12,7 +12,7 @@ define(["fetchHelper", "dom", "registrationServices", "loading", "confirm", "glo if (statusInfo) { var statusLine, indicator = page.querySelector("#status-indicator .listItemIcon"), extendedPlans = page.querySelector("#extended-plans"); - switch (extendedPlans.innerHTML = globalize.translate("MessagePremiereExtendedPlans", '', ""), statusInfo.deviceStatus) { + switch (extendedPlans.innerHTML = globalize.translate("MessagePremiereExtendedPlans", '', ""), statusInfo.deviceStatus) { case 2: statusLine = globalize.translate("MessagePremiereStatusOver", statusInfo.planType), indicator.classList.add("expiredBackground"), indicator.classList.remove("nearExpiredBackground"), indicator.innerHTML = "", extendedPlans.classList.remove("hide"); break; @@ -134,8 +134,8 @@ define(["fetchHelper", "dom", "registrationServices", "loading", "confirm", "glo registrationServices.showPremiereInfo(), e.preventDefault(), e.stopPropagation() } return function(view, params) { - view.querySelector("#supporterKeyForm").addEventListener("submit", updateSupporterKey), view.querySelector("#lostKeyForm").addEventListener("submit", retrieveSupporterKey), view.querySelector(".benefits").innerHTML = globalize.translate("HeaderSupporterBenefit", '', ""), view.querySelector(".lnkPremiere").addEventListener("click", onSupporterLinkClick), view.addEventListener("viewshow", function() { + view.querySelector("#supporterKeyForm").addEventListener("submit", updateSupporterKey), view.querySelector("#lostKeyForm").addEventListener("submit", retrieveSupporterKey), view.querySelector(".benefits").innerHTML = globalize.translate("HeaderSupporterBenefit", '', ""), view.querySelector(".lnkPremiere").addEventListener("click", onSupporterLinkClick), view.addEventListener("viewshow", function() { load(this) }) } -}); \ No newline at end of file +}); diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html index 94c3d5a05a..cde39a4592 100644 --- a/dashboard-ui/supporterkey.html +++ b/dashboard-ui/supporterkey.html @@ -21,7 +21,7 @@

- + @@ -95,4 +95,4 @@
- \ No newline at end of file + diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html index dee0eab4cd..0b1f522fc6 100644 --- a/dashboard-ui/useredit.html +++ b/dashboard-ui/useredit.html @@ -41,7 +41,7 @@
${LabelConnectUserNameHelp}
- ${ButtonLearnMoreAboutEmbyConnect} + ${ButtonLearnMoreAboutEmbyConnect}
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html index 4e579ae45c..8eb4c0411e 100644 --- a/dashboard-ui/userpassword.html +++ b/dashboard-ui/userpassword.html @@ -20,7 +20,7 @@

${MessageProfileInfoSynced}

-
${ButtonLearnMoreAboutEmbyConnect}
+
${ButtonLearnMoreAboutEmbyConnect}
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html index 486474d7ee..d92aea736b 100644 --- a/dashboard-ui/wizarduser.html +++ b/dashboard-ui/wizarduser.html @@ -25,7 +25,7 @@
${LabelConnectUserNameHelp}
-
${ButtonLearnMoreAboutEmbyConnect}
+
${ButtonLearnMoreAboutEmbyConnect}