jenkins-bot has submitted this change and it was merged.
Change subject: Adding diff link to talk page notifications for email
......................................................................
Adding diff link to talk page notifications for email
We'll also be adding diff links for the flyout and archive, but
not in this change.
Bug: 48183
Change-Id: Iacd269a489c93b4fc4d28306915658fad372f50d
---
M Echo.i18n.php
M Echo.php
2 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
EBernhardson (WMF): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index 31ef5fc..2f7de57 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -87,15 +87,17 @@
'notification-reverted2' => 'Your {{PLURAL:$4|edit on [[:$2]] has|edits
on [[:$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3',
'notification-reverted-flyout2' => 'Your {{PLURAL:$4|edit on <b>$2</b>
has|edits on <b>$2</b> have}} been {{GENDER:$1|reverted}} by <b>$1</b> $3',
'notification-edit-talk-page-email-subject2' => 'You have a new
talkpage message on {{SITENAME}}',
- 'notification-edit-talk-page-email-body2' => '$1
+ 'notification-edit-talk-page-email-body3' => '$1
$3
-View more:
-
+View your talk page:
<$2>
-$4',
+View this change:
+<$4>
+
+$5',
'notification-edit-talk-page-email-batch-body2' => '$1
{{GENDER:$1|posted}} on your talk page',
'notification-page-linked-email-subject' => 'A page you started was
linked on {{SITENAME}}',
'notification-page-linked-email-body' => '$1
@@ -288,7 +290,7 @@
'notification-edit-talk-page2' => "Format for displaying notifications
of a user talk page being edited
* $1 is the username of the person who edited, plain text. Can be used for
GENDER.
* $2 is the current user's name, used in the link to their talk page.
-* $3 is the section title of the discussion, if any, used in the link to their
talk page
+* $3 is the section title of the discussion, if any, used in the link to their
talk page.
See also:
* {{msg-mw|Notification-edit-talk-page-flyout2}}
* {{msg-mw|Notification-add-talkpage-topic2}}",
@@ -379,11 +381,12 @@
* $4 is the number of edits that were reverted. NOTE: This will only be set to
1 or 2, with 2 actually meaning 'an unknown number greater than 0'.
{{Related|Notification-reverted}}",
'notification-edit-talk-page-email-subject2' => 'E-mail subject.',
- 'notification-edit-talk-page-email-body2' => 'E-mail notification.
Parameters:
+ 'notification-edit-talk-page-email-body3' => "E-mail notification.
Parameters:
* $1 - the email intro, could be
{{msg-mw|notification-edit-talk-page-email-batch-body2}} or
{{msg-mw|notification-edit-user-talk-email-batch-bundle-body}}
-* <$2> - a link to a change
+* <$2> - a link to the user's talk page
* $3 - the edit summary
-* $4 - the e-mail footer, {{msg-mw|echo-email-footer-default}}',
+* <$4> - a link to the 'diff view' of the changes that were made
+* $5 - the e-mail footer, {{msg-mw|echo-email-footer-default}}",
'notification-edit-talk-page-email-batch-body2' => 'E-mail notification
for talk page edit
* $1 is a username
diff --git a/Echo.php b/Echo.php
index 6fdfb93..bbe29fa 100755
--- a/Echo.php
+++ b/Echo.php
@@ -432,8 +432,8 @@
'flyout-message' => 'notification-edit-talk-page-flyout2',
'flyout-params' => array( 'agent', 'user', 'subject-anchor' ),
'email-subject-message' =>
'notification-edit-talk-page-email-subject2',
- 'email-body-message' =>
'notification-edit-talk-page-email-body2',
- 'email-body-params' => array( 'email-intro', 'titlelink',
'summary', 'email-footer' ),
+ 'email-body-message' =>
'notification-edit-talk-page-email-body3',
+ 'email-body-params' => array( 'email-intro', 'titlelink',
'summary', 'difflink', 'email-footer' ),
'email-body-batch-message' =>
'notification-edit-talk-page-email-batch-body2',
'email-body-batch-params' => array( 'agent' ),
'email-body-batch-bundle-message' =>
'notification-edit-user-talk-email-batch-bundle-body',
--
To view, visit https://gerrit.wikimedia.org/r/64876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd269a489c93b4fc4d28306915658fad372f50d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: MZMcBride <w...@mzmcbride.com>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
