| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -639,7 +639,7 @@ |
| 640 | 640 | ), |
| 641 | 641 | 'diffs' => array( |
| 642 | 642 | 'history-title', |
| 643 | | - 'difference-title', |
| | 643 | + 'difference', |
| 644 | 644 | 'lineno', |
| 645 | 645 | 'compareselectedversions', |
| 646 | 646 | 'editundo', |
| — | — | @@ -798,7 +798,6 @@ |
| 799 | 799 | 'rc_categories_any', |
| 800 | 800 | 'rc-change-size', |
| 801 | 801 | 'newsectionsummary', |
| 802 | | - 'difference', |
| 803 | 802 | ), |
| 804 | 803 | 'recentchangeslinked' => array( |
| 805 | 804 | 'recentchangeslinked', |
| Index: trunk/phase3/includes/DifferenceEngine.php |
| — | — | @@ -72,10 +72,6 @@ |
| 73 | 73 | $this->mRefreshCache = $refreshCache; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | | - /** |
| 77 | | - * Show difference between revisions |
| 78 | | - * @param $diffOnly bool show the difference only, no preview |
| 79 | | - */ |
| 80 | 76 | function showDiffPage( $diffOnly = false ) { |
| 81 | 77 | global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol; |
| 82 | 78 | $fname = 'DifferenceEngine::showDiffPage'; |
| — | — | @@ -130,7 +126,6 @@ |
| 131 | 127 | # a diff between a version V and its previous version V' AND the version V |
| 132 | 128 | # is the first version of that article. In that case, V' does not exist. |
| 133 | 129 | if ( $this->mOldid === false ) { |
| 134 | | - $wgOut->setPageTitle( wfMsg( 'difference-title', $this->mTitle->getPrefixedText() ) ); |
| 135 | 130 | $this->showFirstRevision(); |
| 136 | 131 | $this->renderNewRevision(); // should we respect $diffOnly here or not? |
| 137 | 132 | wfProfileOut( $fname ); |
| — | — | @@ -142,10 +137,11 @@ |
| 143 | 138 | $oldTitle = $this->mOldPage->getPrefixedText(); |
| 144 | 139 | $newTitle = $this->mNewPage->getPrefixedText(); |
| 145 | 140 | if( $oldTitle == $newTitle ) { |
| 146 | | - $wgOut->setPageTitle( wfMsg( 'difference-title', $newTitle ) ); |
| | 141 | + $wgOut->setPageTitle( $newTitle ); |
| 147 | 142 | } else { |
| 148 | | - $wgOut->setPageTitle( wfMsg( 'difference-title', $oldTitle . ', ' . $newTitle ) ); |
| | 143 | + $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle ); |
| 149 | 144 | } |
| | 145 | + $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| 150 | 146 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 151 | 147 | |
| 152 | 148 | if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { |
| — | — | @@ -370,6 +366,7 @@ |
| 371 | 367 | |
| 372 | 368 | $wgOut->addHTML( $header ); |
| 373 | 369 | |
| | 370 | + $wgOut->setSubtitle( wfMsg( 'difference' ) ); |
| 374 | 371 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 375 | 372 | |
| 376 | 373 | wfProfileOut( $fname ); |
| — | — | @@ -2015,3 +2012,6 @@ |
| 2016 | 2013 | wfProfileOut( $fname ); |
| 2017 | 2014 | } |
| 2018 | 2015 | } |
| | 2016 | + |
| | 2017 | + |
| | 2018 | + |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1215,7 +1215,7 @@ |
| 1216 | 1216 | |
| 1217 | 1217 | # Diffs |
| 1218 | 1218 | 'history-title' => 'Revision history of "$1"', |
| 1219 | | -'difference-title' => 'Difference between revisions of "$1"', |
| | 1219 | +'difference' => '(Difference between revisions)', |
| 1220 | 1220 | 'lineno' => 'Line $1:', |
| 1221 | 1221 | 'compareselectedversions' => 'Compare selected versions', |
| 1222 | 1222 | 'editundo' => 'undo', |
| — | — | @@ -1389,7 +1389,6 @@ |
| 1390 | 1390 | 'rc_categories_any' => 'Any', |
| 1391 | 1391 | 'rc-change-size' => '$1', # only translate this message to other languages if you have to change it |
| 1392 | 1392 | 'newsectionsummary' => '/* $1 */ new section', |
| 1393 | | -'difference' => '(Difference between revisions)', |
| 1394 | 1393 | |
| 1395 | 1394 | # Recent changes linked |
| 1396 | 1395 | 'recentchangeslinked' => 'Related changes', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -876,7 +876,7 @@ |
| 877 | 877 | |
| 878 | 878 | # Diffs |
| 879 | 879 | 'history-title' => 'Versionsgeschichte von „$1“', |
| 880 | | -'difference-title' => 'Versionsunterschied: „$1“', |
| | 880 | +'difference' => '(Unterschied zwischen Versionen)', |
| 881 | 881 | 'lineno' => 'Zeile $1:', |
| 882 | 882 | 'compareselectedversions' => 'Gewählte Versionen vergleichen', |
| 883 | 883 | 'editundo' => 'rückgängig', |
| — | — | @@ -1035,7 +1035,6 @@ |
| 1036 | 1036 | 'rc_categories_any' => 'Alle', |
| 1037 | 1037 | 'rc-change-size' => '$1 {{PLURAL:$1|Byte|Bytes}}', |
| 1038 | 1038 | 'newsectionsummary' => 'Neuer Abschnitt /* $1 */', |
| 1039 | | -'difference' => '(Unterschied zwischen Versionen)', |
| 1040 | 1039 | |
| 1041 | 1040 | # Recent changes linked |
| 1042 | 1041 | 'recentchangeslinked' => 'Änderungen an verlinkten Seiten', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -86,7 +86,6 @@ |
| 87 | 87 | * Show a warning message when creating/editing a user (talk) page but the user |
| 88 | 88 | does not exists |
| 89 | 89 | * (bug 8396) Ignore out-of-date serialised message caches |
| 90 | | -* Add descriptive <title> to revision difference page |
| 91 | 90 | * (bug 12195) Undeleting pages now requires 'undelete' permission |
| 92 | 91 | |
| 93 | 92 | === Bug fixes in 1.12 === |