cyberes
/
ProtectedContactPage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move key usermailererror here from core 

This extension was using the key and it was used nowhere else. So moved it
here and prefixed it with the extension name.

Change-Id: Ia2d15b56cbf0dafd9d6e53f0e1cdd71cde331347
This commit is contained in:
Siebrand Mazeland 2014-04-10 09:36:16 +02:00
parent e98e03727e
commit 800bed9ade
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ContactPage_body.php
View File

@ -356,7 +356,7 @@ class SpecialContact extends UnlistedSpecialPage {
if( !$mailResult->isOK() ) { if( !$mailResult->isOK() ) {
wfDebug( __METHOD__ . ': got error from UserMailer: ' . $mailResult->getMessage() . "\n" ); wfDebug( __METHOD__ . ': got error from UserMailer: ' . $mailResult->getMessage() . "\n" );
return wfMessage( 'usermailererror' )->text() . $mailResult->getMessage(); return wfMessage( 'contactpage-usermailererror' )->text() . $mailResult->getMessage();
} }
// if the user requested a copy of this mail, do this now, // if the user requested a copy of this mail, do this now,
@ -374,7 +374,7 @@ class SpecialContact extends UnlistedSpecialPage {
// We can either show them an error, or we can say everything was fine, // We can either show them an error, or we can say everything was fine,
// or we can say we sort of failed AND sort of succeeded. Of these options, // or we can say we sort of failed AND sort of succeeded. Of these options,
// simply saying there was an error is probably best. // simply saying there was an error is probably best.
return wfMessage( 'usermailererror' )->text() . $ccResult->getMessage(); return wfMessage( 'contactpage-usermailererror' )->text() . $ccResult->getMessage();
} }
} }
} }

5
i18n/en.json
View File

@ -16,5 +16,6 @@
"contactpage-fromname": "Your name:", "contactpage-fromname": "Your name:",
"contactpage-fromaddress": "Your email address:", "contactpage-fromaddress": "Your email address:",
"contactpage-formfootnotes": "(needed if you want an answer)", "contactpage-formfootnotes": "(needed if you want an answer)",
"contactpage-includeip": "Include my IP address in this message." "contactpage-includeip": "Include my IP address in this message.",
} "contactpage-usermailererror": "Mail object returned error:"
}

5
i18n/qqq.json
View File

@ -21,5 +21,6 @@
"contactpage-fromname": "{{Identical|Your name}}", "contactpage-fromname": "{{Identical|Your name}}",
"contactpage-fromaddress": "{{Identical|E-mail address}}", "contactpage-fromaddress": "{{Identical|E-mail address}}",
"contactpage-formfootnotes": "Message to notify users that an email address is needed if an answer is required", "contactpage-formfootnotes": "Message to notify users that an email address is needed if an answer is required",
"contactpage-includeip": "Used as checkbox label in the ContactPage form." "contactpage-includeip": "Used as checkbox label in the ContactPage form.",
} "contactpage-usermailererror": "Error message displayed when no email could be sent by the MediWiki UserMailer script."
}