Bug 1787393 - Remove vestages of dialog help button - port bug 1784882. r=aleca

The OTR help button is a one-off, so let's just drop it.

Differential Revision: https://phabricator.services.mozilla.com/D155671

--HG--
extra : rebase_source : e1e942157e7492d7ce97d7d6acbf9a688ca812c6
extra : amend_source : 20cb89300df0846aed1c29ad819ce991754a4072

chat/content/otr-auth.js

@@ -89,10 +89,6 @@ var otrAuth = {
       return this.cancel();
     });
 
-    document.addEventListener("dialoghelp", () => {
-      return this.help();
-    });
-
     let context, theirs;
     switch (mode) {
       case "start":
@@ -201,13 +197,4 @@ var otrAuth = {
     }
     showSection(how);
   },
-
-  async help() {
-    let [helpTitle, helpText] = await document.l10n.formatValues([
-      { id: "auth-help-title" },
-      { id: "auth-help" },
-    ]);
-
-    Services.prompt.alert(window, helpTitle, helpText);
-  },
 };

chat/content/otr-auth.xhtml

@@ -20,7 +20,7 @@
   <script defer="defer" src="chrome://chat/content/otr-auth.js"></script>
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <dialog buttons="accept,cancel,help"
+  <dialog buttons="accept,cancel"
           buttondisabledaccept="true"
           data-l10n-id="otr-auth"
           data-l10n-attrs="buttonlabelaccept">

mail/extensions/openpgp/content/ui/keyWizard.js

@@ -75,7 +75,7 @@ var syncl10n = new Localization(["messenger/openpgp/keyWizard.ftl"], true);
 
 // Dialog event listeners.
 document.addEventListener("dialogaccept", wizardContinue);
-document.addEventListener("dialoghelp", goBack);
+document.addEventListener("dialogextra1", goBack);
 document.addEventListener("dialogcancel", onClose);
 
 /**
@@ -247,8 +247,8 @@ function switchSection() {
       break;
   }
 
-  // Show the `Go Back` button.
-  kDialog.getButton("help").removeAttribute("hidden");
+  // Show the `Go back` button.
+  kDialog.getButton("extra1").hidden = false;
   resizeDialog();
 }
 
@@ -292,7 +292,7 @@ function goBack() {
  */
 function backToStart(event) {
   // Hide the `Go Back` button.
-  kDialog.getButton("help").setAttribute("hidden", true);
+  kDialog.getButton("extra1").hidden = true;
 
   // Enable the `Continue` button.
   kDialog.getButton("accept").removeAttribute("disabled");
@@ -939,8 +939,8 @@ async function openPgpImportStart() {
   // Show the successful final screen only if at least one key was imported.
   if (keyCount) {
     // Update the dialog buttons for the final stage.
-    kDialog.getButton("help").setAttribute("hidden", true);
-    kDialog.getButton("cancel").setAttribute("hidden", true);
+    kDialog.getButton("extra1").hidden = true;
+    kDialog.getButton("cancel").hidden = true;
 
     // Update the `Continue` button.
     document.l10n.setAttributes(

mail/extensions/openpgp/content/ui/keyWizard.xhtml

@@ -18,8 +18,8 @@
         lightweightthemes="true"
         style="width: 50em;">
 <dialog id="openPgpKeyWizardDialog"
-        data-l10n-id="key-wizard-button"
-        data-l10n-attrs="buttonlabelaccept, buttonlabelhelp"
+        data-l10n-id="key-wizard-dialog"
+        data-l10n-attrs="buttonlabelaccept,buttonlabelextra1"
         buttons="accept,cancel">
 
     <script src="chrome://openpgp/content/ui/enigmailCommon.js"/>

mail/locales/en-US/messenger/openpgp/keyWizard.ftl

@@ -6,9 +6,9 @@
 key-wizard-dialog-window =
     .title = Add a Personal OpenPGP Key for { $identity }
 
-key-wizard-button =
+key-wizard-dialog =
     .buttonlabelaccept = Continue
-    .buttonlabelhelp = Go back
+    .buttonlabelextra1 = Go back
 
 key-wizard-warning = <b>If you have an existing personal key</b> for this email address, you should import it. Otherwise you will not have access to your archives of encrypted emails, nor be able to read incoming encrypted emails from people who are still using your existing key.
 

mail/locales/en-US/messenger/otr/auth.ftl

@@ -18,9 +18,6 @@ auth-your-fp-value = Fingerprint for you, { $own_name }:
 #   $their_name (String) - the screen name of a chat contact
 auth-their-fp-value = Fingerprint for { $their_name }:
 
-auth-help = Verifying a contact’s identity helps ensure that the conversation is truly private, making it very difficult for a third party to eavesdrop or manipulate the conversation.
-auth-help-title = Verification help
-
 auth-question-received = This is the question asked by your contact:
 
 auth-yes =