From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Tue, 1 May 2012 11:33:51 +0000 (+0200)
Subject: (bug 25946) The message on the top of Special:RecentChanges is now displayed in user... 
X-Git-Tag: 1.31.0-rc.0~23553^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=5c18fed079f92b1f29c34d898415d16eddbf89a0;p=lhc%2Fweb%2Fwiklou.git

(bug 25946) The message on the top of Special:RecentChanges is now displayed in user language instead of content language

Moved 'recentchangestext' message to 'recentchanges-summary'; left 'recentchangestext' empty by default for wikis that would like to display things in content language on the top of Special:RecentChanges

This a resubmit of r86186 (https://www.mediawiki.org/wiki/Special:Code/MediaWiki/86186) which was reverted in r86294 (https://www.mediawiki.org/wiki/Special:Code/MediaWiki/86294). The revert should have been temporary (at least from commit summary), but it seems that it was not the case.

Change-Id: Ia2061a581f754aa1bc374a615d41e8465996feac
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 78c7c95919..ccf0b934c8 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -103,6 +103,8 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 30410) Removed deprecated $wgFilterCallback and the 'filtered' API error.
 * (bug 32604) Some messages needs escaping of wikitext inside username
 * (bug 36537) Rename wfArrayToCGI to wfArrayToCgi for consistency with wfCgiToArray.
+* (bug 25946) The message on the top of Special:RecentChanges is now displayed
+  in user language instead of content language
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index a7a87f0f8e..46dd115a5e 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -633,14 +633,18 @@ class SpecialRecentChanges extends IncludableSpecialPage {
 	 */
 	function setTopText( FormOptions $opts ) {
 		global $wgContLang;
-		$this->getOutput()->addWikiText(
-			Html::rawElement( 'p',
-				array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),
-				"\n" . $this->msg( 'recentchangestext' )->inContentLanguage()->plain() . "\n"
-			), 
-			/* $lineStart */ false,
-			/* $interface */ false
-		);
+
+		$message = $this->msg( 'recentchangestext' )->inContentLanguage();
+		if ( $message->exists() ) {
+			$this->getOutput()->addWikiText(
+				Html::rawElement( 'p',
+					array( 'lang' => $wgContLang->getCode(), 'dir' => $wgContLang->getDir() ),
+					"\n" . $message->plain() . "\n"
+				),
+				/* $lineStart */ false,
+				/* $interface */ false
+			);
+		}
 	}
 
 	/**
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index bb405b61d6..4c521768c9 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2060,7 +2060,8 @@ Your e-mail address is not revealed when other users contact you.',
 'recentchanges'                     => 'Recent changes',
 'recentchanges-url'                 => 'Special:RecentChanges', # do not translate or duplicate this message to other languages
 'recentchanges-legend'              => 'Recent changes options',
-'recentchangestext'                 => 'Track the most recent changes to the wiki on this page.',
+'recentchanges-summary'             => 'Track the most recent changes to the wiki on this page.',
+'recentchangestext'                 => '-', # do not translate or duplicate this message to other languages
 'recentchanges-feed-description'    => 'Track the most recent changes to the wiki in this feed.',
 'recentchanges-label-newpage'       => 'This edit created a new page',
 'recentchanges-label-minor'         => 'This is a minor edit',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 796af8ba2b..f5986872e6 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1769,7 +1769,7 @@ This action allows editing of all of the "user rights", not just the rights of t
 
 {{Identical|Recent changes}}',
 'recentchanges-legend' => 'Legend of the fieldset of [[Special:RecentChanges]]',
-'recentchangestext' => 'Text in recent changes',
+'recentchanges-summary' => 'Summary of [[Special:RecentChanges]].',
 'recentchanges-label-newpage' => 'Tooltip for {{msg-mw|newpageletter}}',
 'recentchanges-label-minor' => 'Tooltip for {{msg-mw|newpageletter}}',
 'recentchanges-label-bot' => 'Tooltip for {{msg-mw|boteditletter}}',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 6a995544f5..42354eae65 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -123,6 +123,7 @@ $wgIgnoredMessages = array(
 	'pubmedurl',
 	'randompage-url',
 	'recentchanges-url',
+	'recentchangestext',
 	'revision-info-current',
 	'revision-nav',
 	'rfcurl',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 0c3b39c221..3fc6563057 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1212,6 +1212,7 @@ $wgMessageStructure = array(
 		'recentchanges',
 		'recentchanges-url',
 		'recentchanges-legend',
+		'recentchanges-summary',
 		'recentchangestext',
 		'recentchanges-feed-description',
 		'recentchanges-label-newpage',