Skip to content

Commit 2f01214

Browse files
author
epriestley
committed
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
1 parent 7f81fd4 commit 2f01214

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

src/applications/audit/mail/PhabricatorAuditReplyHandler.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22

3-
/**
4-
* @group audit
5-
*/
63
final class PhabricatorAuditReplyHandler extends PhabricatorMailReplyHandler {
74

85
public function validateMailReceiver($mail_receiver) {
@@ -27,7 +24,7 @@ public function getReplyHandlerDomain() {
2724

2825
public function getReplyHandlerInstructions() {
2926
if ($this->supportsReplies()) {
30-
return "Reply to comment.";
27+
return pht("Reply to comment.");
3128
} else {
3229
return null;
3330
}

src/applications/conpherence/mail/ConpherenceReplyHandler.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22

3-
/**
4-
* @group conpherence
5-
*/
63
final class ConpherenceReplyHandler extends PhabricatorMailReplyHandler {
74

85
private $mailAddedParticipantPHIDs;

src/applications/legalpad/mail/LegalpadReplyHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function getReplyHandlerDomain() {
2727

2828
public function getReplyHandlerInstructions() {
2929
if ($this->supportsReplies()) {
30-
return 'Reply to comment or !unsubscribe.';
30+
return pht('Reply to comment or !unsubscribe.');
3131
} else {
3232
return null;
3333
}

src/applications/macro/mail/PhabricatorMacroReplyHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getReplyHandlerInstructions() {
2626
if ($this->supportsReplies()) {
2727
// TODO: Implement.
2828
return null;
29-
return "Reply to comment.";
29+
return pht("Reply to comment.");
3030
} else {
3131
return null;
3232
}

src/applications/maniphest/mail/ManiphestReplyHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ public function getReplyHandlerDomain() {
2727

2828
public function getReplyHandlerInstructions() {
2929
if ($this->supportsReplies()) {
30-
return "Reply to comment or attach files, or !close, !claim, ".
31-
"!unsubscribe or !assign <username>.";
30+
return pht(
31+
"Reply to comment or attach files, or !close, !claim, ".
32+
"!unsubscribe or !assign <username>.");
3233
} else {
3334
return null;
3435
}

src/applications/pholio/mail/PholioReplyHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getReplyHandlerInstructions() {
2929
if ($this->supportsReplies()) {
3030
// TODO: Implement.
3131
return null;
32-
return "Reply to comment.";
32+
return pht("Reply to comment.");
3333
} else {
3434
return null;
3535
}

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,12 @@ protected function sendMail(
17211721
$mail_tags = $this->getMailTags($object, $xactions);
17221722
$action = $this->getMailAction($object, $xactions);
17231723

1724+
$reply_handler = $this->buildReplyHandler($object);
1725+
$reply_section = $reply_handler->getReplyHandlerInstructions();
1726+
if ($reply_section !== null) {
1727+
$body->addReplySection($reply_section);
1728+
}
1729+
17241730
$template
17251731
->setFrom($this->requireActor()->getPHID())
17261732
->setSubjectPrefix($this->getMailSubjectPrefix())
@@ -1755,9 +1761,7 @@ protected function sendMail(
17551761
$template->setParentMessageID($this->getParentMessageID());
17561762
}
17571763

1758-
$mails = $this
1759-
->buildReplyHandler($object)
1760-
->multiplexMail(
1764+
$mails = $reply_handler->multiplexMail(
17611765
$template,
17621766
array_select_keys($handles, $email_to),
17631767
array_select_keys($handles, $email_cc));

0 commit comments

Comments
 (0)