| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1746,7 +1746,7 @@ |
| 1747 | 1747 | 'watchlist' => array( |
| 1748 | 1748 | 'watchlist', |
| 1749 | 1749 | 'mywatchlist', |
| 1750 | | - 'watchlistfor', |
| | 1750 | + 'watchlistfor2', |
| 1751 | 1751 | 'nowatchlist', |
| 1752 | 1752 | 'watchlistanontext', |
| 1753 | 1753 | 'watchnologin', |
| Index: trunk/phase3/includes/WatchlistEditor.php |
| — | — | @@ -503,14 +503,13 @@ |
| 504 | 504 | $modes = array( 'view' => false, 'edit' => 'edit', 'raw' => 'raw' ); |
| 505 | 505 | foreach( $modes as $mode => $subpage ) { |
| 506 | 506 | // can use messages 'watchlisttools-view', 'watchlisttools-edit', 'watchlisttools-raw' |
| 507 | | - $tools[] = $skin->link( |
| | 507 | + $tools[] = $skin->linkKnown( |
| 508 | 508 | SpecialPage::getTitleFor( 'Watchlist', $subpage ), |
| 509 | | - wfMsgHtml( "watchlisttools-{$mode}" ), |
| 510 | | - array(), |
| 511 | | - array(), |
| 512 | | - array( 'known', 'noclasses' ) |
| | 509 | + wfMsgHtml( "watchlisttools-{$mode}" ) |
| 513 | 510 | ); |
| 514 | 511 | } |
| 515 | | - return $wgLang->pipeList( $tools ); |
| | 512 | + return Html::rawElement( 'span', |
| | 513 | + array( 'class' => 'mw-watchlist-toollinks' ), |
| | 514 | + wfMsg( 'parentheses', $wgLang->pipeList( $tools ) ) ); |
| 516 | 515 | } |
| 517 | 516 | } |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -66,8 +66,7 @@ |
| 67 | 67 | |
| 68 | 68 | $wgOut->setPageTitle( wfMsg( 'watchlist' ) ); |
| 69 | 69 | |
| 70 | | - $sub = wfMsgExt( 'watchlistfor', 'parseinline', $wgUser->getName() ); |
| 71 | | - $sub .= '<br />' . WatchlistEditor::buildTools( $wgUser->getSkin() ); |
| | 70 | + $sub = wfMsgExt( 'watchlistfor2', array( 'parseinline', 'replaceafter' ), $wgUser->getName(), WatchlistEditor::buildTools( $wgUser->getSkin() ) ); |
| 72 | 71 | $wgOut->setSubtitle( $sub ); |
| 73 | 72 | |
| 74 | 73 | if( ( $mode = WatchlistEditor::getMode( $wgRequest, $par ) ) !== false ) { |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -2280,9 +2280,10 @@ |
| 2281 | 2281 | 'mywatchlist' => 'Link at the upper right corner of the screen. |
| 2282 | 2282 | |
| 2283 | 2283 | {{Identical|My watchlist}}', |
| 2284 | | -'watchlistfor' => 'Subtitle on [[Special:Watchlist]]. |
| | 2284 | +'watchlistfor2' => 'Subtitle on [[Special:Watchlist]]. |
| 2285 | 2285 | |
| 2286 | 2286 | *$1: Username of current user |
| | 2287 | +*$2: Tool links (View relevant changes | View and edit watchlist | Edit raw watchlist) |
| 2287 | 2288 | {{Identical|For $1}}', |
| 2288 | 2289 | 'nowatchlist' => 'Displayed when there is no pages in the watchlist.', |
| 2289 | 2290 | 'watchlistanontext' => '* $1 is a link to [[Special:UserLogin]] with {{msg-mw|loginreqlink}} as link description', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2661,7 +2661,7 @@ |
| 2662 | 2662 | # Watchlist |
| 2663 | 2663 | 'watchlist' => 'My watchlist', |
| 2664 | 2664 | 'mywatchlist' => 'My watchlist', |
| 2665 | | -'watchlistfor' => "(for '''$1''')", |
| | 2665 | +'watchlistfor2' => 'For $1 $2', |
| 2666 | 2666 | 'nowatchlist' => 'You have no items on your watchlist.', |
| 2667 | 2667 | 'watchlistanontext' => 'Please $1 to view or edit items on your watchlist.', |
| 2668 | 2668 | 'watchnologin' => 'Not logged in', |