| Index: trunk/phase3/includes/specials/SpecialListgrouprights.php |
| — | — | @@ -54,8 +54,8 @@ |
| 55 | 55 | $out->addHTML( |
| 56 | 56 | Xml::openElement( 'table', array( 'class' => 'wikitable mw-listgrouprights-table' ) ) . |
| 57 | 57 | '<tr>' . |
| 58 | | - Xml::element( 'th', null, wfMsg( 'listgrouprights-group' ) ) . |
| 59 | | - Xml::element( 'th', null, wfMsg( 'listgrouprights-rights' ) ) . |
| | 58 | + Xml::element( 'th', null, $this->msg( 'listgrouprights-group' )->text() ) . |
| | 59 | + Xml::element( 'th', null, $this->msg( 'listgrouprights-rights' )->text() ) . |
| 60 | 60 | '</tr>' |
| 61 | 61 | ); |
| 62 | 62 | |
| — | — | @@ -77,10 +77,10 @@ |
| 78 | 78 | ? 'all' |
| 79 | 79 | : $group; |
| 80 | 80 | |
| 81 | | - $msg = wfMessage( 'group-' . $groupname ); |
| | 81 | + $msg = $this->msg( 'group-' . $groupname ); |
| 82 | 82 | $groupnameLocalized = !$msg->isBlank() ? $msg->text() : $groupname; |
| 83 | 83 | |
| 84 | | - $msg = wfMessage( 'grouppage-' . $groupname )->inContentLanguage(); |
| | 84 | + $msg = $this->msg( 'grouppage-' . $groupname )->inContentLanguage(); |
| 85 | 85 | $grouppageLocalized = !$msg->isBlank() ? |
| 86 | 86 | $msg->text() : |
| 87 | 87 | MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname; |
| — | — | @@ -99,12 +99,12 @@ |
| 100 | 100 | // Link to Special:listusers for implicit group 'user' |
| 101 | 101 | $grouplink = '<br />' . Linker::linkKnown( |
| 102 | 102 | SpecialPage::getTitleFor( 'Listusers' ), |
| 103 | | - wfMsgHtml( 'listgrouprights-members' ) |
| | 103 | + $this->msg( 'listgrouprights-members' )->escaped() |
| 104 | 104 | ); |
| 105 | 105 | } elseif ( !in_array( $group, $wgImplicitGroups ) ) { |
| 106 | 106 | $grouplink = '<br />' . Linker::linkKnown( |
| 107 | 107 | SpecialPage::getTitleFor( 'Listusers' ), |
| 108 | | - wfMsgHtml( 'listgrouprights-members' ), |
| | 108 | + $this->msg( 'listgrouprights-members' )->escaped(), |
| 109 | 109 | array(), |
| 110 | 110 | array( 'group' => $group ) |
| 111 | 111 | ); |
| — | — | @@ -152,59 +152,59 @@ |
| 153 | 153 | foreach( $permissions as $permission => $granted ) { |
| 154 | 154 | //show as granted only if it isn't revoked to prevent duplicate display of permissions |
| 155 | 155 | if( $granted && ( !isset( $revoke[$permission] ) || !$revoke[$permission] ) ) { |
| 156 | | - $description = wfMsgExt( 'listgrouprights-right-display', array( 'parseinline' ), |
| | 156 | + $description = $this->msg( 'listgrouprights-right-display', |
| 157 | 157 | User::getRightDescription( $permission ), |
| 158 | 158 | '<span class="mw-listgrouprights-right-name">' . $permission . '</span>' |
| 159 | | - ); |
| | 159 | + )->parse(); |
| 160 | 160 | $r[] = $description; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | foreach( $revoke as $permission => $revoked ) { |
| 164 | 164 | if( $revoked ) { |
| 165 | | - $description = wfMsgExt( 'listgrouprights-right-revoked', array( 'parseinline' ), |
| | 165 | + $description = $this->msg( 'listgrouprights-right-revoked', |
| 166 | 166 | User::getRightDescription( $permission ), |
| 167 | 167 | '<span class="mw-listgrouprights-right-name">' . $permission . '</span>' |
| 168 | | - ); |
| | 168 | + )->parse(); |
| 169 | 169 | $r[] = $description; |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | sort( $r ); |
| 173 | 173 | $lang = $this->getLanguage(); |
| 174 | 174 | if( $add === true ){ |
| 175 | | - $r[] = wfMsgExt( 'listgrouprights-addgroup-all', array( 'escape' ) ); |
| | 175 | + $r[] = $this->msg( 'listgrouprights-addgroup-all' )->escaped(); |
| 176 | 176 | } elseif( is_array( $add ) && count( $add ) ) { |
| 177 | 177 | $add = array_values( array_unique( $add ) ); |
| 178 | | - $r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parseinline' ), |
| | 178 | + $r[] = $this->msg( 'listgrouprights-addgroup', |
| 179 | 179 | $lang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), |
| 180 | 180 | count( $add ) |
| 181 | | - ); |
| | 181 | + )->parse(); |
| 182 | 182 | } |
| 183 | 183 | if( $remove === true ){ |
| 184 | | - $r[] = wfMsgExt( 'listgrouprights-removegroup-all', array( 'escape' ) ); |
| | 184 | + $r[] = $this->msg( 'listgrouprights-removegroup-all' )->escaped(); |
| 185 | 185 | } elseif( is_array( $remove ) && count( $remove ) ) { |
| 186 | 186 | $remove = array_values( array_unique( $remove ) ); |
| 187 | | - $r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parseinline' ), |
| | 187 | + $r[] = $this->msg( 'listgrouprights-removegroup', array( 'parseinline' ), |
| 188 | 188 | $lang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), |
| 189 | 189 | count( $remove ) |
| 190 | | - ); |
| | 190 | + )->parse(); |
| 191 | 191 | } |
| 192 | 192 | if( $addSelf === true ){ |
| 193 | | - $r[] = wfMsgExt( 'listgrouprights-addgroup-self-all', array( 'escape' ) ); |
| | 193 | + $r[] = $this->msg( 'listgrouprights-addgroup-self-all' )->escaped(); |
| 194 | 194 | } elseif( is_array( $addSelf ) && count( $addSelf ) ) { |
| 195 | 195 | $addSelf = array_values( array_unique( $addSelf ) ); |
| 196 | | - $r[] = wfMsgExt( 'listgrouprights-addgroup-self', array( 'parseinline' ), |
| | 196 | + $r[] = $this->msg( 'listgrouprights-addgroup-self', array( 'parseinline' ), |
| 197 | 197 | $lang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $addSelf ) ), |
| 198 | 198 | count( $addSelf ) |
| 199 | | - ); |
| | 199 | + )->parse(); |
| 200 | 200 | } |
| 201 | 201 | if( $removeSelf === true ){ |
| 202 | | - $r[] = wfMsgExt( 'listgrouprights-removegroup-self-all', array( 'escape' ) ); |
| | 202 | + $r[] = $this->msg( 'listgrouprights-removegroup-self-all' )->parse(); |
| 203 | 203 | } elseif( is_array( $removeSelf ) && count( $removeSelf ) ) { |
| 204 | 204 | $removeSelf = array_values( array_unique( $removeSelf ) ); |
| 205 | | - $r[] = wfMsgExt( 'listgrouprights-removegroup-self', array( 'parseinline' ), |
| | 205 | + $r[] = $this->msg( 'listgrouprights-removegroup-self', array( 'parseinline' ), |
| 206 | 206 | $lang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $removeSelf ) ), |
| 207 | 207 | count( $removeSelf ) |
| 208 | | - ); |
| | 208 | + )->parse(); |
| 209 | 209 | } |
| 210 | 210 | if( empty( $r ) ) { |
| 211 | 211 | return ''; |