jenkins-bot has submitted this change and it was merged.

Change subject: Update email copy text
......................................................................


Update email copy text

Change-Id: Ia0f8786ecbd2bbe5fbd6431a2ccace96143cebd8
---
M PageTriage.hooks.php
M PageTriage.i18n.php
2 files changed, 14 insertions(+), 6 deletions(-)

Approvals:
  Matthias Mullie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 9993c3d..be40052 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -512,7 +512,7 @@
                                'email-subject-params' => array( 'agent', 
'title' ),
                                'email-body-message' => 
'pagetriage-notification-add-maintenance-tag-email-body2',
                                'email-body-params' => array( 'agent', 'title', 
'titlelink', 'tag', 'email-footer' ),
-                               'email-body-batch-message' => 
'pagetriage-notification-mark-as-reviewed-email-batch-body',
+                               'email-body-batch-message' => 
'pagetriage-notification-add-maintenance-tag-email-batch-body',
                                'email-body-batch-params' => array( 'title', 
'agent' ),
                                'icon' => 'checkmark',
                        );
@@ -531,7 +531,7 @@
                                'email-subject-params' => array( 'agent', 
'title' ),
                                'email-body-message' => 
'pagetriage-notification-add-deletion-tag-email-body2',
                                'email-body-params' => array( 'agent', 'title', 
'titlelink', 'tag', 'email-footer' ),
-                               'email-body-batch-message' => 
'pagetriage-notification-mark-as-reviewed-email-batch-body',
+                               'email-body-batch-message' => 
'pagetriage-notification-add-deletion-tag-email-batch-body',
                                'email-body-batch-params' => array( 'title', 
'agent' ),
                                'icon' => 'trash',
                        );
diff --git a/PageTriage.i18n.php b/PageTriage.i18n.php
index bd6a6d8..b520f0c 100644
--- a/PageTriage.i18n.php
+++ b/PageTriage.i18n.php
@@ -377,7 +377,7 @@
        // notification - mark as reviewed
        'pagetriage-notification-mark-as-reviewed2' => '[[$2]] was 
{{GENDER:$1|reviewed}} by [[User:$1|$1]]',
        'pagetriage-notification-mark-as-reviewed-flyout' => '[[$2]] was 
{{GENDER:$1|reviewed}} by <b>$1</b>',
-       'pagetriage-notification-mark-as-reviewed-email-subject2' => '$2 was 
{{GENDER:$1|reviewed}} by $1',
+       'pagetriage-notification-mark-as-reviewed-email-subject2' => 'Your page 
was {{GENDER:$1|reviewed}} on {{SITENAME}}',
        'pagetriage-notification-mark-as-reviewed-email-body2' => '$2 was 
{{GENDER:$1|reviewed}} by {{SITENAME}} user $1:
 
 View more:
@@ -389,7 +389,7 @@
        // notification - add maintenance tag
        'pagetriage-notification-add-maintenance-tag2' => '[[$2]] was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|tagged}} by [[User:$1|$1]]. 
{{PLURAL:$4|Tag|Tags}}: $3',
        'pagetriage-notification-add-maintenance-tag-flyout' => '[[$2]] was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|tagged}} by <b>$1</b>. 
{{PLURAL:$4|Tag|Tags}}: $3',
-       'pagetriage-notification-add-maintenance-tag-email-subject2' => '$2 was 
{{GENDER:$1|tagged}} by $1',
+       'pagetriage-notification-add-maintenance-tag-email-subject2' => 'Your 
page was {{GENDER:$1|tagged}} on {{SITENAME}}',
        'pagetriage-notification-add-maintenance-tag-email-body2' => '$2 was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|tagged}} by {{SITENAME}} user $1.
 
 {{PLURAL:$5|Tag|Tags}}: $4
@@ -399,10 +399,11 @@
 $3
 
 $6',
+       'pagetriage-notification-add-maintenance-tag-email-batch-body' => '$1 
was {{GENDER:$2|reviewed}} and {{GENDER:$2|tagged}} by $2',
        // notification - add deletion tag
        'pagetriage-notification-add-deletion-tag2' => '[[$2]] was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|marked for deletion}} by [[User:$1|$1]]. 
{{PLURAL:$4|Tag|Tags}}: $3',
        'pagetriage-notification-add-deletion-tag-flyout' => '[[$2]] was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|marked for deletion}} by <b>$1</b>. 
{{PLURAL:$4|Tag|Tags}}: $3',
-       'pagetriage-notification-add-deletion-tag-email-subject2' => '$2 was 
{{GENDER:$1|marked for deletion}} by $1',
+       'pagetriage-notification-add-deletion-tag-email-subject2' => 'Your page 
was {{GENDER:$1|marked for deletion}} on {{SITENAME}}',
        'pagetriage-notification-add-deletion-tag-email-body2' => '$2 was 
{{GENDER:$1|marked for deletion}} by {{SITENAME}} user $1.
 
 {{PLURAL:$5|Tag|Tags}}: $4
@@ -412,6 +413,7 @@
 $3
 
 $6',
+       'pagetriage-notification-add-deletion-tag-email-batch-body' => '$1 was 
{{GENDER:$2|marked for deletion}} by $2',
        'echo-pref-subscription-page-review' => 'Reviews a page I created',
        'echo-pref-tooltip-page-review' => 'Notify me when someone reviews a 
page I created.',
        'echo-category-title-page-review' => 'Page 
{{PLURAL:$1|review|reviews}}',
@@ -918,7 +920,7 @@
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed-flyout}}
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-batch-body}}
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}",
-       'pagetriage-notification-mark-as-reviewed-email-batch-body' => "Email 
batch body for 'mark as reviewed', 'add maintenance tag' and 'add deletion 
tag'.  Parameters:
+       'pagetriage-notification-mark-as-reviewed-email-batch-body' => "Email 
batch body for 'mark as reviewed' notification.  Parameters:
 * $1 is the title of the page
 * $2 is the username of the person who reviewed the page
 See also:
@@ -962,6 +964,9 @@
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag2}}
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag-flyout}}
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}",
+       'pagetriage-notification-add-maintenance-tag-email-batch-body' => 
"Email batch body for 'add maintenance tag' notification. Parameters:
+* $1 is the title of the page
+* $2 is the username of the person who added maintenance tag to the page",
        'pagetriage-notification-add-deletion-tag2' => "Title for 'add deletion 
tag' notification.  Parameters:
 * $1 is the username of the person who added deletion tag, plain text
 * $2 is the title of the page
@@ -998,6 +1003,9 @@
 * {{msg-mw|Pagetriage-notification-add-deletion-tag2}}
 * {{msg-mw|Pagetriage-notification-add-deletion-tag-flyout}}
 * {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}",
+       'pagetriage-notification-add-deletion-tag-email-batch-body' => "Email 
batch body for 'add deletion tag' notification. Parameters:
+* $1 is the title of the page
+* $2 is the username of the person who added maintenance tag to the page",
        'echo-pref-subscription-page-review' => 'Option for getting 
notifications when someone reviews a page created by the user.
 
 This is the conclusion of the sentence begun by the header: 
{{msg-mw|Prefs-echosubscriptions}}.',

-- 
To view, visit https://gerrit.wikimedia.org/r/75408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0f8786ecbd2bbe5fbd6431a2ccace96143cebd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to