https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111963

Revision: 111963
Author:   ialex
Date:     2012-02-20 21:14:12 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Use local context to get messages

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialUserrights.php

Modified: trunk/phase3/includes/specials/SpecialUserrights.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserrights.php        2012-02-20 
21:05:11 UTC (rev 111962)
+++ trunk/phase3/includes/specials/SpecialUserrights.php        2012-02-20 
21:14:12 UTC (rev 111963)
@@ -345,7 +345,7 @@
 
        function makeGroupNameList( $ids ) {
                if( empty( $ids ) ) {
-                       return wfMsgForContent( 'rightsnone' );
+                       return $this->msg( 'rightsnone' 
)->inContentLanguage()->text();
                } else {
                        return implode( ', ', $ids );
                }
@@ -367,9 +367,9 @@
                $this->getOutput()->addHTML(
                        Html::openElement( 'form', array( 'method' => 'get', 
'action' => $wgScript, 'name' => 'uluser', 'id' => 'mw-userrights-form1' ) ) .
                        Html::hidden( 'title',  
$this->getTitle()->getPrefixedText() ) .
-                       Xml::fieldset( wfMsg( 'userrights-lookup-user' ) ) .
-                       Xml::inputLabel( wfMsg( 'userrights-user-editname' ), 
'user', 'username', 30, str_replace( '_', ' ', $this->mTarget ) ) . ' ' .
-                       Xml::submitButton( wfMsg( 'editusergroup' ) ) .
+                       Xml::fieldset( $this->msg( 'userrights-lookup-user' 
)->text() ) .
+                       Xml::inputLabel( $this->msg( 'userrights-user-editname' 
)->text(), 'user', 'username', 30, str_replace( '_', ' ', $this->mTarget ) ) . 
' ' .
+                       Xml::submitButton( $this->msg( 'editusergroup' 
)->text() ) .
                        Html::closeElement( 'fieldset' ) .
                        Html::closeElement( 'form' ) . "\n"
                );
@@ -420,12 +420,12 @@
                $grouplist = '';
                $count = count( $list );
                if( $count > 0 ) {
-                       $grouplist = wfMessage( 'userrights-groupsmember', 
$count)->parse();
+                       $grouplist = $this->msg( 'userrights-groupsmember', 
$count )->parse();
                        $grouplist = '<p>' . $grouplist  . ' ' . 
$this->getLanguage()->listToText( $list ) . "</p>\n";
                }
                $count = count( $autolist );
                if( $count > 0 ) {
-                       $autogrouplistintro = wfMessage( 
'userrights-groupsmember-auto', $count)->parse();
+                       $autogrouplistintro = $this->msg( 
'userrights-groupsmember-auto', $count )->parse();
                        $grouplist .= '<p>' . $autogrouplistintro  . ' ' . 
$this->getLanguage()->listToText( $autolist ) . "</p>\n";
                }
 
@@ -441,15 +441,15 @@
                        Html::hidden( 'user', $this->mTarget ) .
                        Html::hidden( 'wpEditToken', 
$this->getUser()->getEditToken( $this->mTarget ) ) .
                        Xml::openElement( 'fieldset' ) .
-                       Xml::element( 'legend', array(), wfMessage( 
'userrights-editusergroup', $user->getName() )->text() ) .
-                       wfMessage( 'editinguser' )->params( wfEscapeWikiText( 
$user->getName() ) )->rawParams( $userToolLinks )->parse() .
-                       wfMessage( 'userrights-groups-help', $user->getName() 
)->parse() .
+                       Xml::element( 'legend', array(), $this->msg( 
'userrights-editusergroup', $user->getName() )->text() ) .
+                       $this->msg( 'editinguser' )->params( wfEscapeWikiText( 
$user->getName() ) )->rawParams( $userToolLinks )->parse() .
+                       $this->msg( 'userrights-groups-help', $user->getName() 
)->parse() .
                        $grouplist .
                        Xml::tags( 'p', null, $this->groupCheckboxes( $groups, 
$user ) ) .
                        Xml::openElement( 'table', array( 'border' => '0', 'id' 
=> 'mw-userrights-table-outer' ) ) .
                                "<tr>
                                        <td class='mw-label'>" .
-                                               Xml::label( wfMsg( 
'userrights-reason' ), 'wpReason' ) .
+                                               Xml::label( $this->msg( 
'userrights-reason' )->text(), 'wpReason' ) .
                                        "</td>
                                        <td class='mw-input'>" .
                                                Xml::input( 'user-reason', 60, 
$this->getRequest()->getVal( 'user-reason', false ),
@@ -459,7 +459,7 @@
                                <tr>
                                        <td></td>
                                        <td class='mw-submit'>" .
-                                               Xml::submitButton( wfMsg( 
'saveusergroups' ),
+                                               Xml::submitButton( $this->msg( 
'saveusergroups' )->text(),
                                                        array( 'name' => 
'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) .
                                        "</td>
                                </tr>" .
@@ -536,7 +536,7 @@
                foreach( $columns as $name => $column ) {
                        if( $column === array() )
                                continue;
-                       $ret .= Xml::element( 'th', null, wfMessage( 
'userrights-' . $name . '-col', count( $column ) )->text() );
+                       $ret .= Xml::element( 'th', null, $this->msg( 
'userrights-' . $name . '-col', count( $column ) )->text() );
                }
                $ret.= "</tr>\n<tr>\n";
                foreach( $columns as $column ) {
@@ -548,7 +548,7 @@
 
                                $member = User::getGroupMember( $group, 
$user->getName() );
                                if ( $checkbox['irreversible'] ) {
-                                       $text = wfMessage( 
'userrights-irreversible-marker', $member )->escaped();
+                                       $text = $this->msg( 
'userrights-irreversible-marker', $member )->escaped();
                                } else {
                                        $text = htmlspecialchars( $member );
                                }


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to