Restore reply instructions to ApplicationTransaction email

Summary: This "Reply to comment, etc., etc." section got lost along the way at some point. Restore it for transaction mail.

Test Plan: Received mail from Maniphest with reply instructions.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Differential Revision: https://secure.phabricator.com/D8700

src/applications/audit/mail/PhabricatorAuditReplyHandler.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group audit
- */
 final class PhabricatorAuditReplyHandler extends PhabricatorMailReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
@@ -27,7 +24,7 @@ final class PhabricatorAuditReplyHandler extends PhabricatorMailReplyHandler {
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
-      return "Reply to comment.";
+      return pht("Reply to comment.");
     } else {
       return null;
     }

src/applications/conpherence/mail/ConpherenceReplyHandler.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceReplyHandler extends PhabricatorMailReplyHandler {
 
   private $mailAddedParticipantPHIDs;

src/applications/legalpad/mail/LegalpadReplyHandler.php

@@ -27,7 +27,7 @@ final class LegalpadReplyHandler extends PhabricatorMailReplyHandler {
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
-      return 'Reply to comment or !unsubscribe.';
+      return pht('Reply to comment or !unsubscribe.');
     } else {
       return null;
     }

src/applications/macro/mail/PhabricatorMacroReplyHandler.php

@@ -26,7 +26,7 @@ final class PhabricatorMacroReplyHandler extends PhabricatorMailReplyHandler {
     if ($this->supportsReplies()) {
       // TODO: Implement.
       return null;
-      return "Reply to comment.";
+      return pht("Reply to comment.");
     } else {
       return null;
     }

src/applications/maniphest/mail/ManiphestReplyHandler.php

@@ -27,8 +27,9 @@ final class ManiphestReplyHandler extends PhabricatorMailReplyHandler {
 
   public function getReplyHandlerInstructions() {
     if ($this->supportsReplies()) {
-      return "Reply to comment or attach files, or !close, !claim, ".
+      return pht(
-             "!unsubscribe or !assign <username>.";
+        "Reply to comment or attach files, or !close, !claim, ".
+        "!unsubscribe or !assign <username>.");
     } else {
       return null;
     }

src/applications/pholio/mail/PholioReplyHandler.php

@@ -29,7 +29,7 @@ final class PholioReplyHandler extends PhabricatorMailReplyHandler {
     if ($this->supportsReplies()) {
       // TODO: Implement.
       return null;
-      return "Reply to comment.";
+      return pht("Reply to comment.");
     } else {
       return null;
     }

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

@@ -1721,6 +1721,12 @@ abstract class PhabricatorApplicationTransactionEditor
     $mail_tags = $this->getMailTags($object, $xactions);
     $action = $this->getMailAction($object, $xactions);
 
+    $reply_handler = $this->buildReplyHandler($object);
+    $reply_section = $reply_handler->getReplyHandlerInstructions();
+    if ($reply_section !== null) {
+      $body->addReplySection($reply_section);
+    }
+
     $template
       ->setFrom($this->requireActor()->getPHID())
       ->setSubjectPrefix($this->getMailSubjectPrefix())
@@ -1755,9 +1761,7 @@ abstract class PhabricatorApplicationTransactionEditor
       $template->setParentMessageID($this->getParentMessageID());
     }
 
-    $mails = $this
+    $mails = $reply_handler->multiplexMail(
-      ->buildReplyHandler($object)
-      ->multiplexMail(
         $template,
         array_select_keys($handles, $email_to),
         array_select_keys($handles, $email_cc));