Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70761
Change subject: Update email copy and remove unused messages
......................................................................
Update email copy and remove unused messages
Do not merge till 69964 and 70112 are merged
Change-Id: I65ed3f92178d8f343cac810c3258d0cd28bb882e
---
M PageTriage.hooks.php
M PageTriage.i18n.php
2 files changed, 22 insertions(+), 103 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/61/70761/1
diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 32f016f..207a674 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',
@@ -508,11 +506,9 @@
'title-params' => array( 'agent', 'title',
'tag' ),
'flyout-message' =>
'pagetriage-notification-add-maintenance-tag-flyout',
'flyout-params' => array( 'agent', 'title',
'tag' ),
- 'email-subject-message' =>
'pagetriage-notification-add-maintenance-tag-email-subject2',
+ 'email-subject-message' =>
'pagetriage-notification-mark-as-reviewed-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-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',
);
@@ -527,11 +523,9 @@
'title-params' => array( 'agent', 'title',
'tag' ),
'flyout-message' =>
'pagetriage-notification-add-deletion-tag-flyout',
'flyout-params' => array( 'agent', 'title',
'tag' ),
- 'email-subject-message' =>
'pagetriage-notification-add-deletion-tag-email-subject2',
+ 'email-subject-message' =>
'pagetriage-notification-mark-as-reviewed-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-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 9fd61d6..1177e0e 100644
--- a/PageTriage.i18n.php
+++ b/PageTriage.i18n.php
@@ -377,41 +377,17 @@
// 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-body2' => '$2 was
{{GENDER:$1|reviewed}} by {{SITENAME}} user $1:
-
-View more:
-
-$3
-
-$4',
+ 'pagetriage-notification-mark-as-reviewed-email-subject2' => '$2 was
{{GENDER:$1|reviewed}} on {{SITENAME}}',
'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' => '$2 was
{{GENDER:$1|tagged}} by $1',
- '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|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-body2' => '$2 was
{{GENDER:$1|marked for deletion}} by {{SITENAME}} user $1.
+ 'pagetriage-notification-add-deletion-tag-email-batch-body' => '$1 was
{{GENDER:$2|marked for deletion}} by $2',
-{{PLURAL:$5|Tag|Tags}}: $4
-
-View more:
-
-$3
-
-$6',
'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}}',
@@ -882,35 +858,22 @@
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}}",
- 'pagetriage-notification-mark-as-reviewed-email-subject2' => "Email
subject for 'mark as reviewed' notification. Parameters:
+* {{msg-mw|Pagetriage-notification-mark-as-reviewed-email-subject2}}",
+ 'pagetriage-notification-mark-as-reviewed-email-subject2' => "Email
subject for 'mark as reviewed', 'add maintenance tag' and 'add deletion tag'
notifications. 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}}",
- 'pagetriage-notification-mark-as-reviewed-email-batch-body' => "Email
batch body for 'mark as reviewed', 'add maintenance tag' and 'add deletion
tag'. Parameters:
+* {{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'. Parameters:
* $1 is the title of the page
* $2 is the username of the person who reviewed the page
See also:
@@ -918,78 +881,40 @@
* {{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}}",
+ 'pagetriage-notification-add-maintenance-tag-email-batch-body' =>
"Email batch body for 'add maintenance tag'. Parameters:
+* $1 is the title of the page
+* $2 is the username of the person who added maintenance tag",
+ 'pagetriage-notification-add-deletion-tag-email-batch-body' => "Email
batch body for 'add deletion tag'. Parameters:
+* $1 is the title of the page
+* $2 is the username of the person who added deletion tag",
'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
* $3 is the list of maintenance tags
* $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-flyout}}",
'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
* $3 is the list of maintenance tags
* $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}}",
- '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-tag2}}",
'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
* $3 is the list of deletion tags
* $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-flyout}}",
'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
* $3 - the list of deletion tags
* $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}}",
- '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-tag2}}",
'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/70761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65ed3f92178d8f343cac810c3258d0cd28bb882e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
