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

Change subject: Remove unused i18n message
......................................................................


Remove unused i18n message

'email-body-message' is not used anymore

Change-Id: I37b11bea948d42749319c136c500112768b54587
---
M PageTriage.hooks.php
M PageTriage.i18n.php
2 files changed, 10 insertions(+), 83 deletions(-)

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



diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index be40052..528c442 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -491,8 +491,6 @@
                                'flyout-params' => array( 'agent', 'title' ),
                                'email-subject-message' => 
'pagetriage-notification-mark-as-reviewed-email-subject2',
                                'email-subject-params' => array( 'agent', 
'title' ),
-                               'email-body-message' => 
'pagetriage-notification-mark-as-reviewed-email-body2',
-                               'email-body-params' => array( 'agent', 'title', 
'titlelink', 'email-footer' ),
                                'email-body-batch-message' => 
'pagetriage-notification-mark-as-reviewed-email-batch-body',
                                'email-body-batch-params' => array( 'title', 
'agent' ),
                                'icon' => 'checkmark',
@@ -510,8 +508,6 @@
                                'flyout-params' => array( 'agent', 'title', 
'tag' ),
                                'email-subject-message' => 
'pagetriage-notification-add-maintenance-tag-email-subject2',
                                '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-add-maintenance-tag-email-batch-body',
                                'email-body-batch-params' => array( 'title', 
'agent' ),
                                'icon' => 'checkmark',
@@ -529,8 +525,6 @@
                                'flyout-params' => array( 'agent', 'title', 
'tag' ),
                                'email-subject-message' => 
'pagetriage-notification-add-deletion-tag-email-subject2',
                                '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-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 dc30cec..a993182 100644
--- a/PageTriage.i18n.php
+++ b/PageTriage.i18n.php
@@ -378,41 +378,16 @@
        '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' => '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:
-
-$3
-
-$4',
        'pagetriage-notification-mark-as-reviewed-email-batch-body' => '$1 was 
{{GENDER:$2|reviewed}} by $2.',
        // 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' => '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
-
-View more:
-
-$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' => '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
-
-View more:
-
-$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.',
@@ -897,42 +872,28 @@
 See also:
 * {{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}}
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-body2}}",
+* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}",
        'pagetriage-notification-mark-as-reviewed-flyout' => "Flyout-specific 
title for 'mark as reviewed' notification.  Parameters:
 * $1 is the username of the person who marked the page as reviewed, plain text
 * $2 is the title of the page
 See also:
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed2}}
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-batch-body}}
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-body2}}",
+* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}",
        'pagetriage-notification-mark-as-reviewed-email-subject2' => "Email 
subject for 'mark as reviewed' notification.  Parameters:
 * $1 is the username of the person who marked the page as reviewed, plain text
 * $2 is the title of the page
 See also:
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed2}}
 * {{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-body2}}",
-       'pagetriage-notification-mark-as-reviewed-email-body2' => "Email body 
for 'mark as reviewed' notification.  Parameters:
-* $1 is the user name of the pseron who marked the page as reviewed
-* $2 is the title of the page
-* $3 is the link to the page
-* $4 is the email footer
-See also:
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed2}}
-* {{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}}",
+* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-batch-body}}",
        '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:
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed2}}
 * {{msg-mw|Pagetriage-notification-mark-as-reviewed-flyout}}
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}
-* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-body2}}",
+* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}",
        'pagetriage-notification-add-maintenance-tag2' => "Title for 'add 
maintenance tag' notification.  Parameters:
 * $1 is the username of the person who added maintenance tag, plain text
 * $2 is the title of the page
@@ -940,8 +901,7 @@
 * $4 is the number of maintenance tags
 See also:
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-body2}}",
+* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}",
        'pagetriage-notification-add-maintenance-tag-flyout' => 
"Flyout-specific title for 'add maintenance tag' notification.  Parameters:
 * $1 is the username of the person who added maintenance tag, plain text
 * $2 is the title of the page
@@ -949,26 +909,13 @@
 * $4 is the number of maintenance tags
 See also:
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag2}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-body2}}",
+* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}",
        'pagetriage-notification-add-maintenance-tag-email-subject2' => "Email 
subject for 'add maintenance tag' notification.  Parameters:
 * $1 is the username of the person who added maintenance tag, plain text
 * $2 is the title of the page
 See also:
 * {{msg-mw|Pagetriage-notification-add-maintenance-tag2}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-body2}}",
-       'pagetriage-notification-add-maintenance-tag-email-body2' => "Email 
body for 'add maintenance tag' notification.  Parameters:
-* $1 is the username of the person who added maintenance tag to the page
-* $2 is the title of the page
-* $3 is the link to the page
-* $4 is the list of maintenance tags
-* $5 is the number of maintenance tags
-* $6 is the email footer
-See also:
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag2}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-maintenance-tag-email-subject2}}",
+* {{msg-mw|Pagetriage-notification-add-maintenance-tag-flyout}}",
        '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",
@@ -979,8 +926,7 @@
 * $4 is the number of deletion tags
 See also:
 * {{msg-mw|Pagetriage-notification-add-deletion-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-body2}}",
+* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}",
        'pagetriage-notification-add-deletion-tag-flyout' => "Flyout-specific 
title for 'add deletion tag' notification.  Parameters:
 * $1 - the username of the person who added deletion tag, plain text
 * $2 - the title of the page
@@ -988,26 +934,13 @@
 * $4 - the number of deletion tags
 See also:
 * {{msg-mw|Pagetriage-notification-add-deletion-tag2}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-body2}}",
+* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}",
        'pagetriage-notification-add-deletion-tag-email-subject2' => "Email 
subject 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
 See also:
 * {{msg-mw|Pagetriage-notification-add-deletion-tag2}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-body2}}",
-       'pagetriage-notification-add-deletion-tag-email-body2' => "Email body 
for 'add deletion tag' notification.  Parameters:
-* $1 is the username of the person who added deletion tag to the page
-* $2 is the title of the page
-* $3 is the link to the page
-* $4 is the list of deletion tags
-* $5 is the number of deletion tags
-* $6 is the email footer
-See also:
-* {{msg-mw|Pagetriage-notification-add-deletion-tag2}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-flyout}}
-* {{msg-mw|Pagetriage-notification-add-deletion-tag-email-subject2}}",
+* {{msg-mw|Pagetriage-notification-add-deletion-tag-flyout}}",
        '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",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37b11bea948d42749319c136c500112768b54587
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
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

Reply via email to