http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88259
Revision: 88259
Author: ialex
Date: 2011-05-16 19:23:21 +0000 (Mon, 16 May 2011)
Log Message:
-----------
OutputPage::addWikiText() with wfMsg() -> OutputPage::addWikiMsg()
Modified Paths:
--------------
trunk/extensions/ConfirmAccount/ConfirmAccount_body.php
trunk/extensions/ConfirmAccount/RequestAccount_body.php
Modified: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php
===================================================================
--- trunk/extensions/ConfirmAccount/ConfirmAccount_body.php 2011-05-16
19:16:01 UTC (rev 88258)
+++ trunk/extensions/ConfirmAccount/ConfirmAccount_body.php 2011-05-16
19:23:21 UTC (rev 88259)
@@ -151,7 +151,7 @@
protected function showQueues() {
global $wgOut, $wgAccountRequestTypes, $wgLang;
- $wgOut->addWikiText( wfMsg('confirmaccount-maintext') );
+ $wgOut->addWikiMsg( 'confirmaccount-maintext' );
$wgOut->addHTML( '<p><strong>' .
wfMsgHtml('confirmaccount-types') . '</strong></p>' );
$wgOut->addHTML( '<ul>' );
@@ -207,7 +207,7 @@
$wgOut->addHTML( '<div class="errorbox">' . $msg .
'</div><div class="visualClear"></div>' );
}
- $wgOut->addWikiText( wfMsg( "confirmaccount-text" ) );
+ $wgOut->addWikiMsg( 'confirmaccount-text' );
if( $row->acr_rejected ) {
$datim = $wgLang->timeanddate( wfTimestamp(TS_MW,
$row->acr_rejected), true );
@@ -808,9 +808,9 @@
$titleObj = SpecialPage::getTitleFor( 'ConfirmAccounts',
$this->specialPageParameter );
$wgOut->setPagetitle( wfMsgHtml('actioncomplete') );
if( $this->submitType == 'accept' ) {
- $wgOut->addWikiText( wfMsg( "confirmaccount-acc", $name
) );
+ $wgOut->addWikiMsg( 'confirmaccount-acc', $name );
} else if( $this->submitType == 'reject' || $this->submitType
== 'spam' ) {
- $wgOut->addWikiText( wfMsg( "confirmaccount-rej" ) );
+ $wgOut->addWikiMsg( 'confirmaccount-rej' );
} else {
$wgOut->redirect( $titleObj->getFullUrl() );
return;
Modified: trunk/extensions/ConfirmAccount/RequestAccount_body.php
===================================================================
--- trunk/extensions/ConfirmAccount/RequestAccount_body.php 2011-05-16
19:16:01 UTC (rev 88258)
+++ trunk/extensions/ConfirmAccount/RequestAccount_body.php 2011-05-16
19:23:21 UTC (rev 88259)
@@ -91,10 +91,10 @@
}
# Give notice to users that are logged in
if ( $wgUser->getID() ) {
- $wgOut->addWikiText( wfMsg( "requestaccount-dup" ) );
+ $wgOut->addWikiMsg( 'requestaccount-dup' );
}
- $wgOut->addWikiText( wfMsg( "requestaccount-text" ) );
+ $wgOut->addWikiMsg( 'requestaccount-text' );
$form = Xml::openElement( 'form', array( 'method' => 'post',
'name' => 'accountrequest',
'action' => $this->getTitle()->getLocalUrl(), 'enctype'
=> 'multipart/form-data' ) );
@@ -216,7 +216,7 @@
$wgOut->addHTML( $form );
- $wgOut->addWikiText( wfMsg( "requestaccount-footer" ) );
+ $wgOut->addWikiMsg( 'requestaccount-footer' );
}
protected function doSubmit() {
@@ -403,7 +403,7 @@
protected function showSuccess() {
global $wgOut;
$wgOut->setPagetitle( wfMsg( "requestaccount" ) );
- $wgOut->addWikiText( wfMsg( "requestaccount-sent" ) );
+ $wgOut->addWikiMsg( 'requestaccount-sent' );
$wgOut->returnToMain();
}
@@ -528,16 +528,16 @@
if ( is_object( $user ) ) {
if ( $user->confirmEmail() ) {
$message = $wgUser->isLoggedIn() ?
'confirmemail_loggedin' : 'confirmemail_success';
- $wgOut->addWikiText( wfMsg( $message ) );
+ $wgOut->addWikiMsg( $message );
if ( !$wgUser->isLoggedIn() ) {
$title = SpecialPage::getTitleFor(
'Userlogin' );
$wgOut->returnToMain( true,
$title->getPrefixedUrl() );
}
} else {
- $wgOut->addWikiText( wfMsg(
'confirmemail_error' ) );
+ $wgOut->addWikiMsg( 'confirmemail_error' );
}
} else {
- $wgOut->addWikiText( wfMsg( 'confirmemail_invalid' ) );
+ $wgOut->addWikiMsg( 'confirmemail_invalid' );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
