From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Tue, 4 Dec 2007 10:56:29 +0000 (+0000)
Subject: * Add descriptive <title> to revision difference page
X-Git-Tag: 1.31.0-rc.0~50562
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=4f148faea5e049a096527a80717063e62ff40894;p=lhc%2Fweb%2Fwiklou.git

* Add descriptive <title> to revision difference page
* Move message 'difference' in language files to recentchanges section as it is only used in RecentChanges.php now.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index caf62ac1e6..4b69dba7e5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -86,6 +86,7 @@ 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 <title> to revision difference page
 
 === Bug fixes in 1.12 ===
 
diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index b3bf19a663..3095873a8e 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -72,6 +72,10 @@ 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';
@@ -126,6 +130,7 @@ 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 );
@@ -137,11 +142,10 @@ CONTROL;
 		$oldTitle = $this->mOldPage->getPrefixedText();
 		$newTitle = $this->mNewPage->getPrefixedText();
 		if( $oldTitle == $newTitle ) {
-			$wgOut->setPageTitle( $newTitle );
+			$wgOut->setPageTitle( wfMsg( 'difference-title', $newTitle ) );
 		} else {
-			$wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
+			$wgOut->setPageTitle( wfMsg( 'difference-title', $oldTitle . ', ' . $newTitle ) );
 		}
-		$wgOut->setSubtitle( wfMsg( 'difference' ) );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
 		if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) {
@@ -366,7 +370,6 @@ CONTROL;
 
 		$wgOut->addHTML( $header );
 
-		$wgOut->setSubtitle( wfMsg( 'difference' ) );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
 		wfProfileOut( $fname );
@@ -2012,6 +2015,3 @@ class TableDiffFormatter extends DiffFormatter
 		wfProfileOut( $fname );
 	}
 }
-
-
-
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 268b1bb634..bfc0731dbe 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -877,7 +877,7 @@ Stelle dadurch sicher, dass die Versionsgeschichte eines Artikel historisch korr
 
 # Diffs
 'history-title'             => 'Versionsgeschichte von „$1“',
-'difference'                => '(Unterschied zwischen Versionen)',
+'difference-title'          => 'Versionsunterschied: „$1“',
 'loadingrev'                => 'Lade Versionen zur Unterscheidung',
 'lineno'                    => 'Zeile $1:',
 'editcurrent'               => 'Die aktuelle Version dieser Seite bearbeiten',
@@ -1040,6 +1040,7 @@ 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 40accd2aa9..e7df2bd3a7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1216,7 +1216,7 @@ Make sure that this change will maintain historical page continuity.
 
 # Diffs
 'history-title'             => 'Revision history of "$1"',
-'difference'                => '(Difference between revisions)',
+'difference-title'          => 'Difference between revisions of "$1"',
 'loadingrev'                => 'loading revision for diff',
 'lineno'                    => 'Line $1:',
 'editcurrent'               => 'Edit the current version of this page',
@@ -1394,6 +1394,7 @@ 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 2fe9d42c3a..525c60f5ed 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -640,7 +640,7 @@ $wgMessageStructure = array(
 	),
 	'diffs' => array(
 		'history-title',
-		'difference',
+		'difference-title',
 		'loadingrev',
 		'lineno',
 		'editcurrent',
@@ -803,6 +803,7 @@ $wgMessageStructure = array(
 		'rc_categories_any',
 		'rc-change-size',
 		'newsectionsummary',
+		'difference',
 	),
 	'recentchangeslinked' => array(
 		'recentchangeslinked',