| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -391,25 +391,30 @@ |
| 392 | 392 | |
| 393 | 393 | 'articlefeedbackv5-email-request-oversight-body' => 'Hello, oversighters! |
| 394 | 394 | |
| 395 | | -Oversight was requested by <user name - $4 : $1> for feedback posted on this article: |
| | 395 | +Oversight was requested by $1 for feedback posted on this article: |
| 396 | 396 | |
| 397 | | -<Article title - $5 : $2> |
| | 397 | +$2 |
| 398 | 398 | |
| 399 | | -Please review this feedback post, then approve or decline this oversight request: |
| | 399 | +Please review this feedback post, then approve or decline this oversight |
| | 400 | +request: |
| 400 | 401 | |
| 401 | | -<permalink of feedback post for which oversight was requested - $3> |
| | 402 | +$3 |
| 402 | 403 | |
| 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>. |
| 404 | | - |
| 405 | 404 | Thank you, |
| 406 | 405 | |
| 407 | 406 | |
| 408 | 407 | The {{SITENAME}} Team |
| 409 | 408 | |
| 410 | 409 | |
| 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 | | -', |
| | 410 | +P.S.: If you have any questions about using the oversight features of the |
| | 411 | +article feedback page, please check this oversighter FAQ: |
| 413 | 412 | |
| | 413 | +$4 |
| | 414 | + |
| | 415 | +Please note that the article feedback tool v5 is still in early stages of |
| | 416 | +testing on the English Encyclopedia and that the feedback page has not been |
| | 417 | +publicized to the community for this testing period.', |
| | 418 | + |
| 414 | 419 | ); |
| 415 | 420 | |
| 416 | 421 | /** Message documentation (Message documentation) |
| — | — | @@ -673,13 +678,10 @@ |
| 674 | 679 | * <code>$3</code> – Confirmation code for the user to type in', |
| 675 | 680 | 'articlefeedbackv5-email-request-oversight-subject' => 'Subject line for email sent to oversight mailing list when an oversight request has been made.', |
| 676 | 681 | 'articlefeedbackv5-email-request-oversight-body' => 'Body of an email sent to the oversight mailing list when an oversight request has been made. |
| 677 | | -* <code>$1</code> – URL of user who requested oversight |
| 678 | | -* <code>$2</code> – URL of page with feedback requiring oversight |
| | 682 | +* <code>$1</code> – User name of requestor |
| | 683 | +* <code>$2</code> – Page name of item with feedback requiring oversight. |
| 679 | 684 | * <code>$3</code> – URL directly to feedback location |
| 680 | | -* <code>$4</code> – User name of requestor |
| 681 | | -* <code>$5</code> – Page name of item with feedback requiring oversight. |
| 682 | | -* <code>$6</code> – the help link. |
| 683 | | -* <code>$7</code> – Oliver Keyes user page link.', |
| | 685 | +* <code>$4</code> – The help link.', |
| 684 | 686 | ); |
| 685 | 687 | |
| 686 | 688 | /** Afrikaans (Afrikaans) |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -21,10 +21,6 @@ |
| 22 | 22 | // Help link for oversight email |
| 23 | 23 | $wgArticleFeedbackv5OversightEmailHelp = 'http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help/Feedback_page_Oversighters'; |
| 24 | 24 | |
| 25 | | -// admin User page for oversight email |
| 26 | | -$wgArticleFeedbackv5OversightEmailAdminUser = 'http://en.wikipedia.org/wiki/User:Okeyes_(WMF)'; |
| 27 | | - |
| 28 | | - |
| 29 | 25 | // How long text-based feedback is allowed to be before returning an error. |
| 30 | 26 | // Set to 0 to disable length checking entirely. |
| 31 | 27 | $wgArticleFeedbackv5MaxCommentLength = 0; |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5MailerJob.php |
| — | — | @@ -80,22 +80,20 @@ |
| 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 | + global $wgArticleFeedbackv5OversightEmailHelp; |
| 85 | 85 | |
| 86 | 86 | // build the subject |
| 87 | 87 | $subject = wfMessage( 'articlefeedbackv5-email-request-oversight-subject' )->escaped(); |
| 88 | 88 | |
| 89 | 89 | //text version, no need to escape since client will interpret it as plain text |
| 90 | 90 | $body = wfMessage( 'articlefeedbackv5-email-request-oversight-body' ) |
| | 91 | + ->params( |
| | 92 | + $requestor_name, |
| | 93 | + $page_name) |
| 91 | 94 | ->rawParams( |
| 92 | | - $requestor_url, |
| 93 | | - $page_url, |
| 94 | 95 | $feedback_permalink) |
| 95 | 96 | ->params( |
| 96 | | - $requestor_name, |
| 97 | | - $page_name, |
| 98 | | - $wgArticleFeedbackv5OversightEmailHelp, |
| 99 | | - $wgArticleFeedbackv5OversightEmailAdminUser) |
| | 97 | + $wgArticleFeedbackv5OversightEmailHelp) |
| 100 | 98 | ->text(); |
| 101 | 99 | |
| 102 | 100 | return array($subject, $body); |