wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 01:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adding diff link to talk page notifications for email"

Browse source
This commit is contained in:
jenkins-bot 2013-06-27 17:53:22 +00:00 committed by Gerrit Code Review
parent e15082fbc8 d43e19cb51
commit f069514830
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Echo.i18n.php
View file

@ -87,15 +87,17 @@ $messages['en'] = array(
'notification-reverted2' => 'Your {{PLURAL:$4|edit on [[:$2]] has|edits on [[:$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3', '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-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-subject2' => 'You have a new talkpage message on {{SITENAME}}',
'notification-edit-talk-page-email-body2' => '$1 'notification-edit-talk-page-email-body3' => '$1
$3 $3
View more: View your talk page:
<$2> <$2>
$4', View this change:
<$4>
$5',
'notification-edit-talk-page-email-batch-body2' => '$1 {{GENDER:$1|posted}} on your talk page', '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-subject' => 'A page you started was linked on {{SITENAME}}',
'notification-page-linked-email-body' => '$1 'notification-page-linked-email-body' => '$1
@ -290,7 +292,7 @@ Parameters:
'notification-edit-talk-page2' => "Format for displaying notifications of a user talk page being edited '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. * $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. * $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: See also:
* {{msg-mw|Notification-edit-talk-page-flyout2}} * {{msg-mw|Notification-edit-talk-page-flyout2}}
* {{msg-mw|Notification-add-talkpage-topic2}}", * {{msg-mw|Notification-add-talkpage-topic2}}",
@ -381,11 +383,12 @@ See also:
* $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'. * $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}}", {{Related|Notification-reverted}}",
'notification-edit-talk-page-email-subject2' => 'E-mail subject.', '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}} * $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 * $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 'notification-edit-talk-page-email-batch-body2' => 'E-mail notification for talk page edit
* $1 is a username * $1 is a username

4
Echo.php
View file

@ -430,8 +430,8 @@ $wgEchoNotifications = array(
'flyout-message' => 'notification-edit-talk-page-flyout2', 'flyout-message' => 'notification-edit-talk-page-flyout2',
'flyout-params' => array( 'agent', 'user', 'subject-anchor' ), 'flyout-params' => array( 'agent', 'user', 'subject-anchor' ),
'email-subject-message' => 'notification-edit-talk-page-email-subject2', 'email-subject-message' => 'notification-edit-talk-page-email-subject2',
'email-body-message' => 'notification-edit-talk-page-email-body2', 'email-body-message' => 'notification-edit-talk-page-email-body3',
'email-body-params' => array( 'email-intro', 'titlelink', 'summary', 'email-footer' ), '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-message' => 'notification-edit-talk-page-email-batch-body2',
'email-body-batch-params' => array( 'agent' ), 'email-body-batch-params' => array( 'agent' ),
'email-body-batch-bundle-message' => 'notification-edit-user-talk-email-batch-bundle-body', 'email-body-batch-bundle-message' => 'notification-edit-user-talk-email-batch-bundle-body',