jenkins-bot has submitted this change and it was merged.
Change subject: Extract `getMessageWithAgent`
......................................................................
Extract `getMessageWithAgent`
`getMessageWithAgent` is used by `getHeaderMessage` is can
be reused by other presentation models who need the
agent in their body message.
Bug: T118059
Change-Id: I0cbccaeb8b6e60d03bc75bc85c74591619b4399a
---
M includes/formatters/EventPresentationModel.php
1 file changed, 15 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/formatters/EventPresentationModel.php
b/includes/formatters/EventPresentationModel.php
index 76c0ca5..2d2f8bb 100644
--- a/includes/formatters/EventPresentationModel.php
+++ b/includes/formatters/EventPresentationModel.php
@@ -132,6 +132,20 @@
}
/**
+ * Return a message with the given key and the agent's
+ * formatted name and name for GENDER as 1st and
+ * 2nd parameters.
+ * @param string $key
+ * @return Message
+ */
+ final protected function getMessageWithAgent( $key ) {
+ $msg = $this->msg( $key );
+ list( $formattedName, $genderName ) =
$this->getAgentForOutput();
+ $msg->params( $formattedName, $genderName );
+ return $msg;
+ }
+
+ /**
* Get the viewing user's name for usage in GENDER
*
* @return string
@@ -167,11 +181,7 @@
* @return Message
*/
public function getHeaderMessage() {
- $msg = $this->msg( $this->getHeaderMessageKey() );
- list( $formattedName, $genderName ) =
$this->getAgentForOutput();
- $msg->params( $formattedName, $genderName );
-
- return $msg;
+ return $this->getMessageWithAgent( $this->getHeaderMessageKey()
);
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/253647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cbccaeb8b6e60d03bc75bc85c74591619b4399a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
