| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -387,26 +387,29 @@ |
| 388 | 388 | Best wishes, and thank you, |
| 389 | 389 | The {{SITENAME}} team', |
| 390 | 390 | |
| 391 | | - 'articlefeedbackv5-email-request-oversight-subject' => '$1 has requested oversight on $2', |
| 392 | | - 'articlefeedbackv5-email-request-oversight-body' => 'Hello! |
| | 391 | + 'articlefeedbackv5-email-request-oversight-subject' => 'Oversight requested for article feedback page', |
| 393 | 392 | |
| 394 | | -A request for oversight has been made by |
| | 393 | + 'articlefeedbackv5-email-request-oversight-body' => 'Hello, oversighters! |
| 395 | 394 | |
| 396 | | -$4 : $1 |
| | 395 | +Oversight was requested by <user name - $4 : $1> for feedback posted on this article: |
| 397 | 396 | |
| 398 | | -for page |
| | 397 | +<Article title - $5 : $2> |
| 399 | 398 | |
| 400 | | -$5 : $2 |
| | 399 | +Please review this feedback post, then approve or decline this oversight request: |
| 401 | 400 | |
| 402 | | -Please visit feedback item |
| | 401 | +<permalink of feedback post for which oversight was requested - $3> |
| 403 | 402 | |
| 404 | | -$3 |
| | 403 | +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>. |
| 405 | 404 | |
| 406 | | -to decline or approve this oversight request. |
| 407 | | - |
| 408 | 405 | Thank you, |
| 409 | | -The {{SITENAME}} team', |
| 410 | 406 | |
| | 407 | + |
| | 408 | +The {{SITENAME}} Team |
| | 409 | + |
| | 410 | + |
| | 411 | +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. |
| | 412 | +', |
| | 413 | + |
| 411 | 414 | ); |
| 412 | 415 | |
| 413 | 416 | /** Message documentation (Message documentation) |
| — | — | @@ -667,15 +670,15 @@ |
| 668 | 671 | * <code>$1</code> – URL of the confirmation link |
| 669 | 672 | * <code>$2</code> – URL to type in the confirmation code manually. |
| 670 | 673 | * <code>$3</code> – Confirmation code for the user to type in', |
| 671 | | - 'articlefeedbackv5-email-request-oversight-subject' => 'Subject line for email sent to oversight mailing list when an oversight request has been made. |
| 672 | | -* <code>$1</code> – User name of requestor |
| 673 | | -* <code>$2</code> – Page name of item with feedback requiring oversight.', |
| | 674 | + 'articlefeedbackv5-email-request-oversight-subject' => 'Subject line for email sent to oversight mailing list when an oversight request has been made.', |
| 674 | 675 | 'articlefeedbackv5-email-request-oversight-body' => 'Body of an email sent to the oversight mailing list when an oversight request has been made. |
| 675 | 676 | * <code>$1</code> – URL of user who requested oversight |
| 676 | 677 | * <code>$2</code> – URL of page with feedback requiring oversight |
| 677 | 678 | * <code>$3</code> – URL directly to feedback location |
| 678 | 679 | * <code>$4</code> – User name of requestor |
| 679 | | -* <code>$5</code> – Page name of item with feedback requiring oversight.', |
| | 680 | +* <code>$5</code> – Page name of item with feedback requiring oversight. |
| | 681 | +* <code>$6</code> – the help link. |
| | 682 | +* <code>$7</code> – Oliver Keyes user page link.', |
| 680 | 683 | ); |
| 681 | 684 | |
| 682 | 685 | /** Afrikaans (Afrikaans) |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -15,12 +15,16 @@ |
| 16 | 16 | // Email address to send oversight request emails to, if set to null no emails are sent |
| 17 | 17 | $wgArticleFeedbackv5OversightEmails = null; |
| 18 | 18 | |
| 19 | | -// Should eventually be this, let's NOT flood that list with bogus emails |
| 20 | | -// $wgArticleFeedbackv5OversightEmails = 'stewards@wikimedia.org'; |
| 21 | | - |
| 22 | 19 | // Name to send oversight request emails to |
| 23 | 20 | $wgArticleFeedbackv5OversightEmailName = 'Oversighters'; |
| 24 | 21 | |
| | 22 | +// Help link for oversight email |
| | 23 | +$wgArticleFeedbackv5OversightEmailHelp = 'http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help/Feedback_page_Oversighters'; |
| | 24 | + |
| | 25 | +// admin User page for oversight email |
| | 26 | +$wgArticleFeedbackv5OversightEmailAdminUser = 'http://en.wikipedia.org/wiki/User:Okeyes_(WMF)'; |
| | 27 | + |
| | 28 | + |
| 25 | 29 | // How long text-based feedback is allowed to be before returning an error. |
| 26 | 30 | // Set to 0 to disable length checking entirely. |
| 27 | 31 | $wgArticleFeedbackv5MaxCommentLength = 0; |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php |
| — | — | @@ -80,11 +80,10 @@ |
| 81 | 81 | */ |
| 82 | 82 | protected function composeMail( $requestor_name, $requestor_url, $page_name, $page_url, $feedback_permalink ) { |
| 83 | 83 | global $wgPasswordSender, $wgPasswordSenderName, $wgNoReplyAddress, $wgRequest; |
| | 84 | + global $wgArticleFeedbackv5OversightEmailHelp, $wgArticleFeedbackv5OversightEmailAdminUser; |
| 84 | 85 | |
| 85 | 86 | // build the subject |
| 86 | | - $subject = wfMessage( 'articlefeedbackv5-email-request-oversight-subject' )->params( |
| 87 | | - $requestor_name, |
| 88 | | - $page_name )->escaped(); |
| | 87 | + $subject = wfMessage( 'articlefeedbackv5-email-request-oversight-subject' )->escaped(); |
| 89 | 88 | |
| 90 | 89 | //text version, no need to escape since client will interpret it as plain text |
| 91 | 90 | $body = wfMessage( 'articlefeedbackv5-email-request-oversight-body' ) |
| — | — | @@ -94,7 +93,9 @@ |
| 95 | 94 | $feedback_permalink) |
| 96 | 95 | ->params( |
| 97 | 96 | $requestor_name, |
| 98 | | - $page_name) |
| | 97 | + $page_name, |
| | 98 | + $wgArticleFeedbackv5OversightEmailHelp, |
| | 99 | + $wgArticleFeedbackv5OversightEmailAdminUser) |
| 99 | 100 | ->text(); |
| 100 | 101 | |
| 101 | 102 | return array($subject, $body); |