| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -345,7 +345,7 @@ |
| 346 | 346 | |
| 347 | 347 | function makeGroupNameList( $ids ) { |
| 348 | 348 | if( empty( $ids ) ) { |
| 349 | | - return wfMsgForContent( 'rightsnone' ); |
| | 349 | + return $this->msg( 'rightsnone' )->inContentLanguage()->text(); |
| 350 | 350 | } else { |
| 351 | 351 | return implode( ', ', $ids ); |
| 352 | 352 | } |
| — | — | @@ -367,9 +367,9 @@ |
| 368 | 368 | $this->getOutput()->addHTML( |
| 369 | 369 | Html::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'name' => 'uluser', 'id' => 'mw-userrights-form1' ) ) . |
| 370 | 370 | Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . |
| 371 | | - Xml::fieldset( wfMsg( 'userrights-lookup-user' ) ) . |
| 372 | | - Xml::inputLabel( wfMsg( 'userrights-user-editname' ), 'user', 'username', 30, str_replace( '_', ' ', $this->mTarget ) ) . ' ' . |
| 373 | | - Xml::submitButton( wfMsg( 'editusergroup' ) ) . |
| | 371 | + Xml::fieldset( $this->msg( 'userrights-lookup-user' )->text() ) . |
| | 372 | + Xml::inputLabel( $this->msg( 'userrights-user-editname' )->text(), 'user', 'username', 30, str_replace( '_', ' ', $this->mTarget ) ) . ' ' . |
| | 373 | + Xml::submitButton( $this->msg( 'editusergroup' )->text() ) . |
| 374 | 374 | Html::closeElement( 'fieldset' ) . |
| 375 | 375 | Html::closeElement( 'form' ) . "\n" |
| 376 | 376 | ); |
| — | — | @@ -420,12 +420,12 @@ |
| 421 | 421 | $grouplist = ''; |
| 422 | 422 | $count = count( $list ); |
| 423 | 423 | if( $count > 0 ) { |
| 424 | | - $grouplist = wfMessage( 'userrights-groupsmember', $count)->parse(); |
| | 424 | + $grouplist = $this->msg( 'userrights-groupsmember', $count )->parse(); |
| 425 | 425 | $grouplist = '<p>' . $grouplist . ' ' . $this->getLanguage()->listToText( $list ) . "</p>\n"; |
| 426 | 426 | } |
| 427 | 427 | $count = count( $autolist ); |
| 428 | 428 | if( $count > 0 ) { |
| 429 | | - $autogrouplistintro = wfMessage( 'userrights-groupsmember-auto', $count)->parse(); |
| | 429 | + $autogrouplistintro = $this->msg( 'userrights-groupsmember-auto', $count )->parse(); |
| 430 | 430 | $grouplist .= '<p>' . $autogrouplistintro . ' ' . $this->getLanguage()->listToText( $autolist ) . "</p>\n"; |
| 431 | 431 | } |
| 432 | 432 | |
| — | — | @@ -441,15 +441,15 @@ |
| 442 | 442 | Html::hidden( 'user', $this->mTarget ) . |
| 443 | 443 | Html::hidden( 'wpEditToken', $this->getUser()->getEditToken( $this->mTarget ) ) . |
| 444 | 444 | Xml::openElement( 'fieldset' ) . |
| 445 | | - Xml::element( 'legend', array(), wfMessage( 'userrights-editusergroup', $user->getName() )->text() ) . |
| 446 | | - wfMessage( 'editinguser' )->params( wfEscapeWikiText( $user->getName() ) )->rawParams( $userToolLinks )->parse() . |
| 447 | | - wfMessage( 'userrights-groups-help', $user->getName() )->parse() . |
| | 445 | + Xml::element( 'legend', array(), $this->msg( 'userrights-editusergroup', $user->getName() )->text() ) . |
| | 446 | + $this->msg( 'editinguser' )->params( wfEscapeWikiText( $user->getName() ) )->rawParams( $userToolLinks )->parse() . |
| | 447 | + $this->msg( 'userrights-groups-help', $user->getName() )->parse() . |
| 448 | 448 | $grouplist . |
| 449 | 449 | Xml::tags( 'p', null, $this->groupCheckboxes( $groups, $user ) ) . |
| 450 | 450 | Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-userrights-table-outer' ) ) . |
| 451 | 451 | "<tr> |
| 452 | 452 | <td class='mw-label'>" . |
| 453 | | - Xml::label( wfMsg( 'userrights-reason' ), 'wpReason' ) . |
| | 453 | + Xml::label( $this->msg( 'userrights-reason' )->text(), 'wpReason' ) . |
| 454 | 454 | "</td> |
| 455 | 455 | <td class='mw-input'>" . |
| 456 | 456 | Xml::input( 'user-reason', 60, $this->getRequest()->getVal( 'user-reason', false ), |
| — | — | @@ -459,7 +459,7 @@ |
| 460 | 460 | <tr> |
| 461 | 461 | <td></td> |
| 462 | 462 | <td class='mw-submit'>" . |
| 463 | | - Xml::submitButton( wfMsg( 'saveusergroups' ), |
| | 463 | + Xml::submitButton( $this->msg( 'saveusergroups' )->text(), |
| 464 | 464 | array( 'name' => 'saveusergroups' ) + Linker::tooltipAndAccesskeyAttribs( 'userrights-set' ) ) . |
| 465 | 465 | "</td> |
| 466 | 466 | </tr>" . |
| — | — | @@ -536,7 +536,7 @@ |
| 537 | 537 | foreach( $columns as $name => $column ) { |
| 538 | 538 | if( $column === array() ) |
| 539 | 539 | continue; |
| 540 | | - $ret .= Xml::element( 'th', null, wfMessage( 'userrights-' . $name . '-col', count( $column ) )->text() ); |
| | 540 | + $ret .= Xml::element( 'th', null, $this->msg( 'userrights-' . $name . '-col', count( $column ) )->text() ); |
| 541 | 541 | } |
| 542 | 542 | $ret.= "</tr>\n<tr>\n"; |
| 543 | 543 | foreach( $columns as $column ) { |
| — | — | @@ -548,7 +548,7 @@ |
| 549 | 549 | |
| 550 | 550 | $member = User::getGroupMember( $group, $user->getName() ); |
| 551 | 551 | if ( $checkbox['irreversible'] ) { |
| 552 | | - $text = wfMessage( 'userrights-irreversible-marker', $member )->escaped(); |
| | 552 | + $text = $this->msg( 'userrights-irreversible-marker', $member )->escaped(); |
| 553 | 553 | } else { |
| 554 | 554 | $text = htmlspecialchars( $member ); |
| 555 | 555 | } |