| Index: trunk/extensions/EditConflict/CurrentEdits.php |
| — | — | @@ -120,20 +120,19 @@ |
| 121 | 121 | |
| 122 | 122 | // if list is empty, display a warning |
| 123 | 123 | if( $num == 0 ) { |
| 124 | | - $wgOut->addHTML( '<p>' . wfMsgHTML('specialpage-empty') . '</p>' ); |
| | 124 | + $wgOut->addWikiMsg( 'specialpage-empty' ); |
| 125 | 125 | return; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | | - $top = wfShowingResults( $offset, $num ); |
| 129 | | - $wgOut->addHTML( "<p>{$top}\n" ); |
| | 128 | + $wgOut->addHTML( wfMsgExt( 'showingresults', 'parse', |
| | 129 | + $wgLang->formatNum( $num ), $wgLang->formatNum( $offset + 1 ) ) ); |
| 130 | 130 | |
| 131 | 131 | // often disable 'next' link when we reach the end |
| 132 | 132 | $atend = $num < $limit; |
| 133 | 133 | |
| 134 | | - $sl = wfViewPrevNext( $offset, $limit , |
| 135 | | - $wgContLang->specialPage( $sname ), |
| | 134 | + $sl = wfViewPrevNext( $offset, $limit, SpecialPage::getTitleFor( 'CurrentEdits' ), |
| 136 | 135 | wfArrayToCGI( $this->linkParameters() ), $atend ); |
| 137 | | - $wgOut->addHTML( "<br />{$sl}</p>\n" ); |
| | 136 | + $wgOut->addHTML( "<p>{$sl}</p>\n" ); |
| 138 | 137 | } |
| 139 | 138 | if ( $num > 0 ) { |
| 140 | 139 | $s = array(); |
| — | — | @@ -205,7 +204,7 @@ |
| 206 | 205 | $this->order_queries[ $order_key ] = $msg; |
| 207 | 206 | } else { |
| 208 | 207 | # link all other orders |
| 209 | | - $this->order_queries[ $order_key ] = $skin->makeKnownLinkObj( $this->getTitle(), $msg , $action ); |
| | 208 | + $this->order_queries[ $order_key ] = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'CurrentEdits' ), $msg , $action ); |
| 210 | 209 | } |
| 211 | 210 | } |
| 212 | 211 | } |
| — | — | @@ -270,7 +269,7 @@ |
| 271 | 270 | if ( $this->order_key != EC_DEFAULT_ORDER_KEY ) { |
| 272 | 271 | $action .= '&order=' . $this->order_key; |
| 273 | 272 | } |
| 274 | | - $session_close_link = $skin->makeKnownLinkObj( $this->getTitle(), '※', $action, '', '', 'title="Close this session."' ); |
| | 273 | + $session_close_link = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'CurrentEdits' ), '※', $action, '', '', 'title="Close this session."' ); |
| 275 | 274 | return wfMsg( 'ec_list_order_' . $this->order_key, $title_link, $user_page_link, htmlspecialchars( $user_weight ), htmlspecialchars( $editing_time ), $session_close_link ); |
| 276 | 275 | } |
| 277 | 276 | |
| — | — | @@ -287,4 +286,4 @@ |
| 288 | 287 | return $params; |
| 289 | 288 | } |
| 290 | 289 | |
| 291 | | -} |
| \ No newline at end of file |
| | 290 | +} |