https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113234
Revision: 113234
Author: emsmith
Date: 2012-03-07 14:30:06 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
bug 35020 - change the oversight email copy - again
Modified Paths:
--------------
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-07 14:29:45 UTC (rev 113233)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
2012-03-07 14:30:06 UTC (rev 113234)
@@ -391,25 +391,30 @@
'articlefeedbackv5-email-request-oversight-body' => 'Hello,
oversighters!
-Oversight was requested by <user name - $4 : $1> for feedback posted on this
article:
+Oversight was requested by $1 for feedback posted on this article:
-<Article title - $5 : $2>
+$2
-Please review this feedback post, then approve or decline this oversight
request:
+Please review this feedback post, then approve or decline this oversight
+request:
-<permalink of feedback post for which oversight was requested - $3>
+$3
-If you have any questions about using the oversight features of the feedback
page, please check this <oversighter feedback FAQ - $6> or contact community
liaison <Oliver Keyes $7>.
-
Thank you,
The {{SITENAME}} Team
-P.S.: Please note that the article feedback feature v5 is still in early
stages of testing on the English Encyclopedia (0.6%, or 22k articles) and that
the feedback page has not been publicized to the community during this testing
period.
-',
+P.S.: If you have any questions about using the oversight features of the
+article feedback page, please check this oversighter FAQ:
+$4
+
+Please note that the article feedback tool v5 is still in early stages of
+testing on the English Encyclopedia and that the feedback page has not been
+publicized to the community for this testing period.',
+
);
/** Message documentation (Message documentation)
@@ -673,13 +678,10 @@
* <code>$3</code> – Confirmation code for the user to type in',
'articlefeedbackv5-email-request-oversight-subject' => 'Subject line
for email sent to oversight mailing list when an oversight request has been
made.',
'articlefeedbackv5-email-request-oversight-body' => 'Body of an email
sent to the oversight mailing list when an oversight request has been made.
-* <code>$1</code> – URL of user who requested oversight
-* <code>$2</code> – URL of page with feedback requiring oversight
+* <code>$1</code> – User name of requestor
+* <code>$2</code> – Page name of item with feedback requiring oversight.
* <code>$3</code> – URL directly to feedback location
-* <code>$4</code> – User name of requestor
-* <code>$5</code> – Page name of item with feedback requiring oversight.
-* <code>$6</code> – the help link.
-* <code>$7</code> – Oliver Keyes user page link.',
+* <code>$4</code> – The help link.',
);
/** Afrikaans (Afrikaans)
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-07
14:29:45 UTC (rev 113233)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php 2012-03-07
14:30:06 UTC (rev 113234)
@@ -21,10 +21,6 @@
// Help link for oversight email
$wgArticleFeedbackv5OversightEmailHelp =
'http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help/Feedback_page_Oversighters';
-// admin User page for oversight email
-$wgArticleFeedbackv5OversightEmailAdminUser =
'http://en.wikipedia.org/wiki/User:Okeyes_(WMF)';
-
-
// How long text-based feedback is allowed to be before returning an error.
// Set to 0 to disable length checking entirely.
$wgArticleFeedbackv5MaxCommentLength = 0;
Modified: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php
===================================================================
--- trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php
2012-03-07 14:29:45 UTC (rev 113233)
+++ trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php
2012-03-07 14:30:06 UTC (rev 113234)
@@ -80,22 +80,20 @@
*/
protected function composeMail( $requestor_name, $requestor_url,
$page_name, $page_url, $feedback_permalink ) {
global $wgPasswordSender, $wgPasswordSenderName,
$wgNoReplyAddress, $wgRequest;
- global $wgArticleFeedbackv5OversightEmailHelp,
$wgArticleFeedbackv5OversightEmailAdminUser;
+ global $wgArticleFeedbackv5OversightEmailHelp;
// build the subject
$subject = wfMessage(
'articlefeedbackv5-email-request-oversight-subject' )->escaped();
//text version, no need to escape since client will interpret
it as plain text
$body = wfMessage(
'articlefeedbackv5-email-request-oversight-body' )
+ ->params(
+ $requestor_name,
+ $page_name)
->rawParams(
- $requestor_url,
- $page_url,
$feedback_permalink)
->params(
- $requestor_name,
- $page_name,
- $wgArticleFeedbackv5OversightEmailHelp,
-
$wgArticleFeedbackv5OversightEmailAdminUser)
+ $wgArticleFeedbackv5OversightEmailHelp)
->text();
return array($subject, $body);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
