Page MenuHomePhabricator
Files F15337776

D8700.id.diff
No OneTemporary
Actions

D8700.id.diff
View Options

diff --git a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
--- a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
+++ b/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 @@
public function getReplyHandlerInstructions() {
if ($this->supportsReplies()) {
- return "Reply to comment.";
+ return pht("Reply to comment.");
} else {
return null;
}
diff --git a/src/applications/conpherence/mail/ConpherenceReplyHandler.php b/src/applications/conpherence/mail/ConpherenceReplyHandler.php
--- a/src/applications/conpherence/mail/ConpherenceReplyHandler.php
+++ b/src/applications/conpherence/mail/ConpherenceReplyHandler.php
@@ -1,8 +1,5 @@
<?php
-/**
- * @group conpherence
- */
final class ConpherenceReplyHandler extends PhabricatorMailReplyHandler {
private $mailAddedParticipantPHIDs;
diff --git a/src/applications/legalpad/mail/LegalpadReplyHandler.php b/src/applications/legalpad/mail/LegalpadReplyHandler.php
--- a/src/applications/legalpad/mail/LegalpadReplyHandler.php
+++ b/src/applications/legalpad/mail/LegalpadReplyHandler.php
@@ -27,7 +27,7 @@
public function getReplyHandlerInstructions() {
if ($this->supportsReplies()) {
- return 'Reply to comment or !unsubscribe.';
+ return pht('Reply to comment or !unsubscribe.');
} else {
return null;
}
diff --git a/src/applications/macro/mail/PhabricatorMacroReplyHandler.php b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
--- a/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
+++ b/src/applications/macro/mail/PhabricatorMacroReplyHandler.php
@@ -26,7 +26,7 @@
if ($this->supportsReplies()) {
// TODO: Implement.
return null;
- return "Reply to comment.";
+ return pht("Reply to comment.");
} else {
return null;
}
diff --git a/src/applications/maniphest/mail/ManiphestReplyHandler.php b/src/applications/maniphest/mail/ManiphestReplyHandler.php
--- a/src/applications/maniphest/mail/ManiphestReplyHandler.php
+++ b/src/applications/maniphest/mail/ManiphestReplyHandler.php
@@ -27,8 +27,9 @@
public function getReplyHandlerInstructions() {
if ($this->supportsReplies()) {
- return "Reply to comment or attach files, or !close, !claim, ".
- "!unsubscribe or !assign <username>.";
+ return pht(
+ "Reply to comment or attach files, or !close, !claim, ".
+ "!unsubscribe or !assign <username>.");
} else {
return null;
}
diff --git a/src/applications/pholio/mail/PholioReplyHandler.php b/src/applications/pholio/mail/PholioReplyHandler.php
--- a/src/applications/pholio/mail/PholioReplyHandler.php
+++ b/src/applications/pholio/mail/PholioReplyHandler.php
@@ -29,7 +29,7 @@
if ($this->supportsReplies()) {
// TODO: Implement.
return null;
- return "Reply to comment.";
+ return pht("Reply to comment.");
} else {
return null;
}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1721,6 +1721,12 @@
$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 @@
$template->setParentMessageID($this->getParentMessageID());
}
- $mails = $this
- ->buildReplyHandler($object)
- ->multiplexMail(
+ $mails = $reply_handler->multiplexMail(
$template,
array_select_keys($handles, $email_to),
array_select_keys($handles, $email_cc));

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 7:39 AM (2 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7414196
Default Alt Text
D8700.id.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility