diff --git a/toolkit/content/widgets/moz-support-link/moz-support-link.mjs b/toolkit/content/widgets/moz-support-link/moz-support-link.mjs index aebc77dea2c8bead5aa14b11e4099dfda320cbd8..22d80c47b2045a872145da424a8ddd5aa9384d87 100644 --- a/toolkit/content/widgets/moz-support-link/moz-support-link.mjs +++ b/toolkit/content/widgets/moz-support-link/moz-support-link.mjs @@ -118,22 +118,23 @@ export default class MozSupportLink extends HTMLAnchorElement { #setHref() { let torManualPage = this.getAttribute("tor-manual-page"); if (torManualPage) { - const [page, anchor] = torManualPage.split("_", 2); - - let locale = Services.locale.appLocaleAsBCP47; - if (locale === "ja-JP-macos") { - // Convert quirk-locale to the locale used for tor project. - locale = "ja"; - } - - let href = `https://tb-manual.torproject.org/${locale}/${page}/`; - if (anchor) { - href = `${href}#${anchor}`; - } - this.href = href; + this.href = `about:manual#${torManualPage}`; return; } let supportPage = this.getAttribute("support-page") ?? ""; + // For tor-browser we sometimes want to override firefox support links with + // our own. + // See tor-browser#40899. + switch (supportPage) { + case "preferences": + // Shown twice in preferences, both as `{ -brand-short-name } Support`. + // Instead of directing to support for preferences, we link to general + // tor browser support. + // See tor-browser#32092. + this.href = "https://support.torproject.org/tbb"; + return; + // Fall through to support.mozilla.org + } let base = MozSupportLink.SUPPORT_URL + supportPage; this.href = this.hasAttribute("utm-content") ? formatUTMParams(this.getAttribute("utm-content"), base)