| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -301,6 +301,7 @@ |
| 302 | 302 | 'ok', |
| 303 | 303 | 'pagetitle', |
| 304 | 304 | 'pagetitle-view-mainpage', |
| | 305 | + 'backlinksubtitle', |
| 305 | 306 | 'retrievedfrom', |
| 306 | 307 | 'youhavenewmessages', |
| 307 | 308 | 'newmessageslink', |
| — | — | @@ -393,7 +394,7 @@ |
| 394 | 395 | 'querypage-no-updates', |
| 395 | 396 | 'wrong_wfQuery_params', |
| 396 | 397 | 'viewsource', |
| 397 | | - 'viewsourcefor', |
| | 398 | + 'viewsource-title', |
| 398 | 399 | 'actionthrottled', |
| 399 | 400 | 'actionthrottledtext', |
| 400 | 401 | 'protectedpagetext', |
| — | — | @@ -1236,7 +1237,6 @@ |
| 1237 | 1238 | 'recentchangeslinked-feed', |
| 1238 | 1239 | 'recentchangeslinked-toolbox', |
| 1239 | 1240 | 'recentchangeslinked-title', |
| 1240 | | - 'recentchangeslinked-backlink', |
| 1241 | 1241 | 'recentchangeslinked-noresult', |
| 1242 | 1242 | 'recentchangeslinked-summary', |
| 1243 | 1243 | 'recentchangeslinked-page', |
| — | — | @@ -1457,7 +1457,6 @@ |
| 1458 | 1458 | ), |
| 1459 | 1459 | 'filerevert' => array( |
| 1460 | 1460 | 'filerevert', |
| 1461 | | - 'filerevert-backlink', |
| 1462 | 1461 | 'filerevert-legend', |
| 1463 | 1462 | 'filerevert-intro', |
| 1464 | 1463 | 'filerevert-comment', |
| — | — | @@ -1468,7 +1467,6 @@ |
| 1469 | 1468 | ), |
| 1470 | 1469 | 'filedelete' => array( |
| 1471 | 1470 | 'filedelete', |
| 1472 | | - 'filedelete-backlink', |
| 1473 | 1471 | 'filedelete-legend', |
| 1474 | 1472 | 'filedelete-intro', |
| 1475 | 1473 | 'filedelete-intro-old', |
| — | — | @@ -1851,7 +1849,6 @@ |
| 1852 | 1850 | 'exbeforeblank', |
| 1853 | 1851 | 'exblank', |
| 1854 | 1852 | 'delete-confirm', |
| 1855 | | - 'delete-backlink', |
| 1856 | 1853 | 'delete-legend', |
| 1857 | 1854 | 'historywarning', |
| 1858 | 1855 | 'confirmdeletetext', |
| — | — | @@ -1898,7 +1895,6 @@ |
| 1899 | 1896 | 'prot_1movedto2', |
| 1900 | 1897 | 'protect-badnamespace-title', |
| 1901 | 1898 | 'protect-badnamespace-text', |
| 1902 | | - 'protect-backlink', |
| 1903 | 1899 | 'protect-legend', |
| 1904 | 1900 | 'protectcomment', |
| 1905 | 1901 | 'protectexpiry', |
| — | — | @@ -2030,7 +2026,6 @@ |
| 2031 | 2027 | 'whatlinkshere-title', |
| 2032 | 2028 | 'whatlinkshere-summary', |
| 2033 | 2029 | 'whatlinkshere-page', |
| 2034 | | - 'whatlinkshere-backlink', |
| 2035 | 2030 | 'linkshere', |
| 2036 | 2031 | 'nolinkshere', |
| 2037 | 2032 | 'nolinkshere-ns', |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -315,10 +315,6 @@ |
| 316 | 316 | 'minutes-abbrev', |
| 317 | 317 | 'hours-abbrev', |
| 318 | 318 | 'days-abbrev', |
| 319 | | - 'filerevert-backlink', |
| 320 | | - 'filedelete-backlink', |
| 321 | | - 'delete-backlink', |
| 322 | | - 'protect-backlink', |
| 323 | 319 | 'pagetitle', |
| 324 | 320 | 'filename-prefix-blacklist', |
| 325 | 321 | 'edittools', |
| — | — | @@ -393,11 +389,10 @@ |
| 394 | 390 | 'listgrouprights-right-display', |
| 395 | 391 | 'listgrouprights-right-revoked', |
| 396 | 392 | 'timezone-utc', |
| 397 | | - 'whatlinkshere-backlink', |
| 398 | | - 'recentchangeslinked-backlink', |
| 399 | 393 | 'unpatrolledletter', |
| 400 | 394 | 'diff-with-additional', |
| 401 | 395 | 'pagetitle-view-mainpage', |
| | 396 | + 'backlinksubtitle', |
| 402 | 397 | 'trackback', |
| 403 | 398 | 'trackbackexcerpt', |
| 404 | 399 | 'prefs-registration-date-time', |
| Index: trunk/phase3/skins/common/shared.css |
| — | — | @@ -970,8 +970,10 @@ |
| 971 | 971 | } |
| 972 | 972 | |
| 973 | 973 | #mw-revision-info, |
| | 974 | +#mw-revision-info-current, |
| 974 | 975 | #mw-revision-nav { |
| 975 | 976 | direction: ltr; |
| | 977 | + display: inline; |
| 976 | 978 | } |
| 977 | 979 | |
| 978 | 980 | /* Images */ |
| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -236,11 +236,8 @@ |
| 237 | 237 | wfEscapeWikiText( $this->mTitle->getPrefixedText() ) ); |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | | - $titleLink = Linker::link( $this->mTitle ); |
| 241 | | - $wgOut->setSubtitle( wfMsg( 'protect-backlink', $titleLink ) ); |
| 242 | | - |
| | 240 | + $wgOut->addBacklinkSubtitle( $this->mTitle ); |
| 243 | 241 | $wgOut->addHTML( $this->buildForm() ); |
| 244 | | - |
| 245 | 242 | $this->showLogExtract( $wgOut ); |
| 246 | 243 | } |
| 247 | 244 | |
| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -264,7 +264,7 @@ |
| 265 | 265 | # is the first version of that article. In that case, V' does not exist. |
| 266 | 266 | if ( $this->mOldRev === false ) { |
| 267 | 267 | $wgOut->setPageTitle( $this->mNewPage->getPrefixedText() ); |
| 268 | | - $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) ); |
| | 268 | + $wgOut->addSubtitle( wfMessage( 'difference' ) ); |
| 269 | 269 | $samePage = true; |
| 270 | 270 | $oldHeader = ''; |
| 271 | 271 | } else { |
| — | — | @@ -277,11 +277,11 @@ |
| 278 | 278 | |
| 279 | 279 | if ( $this->mNewPage->equals( $this->mOldPage ) ) { |
| 280 | 280 | $wgOut->setPageTitle( $this->mNewPage->getPrefixedText() ); |
| 281 | | - $wgOut->setSubtitle( wfMsgExt( 'difference', array( 'parseinline' ) ) ); |
| | 281 | + $wgOut->addSubtitle( wfMessage( 'difference' ) ); |
| 282 | 282 | $samePage = true; |
| 283 | 283 | } else { |
| 284 | 284 | $wgOut->setPageTitle( $this->mOldPage->getPrefixedText() . ', ' . $this->mNewPage->getPrefixedText() ); |
| 285 | | - $wgOut->setSubtitle( wfMsgExt( 'difference-multipage', array( 'parseinline' ) ) ); |
| | 285 | + $wgOut->addSubtitle( wfMessage( 'difference-multipage' ) ); |
| 286 | 286 | $samePage = false; |
| 287 | 287 | } |
| 288 | 288 | |
| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -434,7 +434,7 @@ |
| 435 | 435 | wfIncrStats( 'pcache_miss_stub' ); |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | | - $wasRedirected = $this->showRedirectedFromHeader(); |
| | 438 | + $this->showRedirectedFromHeader(); |
| 439 | 439 | $this->showNamespaceHeader(); |
| 440 | 440 | |
| 441 | 441 | # Iterate through the possible ways of constructing the output text. |
| — | — | @@ -524,8 +524,7 @@ |
| 525 | 525 | if ( $rt ) { |
| 526 | 526 | wfDebug( __METHOD__ . ": showing redirect=no page\n" ); |
| 527 | 527 | # Viewing a redirect page (e.g. with parameter redirect=no) |
| 528 | | - # Don't append the subtitle if this was an old revision |
| 529 | | - $wgOut->addHTML( $this->viewRedirect( $rt, !$wasRedirected && $this->isCurrent() ) ); |
| | 528 | + $wgOut->addHTML( $this->viewRedirect( $rt ) ); |
| 530 | 529 | # Parse just to get categories, displaytitle, etc. |
| 531 | 530 | $this->mParserOutput = $wgParser->parse( $text, $this->getTitle(), $parserOptions ); |
| 532 | 531 | $wgOut->addParserOutputNoText( $this->mParserOutput ); |
| — | — | @@ -772,16 +771,14 @@ |
| 773 | 772 | // This is an internally redirected page view. |
| 774 | 773 | // We'll need a backlink to the source page for navigation. |
| 775 | 774 | if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) { |
| 776 | | - $redir = Linker::link( |
| | 775 | + $redir = Linker::linkKnown( |
| 777 | 776 | $this->mRedirectedFrom, |
| 778 | 777 | null, |
| 779 | 778 | array(), |
| 780 | | - array( 'redirect' => 'no' ), |
| 781 | | - array( 'known', 'noclasses' ) |
| | 779 | + array( 'redirect' => 'no' ) |
| 782 | 780 | ); |
| 783 | 781 | |
| 784 | | - $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); |
| 785 | | - $wgOut->setSubtitle( $s ); |
| | 782 | + $wgOut->addSubtitle( wfMessage( 'redirectedfrom' )->rawParams( $redir ) ); |
| 786 | 783 | |
| 787 | 784 | // Set the fragment if one was specified in the redirect |
| 788 | 785 | if ( strval( $this->getTitle()->getFragment() ) != '' ) { |
| — | — | @@ -801,8 +798,7 @@ |
| 802 | 799 | // If it was reported from a trusted site, supply a backlink. |
| 803 | 800 | if ( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) { |
| 804 | 801 | $redir = Linker::makeExternalLink( $rdfrom, $rdfrom ); |
| 805 | | - $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); |
| 806 | | - $wgOut->setSubtitle( $s ); |
| | 802 | + $wgOut->addSubtitle( wfMessage( 'redirectedfrom' )->rawParams( $redir ) ); |
| 807 | 803 | |
| 808 | 804 | return true; |
| 809 | 805 | } |
| — | — | @@ -1416,8 +1412,7 @@ |
| 1417 | 1413 | wfDebug( "Article::confirmDelete\n" ); |
| 1418 | 1414 | |
| 1419 | 1415 | $wgOut->setPageTitle( wfMessage( 'delete-confirm', $this->getTitle()->getPrefixedText() ) ); |
| 1420 | | - $deleteBackLink = Linker::linkKnown( $this->getTitle() ); |
| 1421 | | - $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) ); |
| | 1416 | + $wgOut->addBacklinkSubtitle( $this->getTitle() ); |
| 1422 | 1417 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 1423 | 1418 | $wgOut->addWikiMsg( 'confirmdeletetext' ); |
| 1424 | 1419 | |
| — | — | @@ -1583,6 +1578,17 @@ |
| 1584 | 1579 | $tddate = $wgLang->date( $timestamp, true ); |
| 1585 | 1580 | $tdtime = $wgLang->time( $timestamp, true ); |
| 1586 | 1581 | |
| | 1582 | + # Show user links if allowed to see them. If hidden, then show them only if requested... |
| | 1583 | + $userlinks = Linker::revUserTools( $revision, !$unhide ); |
| | 1584 | + |
| | 1585 | + $infomsg = $current && !wfMessage( 'revision-info-current' )->isDisabled() |
| | 1586 | + ? 'revision-info-current' |
| | 1587 | + : 'revision-info'; |
| | 1588 | + |
| | 1589 | + $wgOut->addSubtitle( "<div id=\"mw-{$infomsg}\">" . wfMessage( $infomsg, |
| | 1590 | + $td )->rawParams( $userlinks )->params( $revision->getID(), $tddate, |
| | 1591 | + $tdtime, $revision->getUser() )->parse() . "</div>" ); |
| | 1592 | + |
| 1587 | 1593 | $lnk = $current |
| 1588 | 1594 | ? wfMsgHtml( 'currentrevisionlink' ) |
| 1589 | 1595 | : Linker::link( |
| — | — | @@ -1672,29 +1678,9 @@ |
| 1673 | 1679 | $cdel .= ' '; |
| 1674 | 1680 | } |
| 1675 | 1681 | |
| 1676 | | - # Show user links if allowed to see them. If hidden, then show them only if requested... |
| 1677 | | - $userlinks = Linker::revUserTools( $revision, !$unhide ); |
| 1678 | | - |
| 1679 | | - $infomsg = $current && !wfMessage( 'revision-info-current' )->isDisabled() |
| 1680 | | - ? 'revision-info-current' |
| 1681 | | - : 'revision-info'; |
| 1682 | | - |
| 1683 | | - $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . |
| 1684 | | - wfMsgExt( |
| 1685 | | - $infomsg, |
| 1686 | | - array( 'parseinline', 'replaceafter' ), |
| 1687 | | - $td, |
| 1688 | | - $userlinks, |
| 1689 | | - $revision->getID(), |
| 1690 | | - $tddate, |
| 1691 | | - $tdtime, |
| 1692 | | - $revision->getUser() |
| 1693 | | - ) . |
| 1694 | | - "</div>\n" . |
| 1695 | | - "\n\t\t\t\t<div id=\"mw-revision-nav\">" . $cdel . wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ), |
| 1696 | | - $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t"; |
| 1697 | | - |
| 1698 | | - $wgOut->setSubtitle( $r ); |
| | 1682 | + $wgOut->addSubtitle( "<div id=\"mw-revision-nav\">" . $cdel . |
| | 1683 | + wfMsgExt( 'revision-nav', array( 'escapenoentities', 'parsemag', 'replaceafter' ), |
| | 1684 | + $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>" ); |
| 1699 | 1685 | } |
| 1700 | 1686 | |
| 1701 | 1687 | /* Caching functions */ |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -570,10 +570,8 @@ |
| 571 | 571 | throw new PermissionsError( $action, $permErrors ); |
| 572 | 572 | } |
| 573 | 573 | |
| 574 | | - $wgOut->setPageTitle( wfMessage( 'viewsource' ) ); |
| 575 | | - $wgOut->setSubtitle( |
| 576 | | - wfMessage( 'viewsourcefor', Linker::linkKnown( $this->mTitle ) )->text() |
| 577 | | - ); |
| | 574 | + $wgOut->setPageTitle( wfMessage( 'viewsource-title', $this->getContextTitle()->getPrefixedText() ) ); |
| | 575 | + $wgOut->addBacklinkSubtitle( $this->getContextTitle() ); |
| 578 | 576 | $wgOut->addWikiText( $wgOut->formatPermissionsErrorMessage( $permErrors, 'edit' ) ); |
| 579 | 577 | $wgOut->addHTML( "<hr />\n" ); |
| 580 | 578 | |
| Index: trunk/phase3/includes/actions/RevertAction.php |
| — | — | @@ -132,9 +132,7 @@ |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | protected function getDescription() { |
| 136 | | - return wfMsg( |
| 137 | | - 'filerevert-backlink', |
| 138 | | - Linker::linkKnown( $this->getTitle() ) |
| 139 | | - ); |
| | 136 | + $this->getOutput()->addBacklinkSubtitle( $this->getTitle() ); |
| | 137 | + return ''; |
| 140 | 138 | } |
| 141 | 139 | } |
| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -285,10 +285,7 @@ |
| 286 | 286 | global $wgOut; |
| 287 | 287 | $wgOut->setPageTitle( wfMessage( 'filedelete', $this->title->getText() ) ); |
| 288 | 288 | $wgOut->setRobotPolicy( 'noindex,nofollow' ); |
| 289 | | - $wgOut->setSubtitle( wfMsg( |
| 290 | | - 'filedelete-backlink', |
| 291 | | - Linker::linkKnown( $this->title ) |
| 292 | | - ) ); |
| | 289 | + $wgOut->addBacklinkSubtitle( $this->title ); |
| 293 | 290 | } |
| 294 | 291 | |
| 295 | 292 | /** |
| Index: trunk/phase3/includes/specials/SpecialRecentchangeslinked.php |
| — | — | @@ -235,8 +235,7 @@ |
| 236 | 236 | function setTopText( FormOptions $opts ) { |
| 237 | 237 | $target = $this->getTargetTitle(); |
| 238 | 238 | if( $target ) { |
| 239 | | - $this->getOutput()->setSubtitle( wfMsg( 'recentchangeslinked-backlink', Linker::link( $target, |
| 240 | | - $target->getPrefixedText(), array(), array( 'redirect' => 'no' ) ) ) ); |
| | 239 | + $this->getOutput()->addBacklinkSubtitle( $target ); |
| 241 | 240 | } |
| 242 | 241 | } |
| 243 | 242 | |
| Index: trunk/phase3/includes/specials/SpecialLockdb.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | |
| 103 | 103 | public function onSuccess() { |
| 104 | 104 | $out = $this->getOutput(); |
| 105 | | - $out->setSubtitle( wfMsg( 'lockdbsuccesssub' ) ); |
| | 105 | + $out->addSubtitle( $this->msg( 'lockdbsuccesssub' ) ); |
| 106 | 106 | $out->addWikiMsg( 'lockdbsuccesstext' ); |
| 107 | 107 | } |
| 108 | 108 | } |
| Index: trunk/phase3/includes/specials/SpecialUnlockdb.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | |
| 83 | 83 | public function onSuccess() { |
| 84 | 84 | $out = $this->getOutput(); |
| 85 | | - $out->setSubtitle( wfMsg( 'unlockdbsuccesssub' ) ); |
| | 85 | + $out->addSubtitle( $this->msg( 'unlockdbsuccesssub' ) ); |
| 86 | 86 | $out->addWikiMsg( 'unlockdbsuccesstext' ); |
| 87 | 87 | } |
| 88 | 88 | } |
| Index: trunk/phase3/includes/specials/SpecialWhatlinkshere.php |
| — | — | @@ -83,11 +83,10 @@ |
| 84 | 84 | |
| 85 | 85 | $this->getSkin()->setRelevantTitle( $this->target ); |
| 86 | 86 | |
| 87 | | - |
| 88 | 87 | $this->selfTitle = $this->getTitle( $this->target->getPrefixedDBkey() ); |
| 89 | 88 | |
| 90 | 89 | $out->setPageTitle( $this->msg( 'whatlinkshere-title', $this->target->getPrefixedText() ) ); |
| 91 | | - $out->setSubtitle( wfMsg( 'whatlinkshere-backlink', Linker::link( $this->target, $this->target->getPrefixedText(), array(), array( 'redirect' => 'no' ) ) ) ); |
| | 90 | + $out->addBacklinkSubtitle( $this->target ); |
| 92 | 91 | |
| 93 | 92 | $this->showIndirectLinks( 0, $this->target, $opts->getValue( 'limit' ), |
| 94 | 93 | $opts->getValue( 'from' ), $opts->getValue( 'back' ) ); |
| Index: trunk/phase3/includes/specials/SpecialEditWatchlist.php |
| — | — | @@ -53,13 +53,8 @@ |
| 54 | 54 | |
| 55 | 55 | $this->outputHeader(); |
| 56 | 56 | |
| 57 | | - $sub = wfMsgExt( |
| 58 | | - 'watchlistfor2', |
| 59 | | - array( 'parseinline', 'replaceafter' ), |
| 60 | | - $this->getUser()->getName(), |
| 61 | | - SpecialEditWatchlist::buildTools( null ) |
| 62 | | - ); |
| 63 | | - $out->setSubtitle( $sub ); |
| | 57 | + $out->addSubtitle( $this->msg( 'watchlistfor2', $this->getUser()->getName() |
| | 58 | + )->rawParams( SpecialEditWatchlist::buildTools( null ) ) ); |
| 64 | 59 | |
| 65 | 60 | # B/C: $mode used to be waaay down the parameter list, and the first parameter |
| 66 | 61 | # was $wgUser |
| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -248,7 +248,7 @@ |
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | # Logs themselves don't have histories or archived revisions |
| 252 | | - $this->getOutput()->setSubtitle( '<p>' . $this->getLang()->pipeList( $links ) . '</p>' ); |
| | 252 | + $this->getOutput()->addSubtitle( $this->getLang()->pipeList( $links ) ); |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -83,14 +83,14 @@ |
| 84 | 84 | |
| 85 | 85 | if( $this->opts['contribs'] != 'newbie' ) { |
| 86 | 86 | $target = $nt->getText(); |
| 87 | | - $out->setSubtitle( $this->contributionsSub( $nt, $id ) ); |
| | 87 | + $out->addSubtitle( $this->contributionsSub( $nt, $id ) ); |
| 88 | 88 | $out->setHTMLTitle( $this->msg( 'pagetitle', wfMsgExt( 'contributions-title', array( 'parsemag' ), $target ) ) ); |
| 89 | 89 | $userObj = User::newFromName( $target, false ); |
| 90 | 90 | if ( is_object( $userObj ) ) { |
| 91 | 91 | $this->getSkin()->setRelevantUser( $userObj ); |
| 92 | 92 | } |
| 93 | 93 | } else { |
| 94 | | - $out->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') ); |
| | 94 | + $out->addSubtitle( $this->msg( 'sp-contributions-newbies-sub') ); |
| 95 | 95 | $out->setHTMLTitle( $this->msg( 'pagetitle', wfMsg( 'sp-contributions-newbies-title' ) ) ); |
| 96 | 96 | } |
| 97 | 97 | |
| — | — | @@ -252,10 +252,11 @@ |
| 253 | 253 | // languages that want to put the "for" bit right after $user but before |
| 254 | 254 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| 255 | 255 | // otherwise use 'contribsub2'. |
| 256 | | - if( wfEmptyMsg( 'contribsub' ) ) { |
| 257 | | - return wfMsgHtml( 'contribsub2', $user, $links ); |
| | 256 | + $oldMsg = $this->msg( 'contribsub' ); |
| | 257 | + if ( $oldMsg->exists() ) { |
| | 258 | + return $oldMsg->rawParams( "$user ($links)" ); |
| 258 | 259 | } else { |
| 259 | | - return wfMsgHtml( 'contribsub', "$user ($links)" ); |
| | 260 | + return $this->msg( 'contribsub2' )->rawParams( $user, $links ); |
| 260 | 261 | } |
| 261 | 262 | } |
| 262 | 263 | |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -295,7 +295,7 @@ |
| 296 | 296 | $id = User::idFromName( $nt->getText() ); |
| 297 | 297 | |
| 298 | 298 | $target = $nt->getText(); |
| 299 | | - $out->setSubtitle( $this->getSubTitle( $nt, $id ) ); |
| | 299 | + $out->addSubtitle( $this->getSubTitle( $nt, $id ) ); |
| 300 | 300 | |
| 301 | 301 | if ( ( $ns = $request->getVal( 'namespace', null ) ) !== null && $ns !== '' ) { |
| 302 | 302 | $options['namespace'] = intval( $ns ); |
| — | — | @@ -438,10 +438,11 @@ |
| 439 | 439 | // languages that want to put the "for" bit right after $user but before |
| 440 | 440 | // $links. If 'contribsub' is around, use it for reverse compatibility, |
| 441 | 441 | // otherwise use 'contribsub2'. |
| 442 | | - if( wfEmptyMsg( 'contribsub' ) ) { |
| 443 | | - return wfMsgHtml( 'contribsub2', $user, $links ); |
| | 442 | + $oldMsg = $this->msg( 'contribsub' ); |
| | 443 | + if ( $oldMsg->exists() ) { |
| | 444 | + return $oldMsg->rawParams( "$user ($links)" ); |
| 444 | 445 | } else { |
| 445 | | - return wfMsgHtml( 'contribsub', "$user ($links)" ); |
| | 446 | + return $this->msg( 'contribsub2' )->rawParams( $user, $links ); |
| 446 | 447 | } |
| 447 | 448 | } |
| 448 | 449 | |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -69,13 +69,8 @@ |
| 70 | 70 | $this->setHeaders(); |
| 71 | 71 | $this->outputHeader(); |
| 72 | 72 | |
| 73 | | - $sub = wfMsgExt( |
| 74 | | - 'watchlistfor2', |
| 75 | | - array( 'parseinline', 'replaceafter' ), |
| 76 | | - $user->getName(), |
| 77 | | - SpecialEditWatchlist::buildTools( $this->getSkin() ) |
| 78 | | - ); |
| 79 | | - $output->setSubtitle( $sub ); |
| | 73 | + $output->addSubtitle( $this->msg( 'watchlistfor2', $this->getUser()->getName() |
| | 74 | + )->rawParams( SpecialEditWatchlist::buildTools( null ) ) ); |
| 80 | 75 | |
| 81 | 76 | $request = $this->getRequest(); |
| 82 | 77 | |
| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -195,7 +195,7 @@ |
| 196 | 196 | $token = htmlspecialchars( $user->editToken() ); |
| 197 | 197 | |
| 198 | 198 | if ( !empty($err) ) { |
| 199 | | - $out->setSubtitle( wfMsg( 'formerror' ) ); |
| | 199 | + $out->addSubtitle( $this->msg( 'formerror' ) ); |
| 200 | 200 | if( $err[0] == 'hookaborted' ) { |
| 201 | 201 | $hookErr = $err[1]; |
| 202 | 202 | $errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n"; |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -517,6 +517,9 @@ |
| 518 | 518 | |
| 519 | 519 | Do '''not''' replace SITENAME with a translation of Wikipedia or some encycopedic additions. The message has to be neutral for all projects.", |
| 520 | 520 | 'pagetitle-view-mainpage' => '{{optional}}', |
| | 521 | +'backlinksubtitle' => '{{optional}} |
| | 522 | +Appears in subtitle |
| | 523 | +* $1 is a link to the page (HTML)', |
| 521 | 524 | 'retrievedfrom' => 'Message which appears in the source of every page, but it is hidden. It is shown when printing. $1 is a link back to the current page: {{FULLURL:{{FULLPAGENAME}}}}.', |
| 522 | 525 | 'youhavenewmessages' => 'The blue message appearing when someone edited your user talk page. |
| 523 | 526 | The format is: "{{int:youhavenewmessages| [[MediaWiki:Newmessageslink/{{SUBPAGENAME}}|{{int:newmessageslink}}]] |[[MediaWiki:Newmessagesdifflink/{{SUBPAGENAME}}|{{int:newmessagesdifflink}}]]}}"', |
| — | — | @@ -652,9 +655,8 @@ |
| 653 | 656 | 'viewsource' => 'The text displayed in place of the "edit" tab when the user has no permission to edit the page. |
| 654 | 657 | |
| 655 | 658 | {{Identical|View source}}', |
| 656 | | -'viewsourcefor' => 'Subtitle shown when trying to edit a protected page. |
| 657 | | - |
| 658 | | -{{Identical|For $1}}', |
| | 659 | +'viewsource-title' => 'Page title shown when trying to edit a protected page. |
| | 660 | +* $1 is the name of the page', |
| 659 | 661 | 'actionthrottled' => 'This is the title of an error page. Read it in combination with {{msg-mw|actionthrottledtext}}.', |
| 660 | 662 | 'protectedpagetext' => 'This message is displayed when trying to edit a page you can\'t edit because it has been protected. |
| 661 | 663 | |
| — | — | @@ -1768,14 +1770,13 @@ |
| 1769 | 1771 | 'newsectionsummary' => 'Default summary when adding a new section to a page.', |
| 1770 | 1772 | |
| 1771 | 1773 | # Recent changes linked |
| 1772 | | -'recentchangeslinked' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| 1773 | | -'recentchangeslinked-feed' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| 1774 | | -'recentchangeslinked-toolbox' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| 1775 | | -'recentchangeslinked-title' => 'Message used as title and page header on [[Special:RecentChangesLinked]] (needs an argument like "/Main Page"). Related changes are all recent change to pages that are linked from \'\'this page\'\'. "$1" is the name of the page for which related changes as show.', |
| 1776 | | -'recentchangeslinked-backlink' => '{{optional}}', |
| 1777 | | -'recentchangeslinked-summary' => 'Summary of [[Special:RecentChangesLinked]].', |
| 1778 | | -'recentchangeslinked-page' => '{{Identical|Page name}}', |
| 1779 | | -'recentchangeslinked-to' => 'Checkbox in [[Special:RecentChangesLinked]].', |
| | 1774 | +'recentchangeslinked' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| | 1775 | +'recentchangeslinked-feed' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| | 1776 | +'recentchangeslinked-toolbox' => 'Title of [[Special:RecentChangesLinked]] and display name of page on [[Special:SpecialPages]].', |
| | 1777 | +'recentchangeslinked-title' => 'Message used as title and page header on [[Special:RecentChangesLinked]] (needs an argument like "/Main Page"). Related changes are all recent change to pages that are linked from \'\'this page\'\'. "$1" is the name of the page for which related changes as show.', |
| | 1778 | +'recentchangeslinked-summary' => 'Summary of [[Special:RecentChangesLinked]].', |
| | 1779 | +'recentchangeslinked-page' => '{{Identical|Page name}}', |
| | 1780 | +'recentchangeslinked-to' => 'Checkbox in [[Special:RecentChangesLinked]].', |
| 1780 | 1781 | |
| 1781 | 1782 | # Upload |
| 1782 | 1783 | 'upload' => 'Display name for link to [[Special:Upload]] for uploading files to the wiki. |
| — | — | @@ -1994,7 +1995,6 @@ |
| 1995 | 1996 | |
| 1996 | 1997 | # File reversion |
| 1997 | 1998 | 'filerevert' => '{{Identical|Revert}}', |
| 1998 | | -'filerevert-backlink' => '{{optional}}', |
| 1999 | 1999 | 'filerevert-legend' => '{{Identical|Revert}}', |
| 2000 | 2000 | 'filerevert-intro' => 'Message displayed when you try to revert a version of a file. |
| 2001 | 2001 | * $1 is the name of the media |
| — | — | @@ -2015,7 +2015,6 @@ |
| 2016 | 2016 | {{Identical|Revert}}', |
| 2017 | 2017 | |
| 2018 | 2018 | # File deletion |
| 2019 | | -'filedelete-backlink' => '{{optional}}', |
| 2020 | 2019 | 'filedelete-legend' => '{{Identical|Delete}}', |
| 2021 | 2020 | 'filedelete-intro-old' => 'Message displayed when you try to delete a version of a file. |
| 2022 | 2021 | * $1 is the name of the media |
| — | — | @@ -2459,7 +2458,6 @@ |
| 2460 | 2459 | 'delete-confirm' => 'The title of the form to delete a page. |
| 2461 | 2460 | |
| 2462 | 2461 | $1 = the name of the page', |
| 2463 | | -'delete-backlink' => '{{optional}}', |
| 2464 | 2462 | 'delete-legend' => '{{Identical|Delete}}', |
| 2465 | 2463 | 'historywarning' => 'Warning when about to delete a page that has history. |
| 2466 | 2464 | $1 is the <b>approximate</b> number of revisions that the page has, the message should not claim to give an exact count.', |
| — | — | @@ -2527,9 +2525,6 @@ |
| 2528 | 2526 | 'prot_1movedto2' => 'Message description: [[mw:Manual:Interface/1movedto2]]', |
| 2529 | 2527 | 'protect-badnamespace-title' => 'Title of error page when trying to access action=protect on a non-protectable namespace (currently this only for the MediaWiki: namespace).', |
| 2530 | 2528 | 'protect-badnamespace-text' => 'Content of the error page that goes with {{msg-mw|protect-badnamespace-title}}.', |
| 2531 | | -'protect-backlink' => '{{optional|Translate it only if you have to change it, i.e. for RTL wikis}} |
| 2532 | | - |
| 2533 | | -Shown as subtitle of the protection form. $1 is the title of the page to be (un)protected.', |
| 2534 | 2529 | 'protect-legend' => 'Legend of the fieldset around the input form of the protection form.', |
| 2535 | 2530 | 'protectcomment' => '{{Identical|Reason}}', |
| 2536 | 2531 | 'protectexpiry' => '{{Identical|Expires}}', |
| — | — | @@ -2684,7 +2679,6 @@ |
| 2685 | 2680 | 'whatlinkshere' => 'The text of the link in the toolbox (on the left, below the search menu) going to [[Special:WhatLinksHere]].', |
| 2686 | 2681 | 'whatlinkshere-title' => "Title of the special page [[Special:WhatLinksHere]]. This page appears when you click on the 'What links here' button in the toolbox. $1 is the name of the page concerned.", |
| 2687 | 2682 | 'whatlinkshere-page' => '{{Identical|Page}}', |
| 2688 | | -'whatlinkshere-backlink' => '{{optional}}', |
| 2689 | 2683 | 'linkshere' => "This message is the header line of the [[Special:WhatLinksHere/$1]] page generated by clicking 'What links here' in the sidebar toolbox. It is followed by a navigation bar built using {{msg-mw|Viewprevnext}}.", |
| 2690 | 2684 | 'nolinkshere' => 'This appears on Whatlinkshere pages which are empty. |
| 2691 | 2685 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -889,6 +889,7 @@ |
| 890 | 890 | 'ok' => 'OK', |
| 891 | 891 | 'pagetitle' => '$1 - {{SITENAME}}', # only translate this message to other languages if you have to change it |
| 892 | 892 | 'pagetitle-view-mainpage' => '{{SITENAME}}', # only translate this message to other languages if you have to change it |
| | 893 | +'backlinksubtitle' => '← $1', # only translate this message to other languages if you have to change it |
| 893 | 894 | 'retrievedfrom' => 'Retrieved from "$1"', |
| 894 | 895 | 'youhavenewmessages' => 'You have $1 ($2).', |
| 895 | 896 | 'newmessageslink' => 'new messages', |
| — | — | @@ -1005,7 +1006,7 @@ |
| 1006 | 1007 | Function: $1<br /> |
| 1007 | 1008 | Query: $2', |
| 1008 | 1009 | 'viewsource' => 'View source', |
| 1009 | | -'viewsourcefor' => 'for $1', |
| | 1010 | +'viewsource-title' => 'View source for $1', |
| 1010 | 1011 | 'actionthrottled' => 'Action throttled', |
| 1011 | 1012 | 'actionthrottledtext' => 'As an anti-spam measure, you are limited from performing this action too many times in a short space of time, and you have exceeded this limit. |
| 1012 | 1013 | Please try again in a few minutes.', |
| — | — | @@ -2071,7 +2072,6 @@ |
| 2072 | 2073 | 'recentchangeslinked-feed' => 'Related changes', |
| 2073 | 2074 | 'recentchangeslinked-toolbox' => 'Related changes', |
| 2074 | 2075 | 'recentchangeslinked-title' => 'Changes related to "$1"', |
| 2075 | | -'recentchangeslinked-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2076 | 2076 | 'recentchangeslinked-noresult' => 'No changes on linked pages during the given period.', |
| 2077 | 2077 | 'recentchangeslinked-summary' => "This is a list of changes made recently to pages linked from a specified page (or to members of a specified category). |
| 2078 | 2078 | Pages on [[Special:Watchlist|your watchlist]] are '''bold'''.", |
| — | — | @@ -2356,7 +2356,6 @@ |
| 2357 | 2357 | |
| 2358 | 2358 | # File reversion |
| 2359 | 2359 | 'filerevert' => 'Revert $1', |
| 2360 | | -'filerevert-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2361 | 2360 | 'filerevert-legend' => 'Revert file', |
| 2362 | 2361 | 'filerevert-intro' => "You are about to revert the file '''[[Media:$1|$1]]''' to the [$4 version as of $3, $2].", |
| 2363 | 2362 | 'filerevert-comment' => 'Reason:', |
| — | — | @@ -2367,7 +2366,6 @@ |
| 2368 | 2367 | |
| 2369 | 2368 | # File deletion |
| 2370 | 2369 | 'filedelete' => 'Delete $1', |
| 2371 | | -'filedelete-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2372 | 2370 | 'filedelete-legend' => 'Delete file', |
| 2373 | 2371 | 'filedelete-intro' => "You are about to delete the file '''[[Media:$1|$1]]''' along with all of its history.", |
| 2374 | 2372 | 'filedelete-intro-old' => "You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].", |
| — | — | @@ -2789,7 +2787,6 @@ |
| 2790 | 2788 | 'exbeforeblank' => 'content before blanking was: "$1"', |
| 2791 | 2789 | 'exblank' => 'page was empty', |
| 2792 | 2790 | 'delete-confirm' => 'Delete "$1"', |
| 2793 | | -'delete-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2794 | 2791 | 'delete-legend' => 'Delete', |
| 2795 | 2792 | 'historywarning' => "'''Warning:''' The page you are about to delete has a history with approximately $1 {{PLURAL:$1|revision|revisions}}:", |
| 2796 | 2793 | 'confirmdeletetext' => 'You are about to delete a page along with all of its history. |
| — | — | @@ -2852,7 +2849,6 @@ |
| 2853 | 2850 | 'prot_1movedto2' => '[[$1]] moved to [[$2]]', |
| 2854 | 2851 | 'protect-badnamespace-title' => 'Non-protectable namespace', |
| 2855 | 2852 | 'protect-badnamespace-text' => 'Pages in this namespace cannot be protected.', |
| 2856 | | -'protect-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 2857 | 2853 | 'protect-legend' => 'Confirm protection', |
| 2858 | 2854 | 'protectcomment' => 'Reason:', |
| 2859 | 2855 | 'protectexpiry' => 'Expires:', |
| — | — | @@ -3006,7 +3002,6 @@ |
| 3007 | 3003 | 'whatlinkshere-title' => 'Pages that link to "$1"', |
| 3008 | 3004 | 'whatlinkshere-summary' => '', # do not translate or duplicate this message to other languages |
| 3009 | 3005 | 'whatlinkshere-page' => 'Page:', |
| 3010 | | -'whatlinkshere-backlink' => '← $1', # only translate this message to other languages if you have to change it |
| 3011 | 3006 | 'linkshere' => "The following pages link to '''[[:$1]]''':", |
| 3012 | 3007 | 'nolinkshere' => "No pages link to '''[[:$1]]'''.", |
| 3013 | 3008 | 'nolinkshere-ns' => "No pages link to '''[[:$1]]''' in the chosen namespace.", |
| Index: trunk/extensions/Video/RevertVideoAction.php |
| — | — | @@ -113,10 +113,8 @@ |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | protected function getDescription() { |
| 117 | | - return wfMsg( |
| 118 | | - 'filerevert-backlink', |
| 119 | | - Linker::linkKnown( $this->getTitle() ) |
| 120 | | - ); |
| | 117 | + $this->getOutput()->addBacklinkSubtitle( $this->getTitle() ); |
| | 118 | + return ''; |
| 121 | 119 | } |
| 122 | 120 | |
| 123 | 121 | |