| Index: trunk/phase3/includes/specials/SpecialListusers.php |
| — | — | @@ -151,23 +151,23 @@ |
| 152 | 152 | |
| 153 | 153 | global $wgEdititis; |
| 154 | 154 | if ( $wgEdititis ) { |
| 155 | | - $editCount = $lang->formatNum( $row->edits ); |
| 156 | | - $edits = ' [' . wfMsgExt( 'usereditcount', array( 'parsemag', 'escape' ), $editCount ) . ']'; |
| | 155 | + $edits = ' [' . $this->msg( 'usereditcount' )->numParams( $row->edits )->escaped() . ']'; |
| 157 | 156 | } else { |
| 158 | 157 | $edits = ''; |
| 159 | 158 | } |
| 160 | 159 | |
| 161 | 160 | $userTalkPage = $userPage->getTalkPage(); |
| 162 | | - $talk = Linker::link( $userTalkPage, wfMessage( 'talkpagelinktext' )->escaped() ); |
| 163 | | - $talk = ' ' . wfMessage( 'parentheses' )->rawParams( $talk )->escaped(); |
| | 161 | + $talk = Linker::link( $userTalkPage, $this->msg( 'talkpagelinktext' )->escaped() ); |
| | 162 | + $talk = ' ' . $this->msg( 'parentheses' )->rawParams( $talk )->escaped(); |
| 164 | 163 | |
| 165 | 164 | $created = ''; |
| 166 | 165 | # Some rows may be NULL |
| 167 | 166 | if( $row->creation ) { |
| 168 | | - $d = $lang->date( wfTimestamp( TS_MW, $row->creation ), true ); |
| 169 | | - $t = $lang->time( wfTimestamp( TS_MW, $row->creation ), true ); |
| 170 | | - $created = wfMsgExt( 'usercreated', array( 'parsemag', 'escape' ), $d, $t, $row->user_name ); |
| 171 | | - $created = ' ' . wfMessage( 'parentheses' )->rawParams( $created )->escaped(); |
| | 167 | + $user = $this->getUser(); |
| | 168 | + $d = $lang->userDate( $row->creation, $user ); |
| | 169 | + $t = $lang->userTime( $row->creation, $user ); |
| | 170 | + $created = $this->msg( 'usercreated', $d, $t, $row->user_name )->escaped(); |
| | 171 | + $created = ' ' . $this->msg( 'parentheses' )->rawParams( $created )->escaped(); |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | wfRunHooks( 'SpecialListusersFormatRow', array( &$item, $row ) ); |
| — | — | @@ -195,30 +195,30 @@ |
| 196 | 196 | |
| 197 | 197 | # Form tag |
| 198 | 198 | $out = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-listusers-form' ) ) . |
| 199 | | - Xml::fieldset( wfMsg( 'listusers' ) ) . |
| | 199 | + Xml::fieldset( $this->msg( 'listusers' )->text() ) . |
| 200 | 200 | Html::hidden( 'title', $self ); |
| 201 | 201 | |
| 202 | 202 | # Username field |
| 203 | | - $out .= Xml::label( wfMsg( 'listusersfrom' ), 'offset' ) . ' ' . |
| | 203 | + $out .= Xml::label( $this->msg( 'listusersfrom' )->text(), 'offset' ) . ' ' . |
| 204 | 204 | Xml::input( 'username', 20, $this->requestedUser, array( 'id' => 'offset' ) ) . ' '; |
| 205 | 205 | |
| 206 | 206 | # Group drop-down list |
| 207 | | - $out .= Xml::label( wfMsg( 'group' ), 'group' ) . ' ' . |
| | 207 | + $out .= Xml::label( $this->msg( 'group' )->text(), 'group' ) . ' ' . |
| 208 | 208 | Xml::openElement('select', array( 'name' => 'group', 'id' => 'group' ) ) . |
| 209 | | - Xml::option( wfMsg( 'group-all' ), '' ); |
| | 209 | + Xml::option( $this->msg( 'group-all' )->text(), '' ); |
| 210 | 210 | foreach( $this->getAllGroups() as $group => $groupText ) |
| 211 | 211 | $out .= Xml::option( $groupText, $group, $group == $this->requestedGroup ); |
| 212 | 212 | $out .= Xml::closeElement( 'select' ) . '<br />'; |
| 213 | | - $out .= Xml::checkLabel( wfMsg('listusers-editsonly'), 'editsOnly', 'editsOnly', $this->editsOnly ); |
| | 213 | + $out .= Xml::checkLabel( $this->msg( 'listusers-editsonly' )->text(), 'editsOnly', 'editsOnly', $this->editsOnly ); |
| 214 | 214 | $out .= ' '; |
| 215 | | - $out .= Xml::checkLabel( wfMsg('listusers-creationsort'), 'creationSort', 'creationSort', $this->creationSort ); |
| | 215 | + $out .= Xml::checkLabel( $this->msg( 'listusers-creationsort' )->text(), 'creationSort', 'creationSort', $this->creationSort ); |
| 216 | 216 | $out .= '<br />'; |
| 217 | 217 | |
| 218 | 218 | wfRunHooks( 'SpecialListusersHeaderForm', array( $this, &$out ) ); |
| 219 | 219 | |
| 220 | 220 | # Submit button and form bottom |
| 221 | 221 | $out .= Html::hidden( 'limit', $this->mLimit ); |
| 222 | | - $out .= Xml::submitButton( wfMsg( 'allpagessubmit' ) ); |
| | 222 | + $out .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ); |
| 223 | 223 | wfRunHooks( 'SpecialListusersHeader', array( $this, &$out ) ); |
| 224 | 224 | $out .= Xml::closeElement( 'fieldset' ) . |
| 225 | 225 | Xml::closeElement( 'form' ); |
| — | — | @@ -309,7 +309,7 @@ |
| 310 | 310 | $s .= Html::rawElement( 'ul', array(), $usersbody ); |
| 311 | 311 | $s .= $up->getNavigationBar(); |
| 312 | 312 | } else { |
| 313 | | - $s .= wfMessage( 'listusers-noresult' )->parseAsBlock(); |
| | 313 | + $s .= $this->msg( 'listusers-noresult' )->parseAsBlock(); |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | $this->getOutput()->addHTML( $s ); |