Backed out changeset b0ea8d83462f (bug 1657616) for es lint failure on blockedSite.js CLOSED TREE

browser/actors/BlockedSiteChild.jsm

@@ -94,8 +94,12 @@ class BlockedSiteChild extends JSWindowActorChild {
           .getElementById("report_detection")
           .setAttribute(
             "href",
-            SafeBrowsing.getReportURL("MalwareMistake", blockedInfo)
+            SafeBrowsing.getReportURL("MalwareMistake", blockedInfo) ||
+              "https://www.stopbadware.org/firefox"
           );
+        doc
+          .getElementById("learn_more_link")
+          .setAttribute("href", "https://www.stopbadware.org/firefox");
         break;
       case "unwanted":
         doc

browser/base/content/blockedSite.js

@@ -120,16 +120,10 @@ function initPage() {
   });
 
   // Add the learn more content:
-  // Map specific elements to a different message ID, to allow updates to
-  // existing labels
-  let stringMapping = {
-    "malware": "safeb-blocked-malware-page-learn-more-sumo"
-  }
-
   let learnMore = document.getElementById("learn_more");
   document.l10n.setAttributes(
     learnMore,
-    stringMapping[error] || `safeb-blocked-${error}-page-learn-more`
+    "safeb-blocked-" + error + "-page-learn-more"
   );
 
   // Set sitename to bold by adding class

browser/locales/en-US/browser/safebrowsing/blockedSite.ftl

@@ -18,7 +18,7 @@ safeb-blocked-phishing-page-error-desc-no-override = <span data-l10n-name='siten
 safeb-blocked-phishing-page-learn-more = Learn more about deceptive sites and phishing at <a data-l10n-name='learn_more_link'>www.antiphishing.org</a>. Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-malware-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing malicious software</a>. You can <a data-l10n-name='report_detection'>report a detection problem</a> or <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
 safeb-blocked-malware-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing malicious software</a>. You can <a data-l10n-name='report_detection'>report a detection problem</a>.
-safeb-blocked-malware-page-learn-more-sumo = Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-learn-more = Learn more about harmful web content including viruses and other malware and how to protect your computer at <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing harmful software</a>. You can <a data-l10n-name='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.
 safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> has been <a data-l10n-name='error_desc_link'>reported as containing harmful software</a>.
 safeb-blocked-unwanted-page-learn-more = Learn more about harmful and unwanted software at <a data-l10n-name='learn_more_link'>Unwanted Software Policy</a>. Learn more about { -brand-short-name }’s Phishing and Malware Protection at <a data-l10n-name='firefox_support'>support.mozilla.org</a>.