From e46542004841f4bb00b3bc50cc84ea9a559b3921 Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Thu, 6 Apr 2023 00:02:41 +0300
Subject: [PATCH] Backed out 2 changesets (bug 1814266) for causing failures in
 browser_identityPopup_focus.js

Backed out changeset fb7b697636ae (bug 1814266)
Backed out changeset 7e5ac07b53d9 (bug 1814266)
---
 browser/base/content/browser-siteIdentity.js  |  6 +++-
 .../content/identityPanel.inc.xhtml           |  6 ++--
 browser/locales/en-US/browser/browser.ftl     |  2 +-
 browser/themes/shared/controlcenter/panel.css |  4 ---
 .../bug_1814266_identity_custom_root.py       | 34 -------------------
 .../moz-support-link/moz-support-link.mjs     |  2 +-
 tools/lint/fluent-lint/exclusions.yml         |  2 +-
 7 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py

diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 4d4518de7142..868e066c0190 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -166,7 +166,6 @@ var gIdentityHandler = {
 
   _popupInitialized: false,
   _initializePopup() {
-    window.ensureCustomElements("moz-support-link");
     if (!this._popupInitialized) {
       let wrapper = document.getElementById("template-identity-popup");
       wrapper.replaceWith(wrapper.content);
@@ -933,6 +932,11 @@ var gIdentityHandler = {
       e.setAttribute("href", baseURL + "mixed-content")
     );
 
+    this._identityPopupCustomRootLearnMore.setAttribute(
+      "href",
+      baseURL + "enterprise-roots"
+    );
+
     let customRoot = false;
 
     // Determine connection security information.
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index c4df64a699de..3a8e689e579c 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -125,9 +125,9 @@
                        when-connection="secure secure-ev secure-cert-user-overridden"/>
           <description id="identity-popup-content-verifier-unknown"
                        class="identity-popup-warning-box identity-popup-warning-gray"
-                       when-customroot="true">
-            <label data-l10n-id="identity-description-custom-root2"/>
-            <html:a is="moz-support-link" id="identity-popup-custom-root-learn-more" support-page="enterprise-roots"/>
+                       when-customroot="true"
+                       data-l10n-id="identity-description-custom-root">
+            <label data-l10n-name="link" id="identity-popup-custom-root-learn-more" is="text-link"/>
           </description>
 
           <!-- Remove Certificate Exception -->
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
index 2e7d6261fa2b..710e52485579 100644
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -400,7 +400,7 @@ identity-clear-site-data =
 identity-connection-not-secure-security-view = You are not securely connected to this site.
 identity-connection-verified = You are securely connected to this site.
 identity-ev-owner-label = Certificate issued to:
-identity-description-custom-root2 = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.
+identity-description-custom-root = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator. <label data-l10n-name="link">Learn More</label>
 identity-remove-cert-exception =
     .label = Remove Exception
     .accesskey = R
diff --git a/browser/themes/shared/controlcenter/panel.css b/browser/themes/shared/controlcenter/panel.css
index 7ba95f10f134..8392040e3c4d 100644
--- a/browser/themes/shared/controlcenter/panel.css
+++ b/browser/themes/shared/controlcenter/panel.css
@@ -282,10 +282,6 @@
   }
 }
 
-#identity-popup-content-verifier-unknown > label {
-  display: inline;
-}
-
 /* CONTENT BLOCKING / TRACKING PROTECTION */
 
 #protections-popup-sendReportView-heading,
diff --git a/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py b/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py
deleted file mode 100644
index 7eb144230d02..000000000000
--- a/python/l10n/fluent_migrations/bug_1814266_identity_custom_root.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-import fluent.syntax.ast as FTL
-
-from fluent.migrate.transforms import TransformPattern
-
-
-class STRIP_LEARNMORE(TransformPattern):
-    # Used to remove `<a data-l10n-name="link">SOME TEXT</a>` from a string
-    def visit_TextElement(self, node):
-        link_start = node.value.find('<label data-l10n-name="link">')
-        # Replace string up to the link, remove remaining spaces afterwards.
-        # Removing an extra character directly is not safe, as it could be
-        # punctuation.
-        node.value = node.value[:link_start].rstrip()
-
-        return node
-
-
-def migrate(ctx):
-    """Bug 1814266 - Use moz-support-link in identity panel, part {index}."""
-
-    browser_ftl = "browser/browser/browser.ftl"
-    ctx.add_transforms(
-        browser_ftl,
-        browser_ftl,
-        [
-            FTL.Message(
-                id=FTL.Identifier("identity-description-custom-root2"),
-                value=STRIP_LEARNMORE(browser_ftl, "identity-description-custom-root"),
-            ),
-        ],
-    )
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 c344bd56a40e..bd07ccfb7948 100644
--- a/toolkit/content/widgets/moz-support-link/moz-support-link.mjs
+++ b/toolkit/content/widgets/moz-support-link/moz-support-link.mjs
@@ -53,8 +53,8 @@ export default class MozSupportLink extends HTMLAnchorElement {
     this.addEventListener("click", this);
     if (!this.getAttribute("data-l10n-id")) {
       document.l10n.setAttributes(this, "moz-support-link-text");
+      document.l10n.translateFragment(this);
     }
-    document.l10n.translateFragment(this);
   }
 
   disconnectedCallback() {
diff --git a/tools/lint/fluent-lint/exclusions.yml b/tools/lint/fluent-lint/exclusions.yml
index 0317c4afca57..21b988ef0db8 100644
--- a/tools/lint/fluent-lint/exclusions.yml
+++ b/tools/lint/fluent-lint/exclusions.yml
@@ -147,7 +147,7 @@ CO01:
         - extension-firefox-alpenglow-name
         # browser/locales/en-US/browser/browser.ftl
         - identity-custom-root
-        - identity-description-custom-root2
+        - identity-description-custom-root
         # browser/locales/en-US/browser/migration.ftl
         - import-from-firefox
         # browser/locales/en-US/browser/migrationWizard.ftl