jenkins-bot has submitted this change and it was merged.
Change subject: Adding support for primary and secondary links
......................................................................
Adding support for primary and secondary links
Depends on Echo change I94aed697
Change-Id: I6654c74da12ee22beba8b479dd05ecf9fc890927
---
M Thanks.hooks.php
M Thanks.i18n.php
2 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Bsitu: Looks good to me, but someone else must approve
EBernhardson (WMF): Looks good to me, approved
jenkins-bot: Verified
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index d33221f..c215b94 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -126,13 +126,15 @@
);
$notifications['edit-thank'] = array(
+ 'primary-link' => array( 'message' =>
'notification-link-text-respond-to-user', 'destination' => 'agent' ),
+ 'secondary-link' => array( 'message' =>
'notification-link-text-view-edit', 'destination' => 'diff' ),
'category' => 'edit-thank',
'group' => 'positive',
'formatter-class' => 'EchoThanksFormatter',
'title-message' => 'notification-thanks',
'title-params' => array( 'agent', 'difflink', 'title' ),
- 'flyout-message' => 'notification-thanks-flyout',
- 'flyout-params' => array( 'agent', 'difflink', 'title'
),
+ 'flyout-message' => 'notification-thanks-flyout2',
+ 'flyout-params' => array( 'agent', 'title' ),
'payload' => array( 'summary' ),
'email-subject-message' =>
'notification-thanks-email-subject',
'email-subject-params' => array( 'agent' ),
diff --git a/Thanks.i18n.php b/Thanks.i18n.php
index fc93a0d..2065770 100644
--- a/Thanks.i18n.php
+++ b/Thanks.i18n.php
@@ -24,7 +24,7 @@
'echo-category-title-edit-thank' => 'Thanks',
'notification-thanks-diff-link' => 'your edit',
'notification-thanks' => '[[User:$1|$1]] {{GENDER:$1|thanked}} you for
$2 on [[$3]].',
- 'notification-thanks-flyout' => '[[User:$1|$1]] {{GENDER:$1|thanked}}
you for $2 on <b>$3</b>.',
+ 'notification-thanks-flyout2' => '[[User:$1|$1]] {{GENDER:$1|thanked}}
you for your edit on $2.',
'notification-thanks-email-subject' => '$1 {{GENDER:$1|thanked}} you
for your edit on {{SITENAME}}',
'notification-thanks-email-body' => '{{SITENAME}} user $1
{{GENDER:$1|thanked}} you for your edit on $2.
@@ -34,6 +34,7 @@
$4',
'notification-thanks-email-batch-body' => '$1 {{GENDER:$1|thanked}} you
for your edit on $2.',
+ 'notification-link-text-respond-to-user' => 'Respond to user',
'log-name-thanks' => 'Thanks log',
'log-description-thanks' => 'Below is a list of users thanked by other
users.',
'logentry-thanks-thank' => '$1 {{GENDER:$2|thanked}} $3',
@@ -78,10 +79,9 @@
* $1 is the username of the person who edited, plain text. Can be used for
GENDER.
* $2 is a link to the user's edit. The text of the link is
{{msg-mw|Notification-thanks-diff-link}}.
* $3 is the title of the page the user edited.",
- 'notification-thanks-flyout' => "Format for displaying notifications in
the flyout when a user is thanked for their edit. Parameters:
+ 'notification-thanks-flyout2' => "Format for displaying notifications
in the flyout when a user is thanked for their edit. Parameters:
* $1 is the username of the person who edited, plain text. Can be used for
GENDER.
-* $2 is a link to the user's edit. The text of the link is
{{msg-mw|Notification-thanks-diff-link}}.
-* $3 is the title of the page the user edited.",
+* $2 is the title of the page the user edited.",
'notification-thanks-email-subject' => 'E-mail subject',
'notification-thanks-email-body' => "E-mail notification. Parameters:
* $1 is a username. Can be used for GENDER.
@@ -91,6 +91,7 @@
'notification-thanks-email-batch-body' => 'E-mail notification.
Parameters:
* $1 is a username. Can be used for GENDER.
* $2 the title of the page the user edited.',
+ 'notification-link-text-respond-to-user' => 'Label for button that
links to a user page.',
'log-name-thanks' => 'Name of log that appears on [[Special:Log]].',
'log-description-thanks' => 'Description of thanks log',
'logentry-thanks-thank' => 'Log entry that is created when a user
thanks another user for an edit. Parameters:
@@ -134,6 +135,7 @@
$4",
'notification-thanks-email-batch-body' => '$1 {{GENDER:$1|agradeció}}
la so edición en $2.',
+
'log-name-thanks' => "Rexistru d'agradecimientos",
'log-description-thanks' => "Mas abaxo ta la llista d'usuarios a los
qu'otros usuarios dieron les gracies.",
'logentry-thanks-thank' => '$1 {{GENDER:$2|dio les gracies a}} $3',
--
To view, visit https://gerrit.wikimedia.org/r/69596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6654c74da12ee22beba8b479dd05ecf9fc890927
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
