Also added an error message when the mails were not sent.
Documented the new messages plus some older ones.
Note: $successCount and $failCount fields of Status are ugly to use.
* New title field of Special:MovePage is now length limited on client side.
* (bug 28888) Searching for something starting with a # sign no longer tells
the user a page named [[:]] already exists.
+* (bug 28960) Added more messages to Special:EmailUser.
=== API changes in 1.19 ===
* (bug 27790) add query type for querymodules to action=paraminfo
if( $result === true || ( $result instanceof Status && $result->isGood() ) ) {
$wgOut->setPageTitle( wfMsg( 'emailsent' ) );
$wgOut->addWikiMsg( 'emailsenttext' );
- $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() );
+ if ( $status->successCount > 1 ) $wgOut->addWikiMsg( 'emailyougotcopy' );
+ } elseif ( $result instanceof Status ) {
+ if ( $status->successCount == 0 ) {
+ $wgOut->setPageTitle( wfMsg( 'emailnotsent' ) );
+ $wgOut->addWikiMsg( $result->getWikiText( 'emailfailed' ) );
+ } elseif ( $status->failCount ) {
+ $wgOut->setPageTitle( wfMsg( 'emailsent' ) );
+ $wgOut->addWikiMsg( 'emailsenttext' );
+ $wgOut->addWikiMsg( $result->getWikiText( 'emailccfailed' ) );
+ }
}
+ $wgOut->returnToMain( false, $this->mTargetObj->getUserPage() );
}
/**
if( !$status->isGood() ) {
return $status;
} else {
+ $status->successCount++;
+
// if the user requested a copy of this mail, do this now,
// unless they are emailing themselves, in which case one
// copy of the message is sufficient.
);
wfRunHooks( 'EmailUserCC', array( &$from, &$from, &$cc_subject, &$text ) );
$ccStatus = UserMailer::send( $from, $from, $cc_subject, $text );
+ if ( $ccStatus->isGood() ) {
+ $ccStatus->successCount++;
+ } else {
+ $ccStatus->failCount++;
+ }
$status->merge( $ccStatus );
}
'emailccme' => 'E-mail me a copy of my message.',
'emailccsubject' => 'Copy of your message to $1: $2',
'emailsent' => 'E-mail sent',
+'emailnotsent' => 'E-mail not sent',
'emailsenttext' => 'Your e-mail message has been sent.',
+'emailyougotcopy' => 'A copy of the e-mail has been sent to you.',
+'emailfailed' => 'The e-mail could not be sent: $1',
+'emailccfailed' => 'Your e-mail copy could not be sent: $1',
'emailuserfooter' => 'This e-mail was sent by $1 to $2 by the "E-mail user" function at {{SITENAME}}.',
# User Messenger
{{Identical|Send}}',
'emailccme' => 'Used at [[Special:Preferences]] > E-mail',
'emailccsubject' => 'Subject of the carbon-copied email for the sender sent through MediaWiki.',
+'emailsent' => 'Title of Special:Emailuser when it says you it sent an email',
+'emailnotsent' => 'Title of Special:Emailuser when it says you it did not sent the email',
+'emailsenttext' => 'When you send an e-mail, Special:Emailuser says you this (Your email has been sent).',
+'emailyougotcopy' => 'Shown below emailsenttext when \'e-mail em a copy\' was chosen.',
+'emailfailed' => 'Error message when sending of the main e-mail failed (cc one is not even tried). The actual error is given as parameter.',
+'emailccfailed' => 'Error message when the e-mail was sent but the user copy was not. The actual error is given as parameter.',
+
+
+'emailyougotcopy' => 'Shown below emailsenttext if you chose "send me a copy".',
'emailuserfooter' => 'This message is appended to every email sent through the "Email user" function.
* $1: username of the sender