From 9ecc621a9147aaf8a30ae6de1fb8671a779d779e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 4 Dec 2007 20:47:52 +0000 Subject: [PATCH] Revert r28136; overlong title prefix obscures page title in tabs, window lists, etc --- RELEASE-NOTES | 1 - includes/DifferenceEngine.php | 14 +++++++------- languages/messages/MessagesDe.php | 3 +-- languages/messages/MessagesEn.php | 3 +-- maintenance/language/messages.inc | 3 +-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 4b59dc7cf6..57fdaa2737 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -86,7 +86,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Show a warning message when creating/editing a user (talk) page but the user does not exists * (bug 8396) Ignore out-of-date serialised message caches -* Add descriptive to revision difference page * (bug 12195) Undeleting pages now requires 'undelete' permission === Bug fixes in 1.12 === diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php index 3095873a8e..b3bf19a663 100644 --- a/includes/DifferenceEngine.php +++ b/includes/DifferenceEngine.php @@ -72,10 +72,6 @@ class DifferenceEngine { $this->mRefreshCache = $refreshCache; } - /** - * Show difference between revisions - * @param $diffOnly bool show the difference only, no preview - */ function showDiffPage( $diffOnly = false ) { global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol; $fname = 'DifferenceEngine::showDiffPage'; @@ -130,7 +126,6 @@ CONTROL; # a diff between a version V and its previous version V' AND the version V # is the first version of that article. In that case, V' does not exist. if ( $this->mOldid === false ) { - $wgOut->setPageTitle( wfMsg( 'difference-title', $this->mTitle->getPrefixedText() ) ); $this->showFirstRevision(); $this->renderNewRevision(); // should we respect $diffOnly here or not? wfProfileOut( $fname ); @@ -142,10 +137,11 @@ CONTROL; $oldTitle = $this->mOldPage->getPrefixedText(); $newTitle = $this->mNewPage->getPrefixedText(); if( $oldTitle == $newTitle ) { - $wgOut->setPageTitle( wfMsg( 'difference-title', $newTitle ) ); + $wgOut->setPageTitle( $newTitle ); } else { - $wgOut->setPageTitle( wfMsg( 'difference-title', $oldTitle . ', ' . $newTitle ) ); + $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle ); } + $wgOut->setSubtitle( wfMsg( 'difference' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) { @@ -370,6 +366,7 @@ CONTROL; $wgOut->addHTML( $header ); + $wgOut->setSubtitle( wfMsg( 'difference' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); wfProfileOut( $fname ); @@ -2015,3 +2012,6 @@ class TableDiffFormatter extends DiffFormatter wfProfileOut( $fname ); } } + + + diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index 7b6c906a85..f559fc393e 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -876,7 +876,7 @@ Stelle dadurch sicher, dass die Versionsgeschichte eines Artikel historisch korr # Diffs 'history-title' => 'Versionsgeschichte von „$1“', -'difference-title' => 'Versionsunterschied: „$1“', +'difference' => '(Unterschied zwischen Versionen)', 'lineno' => 'Zeile $1:', 'compareselectedversions' => 'Gewählte Versionen vergleichen', 'editundo' => 'rückgängig', @@ -1035,7 +1035,6 @@ Nicht selektierte Gruppen werden nicht geändert. Eine Selektion kann mit '''Str 'rc_categories_any' => 'Alle', 'rc-change-size' => '$1 {{PLURAL:$1|Byte|Bytes}}', 'newsectionsummary' => 'Neuer Abschnitt /* $1 */', -'difference' => '(Unterschied zwischen Versionen)', # Recent changes linked 'recentchangeslinked' => 'Änderungen an verlinkten Seiten', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 41474e47ab..6fd29e4b3f 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1215,7 +1215,7 @@ Make sure that this change will maintain historical page continuity. # Diffs 'history-title' => 'Revision history of "$1"', -'difference-title' => 'Difference between revisions of "$1"', +'difference' => '(Difference between revisions)', 'lineno' => 'Line $1:', 'compareselectedversions' => 'Compare selected versions', 'editundo' => 'undo', @@ -1389,7 +1389,6 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left 'rc_categories_any' => 'Any', 'rc-change-size' => '$1', # only translate this message to other languages if you have to change it 'newsectionsummary' => '/* $1 */ new section', -'difference' => '(Difference between revisions)', # Recent changes linked 'recentchangeslinked' => 'Related changes', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 56fe05f87e..1018dfe3cd 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -639,7 +639,7 @@ $wgMessageStructure = array( ), 'diffs' => array( 'history-title', - 'difference-title', + 'difference', 'lineno', 'compareselectedversions', 'editundo', @@ -798,7 +798,6 @@ $wgMessageStructure = array( 'rc_categories_any', 'rc-change-size', 'newsectionsummary', - 'difference', ), 'recentchangeslinked' => array( 'recentchangeslinked', -- 2.20.1