https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112434
Revision: 112434
Author: ialex
Date: 2012-02-26 13:34:58 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Use local context to get messages
Modified Paths:
--------------
trunk/phase3/includes/specials/SpecialImport.php
Modified: trunk/phase3/includes/specials/SpecialImport.php
===================================================================
--- trunk/phase3/includes/specials/SpecialImport.php 2012-02-26 13:08:41 UTC
(rev 112433)
+++ trunk/phase3/includes/specials/SpecialImport.php 2012-02-26 13:34:58 UTC
(rev 112434)
@@ -179,7 +179,7 @@
if( $user->isAllowed( 'importupload' ) ) {
$out->addWikiMsg( "importtext" );
$out->addHTML(
- Xml::fieldset( wfMsg( 'import-upload' ) ).
+ Xml::fieldset( $this->msg( 'import-upload'
)->text() ).
Xml::openElement( 'form', array( 'enctype' =>
'multipart/form-data', 'method' => 'post',
'action' => $action, 'id' =>
'mw-import-upload-form' ) ) .
Html::hidden( 'action', 'submit' ) .
@@ -188,7 +188,7 @@
"<tr>
<td class='mw-label'>" .
- Xml::label( wfMsg(
'import-upload-filename' ), 'xmlimport' ) .
+ Xml::label( $this->msg(
'import-upload-filename' )->text(), 'xmlimport' ) .
"</td>
<td class='mw-input'>" .
Xml::input( 'xmlimport', 50,
'', array( 'type' => 'file' ) ) . ' ' .
@@ -196,7 +196,7 @@
</tr>
<tr>
<td class='mw-label'>" .
- Xml::label( wfMsg(
'import-comment' ), 'mw-import-comment' ) .
+ Xml::label( $this->msg(
'import-comment' )->text(), 'mw-import-comment' ) .
"</td>
<td class='mw-input'>" .
Xml::input( 'log-comment', 50,
'',
@@ -206,7 +206,7 @@
<tr>
<td></td>
<td class='mw-submit'>" .
- Xml::submitButton( wfMsg(
'uploadbtn' ) ) .
+ Xml::submitButton( $this->msg(
'uploadbtn' )->text() ) .
"</td>
</tr>" .
Xml::closeElement( 'table' ).
@@ -226,7 +226,7 @@
if( $wgExportMaxLinkDepth > 0 ) {
$importDepth = "<tr>
<td class='mw-label'>" .
- wfMsgExt(
'export-pagelinks', 'parseinline' ) .
+ $this->msg(
'export-pagelinks' )->parse() .
"</td>
<td class='mw-input'>" .
Xml::input(
'pagelink-depth', 3, 0 ) .
@@ -235,16 +235,16 @@
}
$out->addHTML(
- Xml::fieldset( wfMsg( 'importinterwiki' ) ) .
+ Xml::fieldset( $this->msg( 'importinterwiki'
)->text() ) .
Xml::openElement( 'form', array( 'method' =>
'post', 'action' => $action, 'id' => 'mw-import-interwiki-form' ) ) .
- wfMsgExt( 'import-interwiki-text', array(
'parse' ) ) .
+ $this->msg( 'import-interwiki-text'
)->parseAsBlock() .
Html::hidden( 'action', 'submit' ) .
Html::hidden( 'source', 'interwiki' ) .
Html::hidden( 'editToken',
$user->getEditToken() ) .
Xml::openElement( 'table', array( 'id' =>
'mw-import-table' ) ) .
"<tr>
<td class='mw-label'>" .
- Xml::label( wfMsg(
'import-interwiki-source' ), 'interwiki' ) .
+ Xml::label( $this->msg(
'import-interwiki-source' )->text(), 'interwiki' ) .
"</td>
<td class='mw-input'>" .
Xml::openElement( 'select',
array( 'name' => 'interwiki' ) )
@@ -263,20 +263,20 @@
<td>
</td>
<td class='mw-input'>" .
- Xml::checkLabel( wfMsg(
'import-interwiki-history' ), 'interwikiHistory', 'interwikiHistory',
$this->history ) .
+ Xml::checkLabel( $this->msg(
'import-interwiki-history' )->text(), 'interwikiHistory', 'interwikiHistory',
$this->history ) .
"</td>
</tr>
<tr>
<td>
</td>
<td class='mw-input'>" .
- Xml::checkLabel( wfMsg(
'import-interwiki-templates' ), 'interwikiTemplates', 'interwikiTemplates',
$this->includeTemplates ) .
+ Xml::checkLabel( $this->msg(
'import-interwiki-templates' )->text(), 'interwikiTemplates',
'interwikiTemplates', $this->includeTemplates ) .
"</td>
</tr>
$importDepth
<tr>
<td class='mw-label'>" .
- Xml::label( wfMsg(
'import-interwiki-namespace' ), 'namespace' ) .
+ Xml::label( $this->msg(
'import-interwiki-namespace' )->text(), 'namespace' ) .
"</td>
<td class='mw-input'>" .
Xml::namespaceSelector(
$this->namespace, '' ) .
@@ -284,7 +284,7 @@
</tr>
<tr>
<td class='mw-label'>" .
- Xml::label( wfMsg(
'import-comment' ), 'mw-interwiki-comment' ) .
+ Xml::label( $this->msg(
'import-comment' )->text(), 'mw-interwiki-comment' ) .
"</td>
<td class='mw-input'>" .
Xml::input( 'log-comment', 50,
'',
@@ -295,7 +295,7 @@
<td>
</td>
<td class='mw-submit'>" .
- Xml::submitButton( wfMsg(
'import-interwiki-submit' ), Linker::tooltipAndAccesskeyAttribs( 'import' ) ) .
+ Xml::submitButton( $this->msg(
'import-interwiki-submit' )->text(), Linker::tooltipAndAccesskeyAttribs(
'import' ) ) .
"</td>
</tr>" .
Xml::closeElement( 'table' ).
@@ -369,25 +369,25 @@
if( $successCount > 0 ) {
$this->getOutput()->addHTML( "<li>" .
Linker::linkKnown( $title ) . " " .
- wfMsgExt( 'import-revision-count', array(
'parsemag', 'escape' ), $localCount ) .
+ $this->msg( 'import-revision-count',
$localCount ) .
"</li>\n"
);
$log = new LogPage( 'import' );
if( $this->mIsUpload ) {
- $detail = wfMsgExt(
'import-logentry-upload-detail', array( 'content', 'parsemag' ),
- $contentCount );
+ $detail = $this->msg(
'import-logentry-upload-detail',
+ $contentCount
)->inContentLanguage()->text();
if ( $this->reason ) {
- $detail .= wfMsgForContent(
'colon-separator' ) . $this->reason;
+ $detail .= $this->msg(
'colon-separator' )->inContentLanguage()->text() . $this->reason;
}
$log->addEntry( 'upload', $title, $detail );
} else {
$interwiki = '[[:' . $this->mInterwiki . ':' .
$origTitle->getPrefixedText() . ']]';
- $detail = wfMsgExt(
'import-logentry-interwiki-detail', array( 'content', 'parsemag' ),
- $contentCount, $interwiki );
+ $detail = $this->msg(
'import-logentry-interwiki-detail',
+ $contentCount, $interwiki
)->inContentLanguage()->text();
if ( $this->reason ) {
- $detail .= wfMsgForContent(
'colon-separator' ) . $this->reason;
+ $detail .= $this->msg(
'colon-separator' )->inContentLanguage()->text() . $this->reason;
}
$log->addEntry( 'interwiki', $title, $detail );
}
@@ -405,15 +405,14 @@
}
} else {
$this->getOutput()->addHTML( "<li>" .
Linker::linkKnown( $title ) . " " .
- wfMsgHtml( 'import-nonewrevisions' ) .
"</li>\n" );
+ $this->msg( 'import-nonewrevisions'
)->escaped() . "</li>\n" );
}
}
function close() {
$out = $this->getOutput();
if ( $this->mLogItemCount > 0 ) {
- $msg = wfMsgExt( 'imported-log-entries', 'parseinline',
-
$this->getLanguage()->formatNum( $this->mLogItemCount ) );
+ $msg = $this->msg( 'imported-log-entries' )->numParams(
$this->mLogItemCount )->parse();
$out->addHTML( Xml::tags( 'li', null, $msg ) );
} elseif( $this->mPageCount == 0 && $this->mLogItemCount == 0 )
{
$out->addHTML( "</ul>\n" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
