From 9814777e25bbcd06e5a3be555b5f414dffd7477f Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 16 Apr 2011 08:34:01 +0000 Subject: [PATCH] * (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 --- RELEASE-NOTES | 2 ++ includes/specials/SpecialRecentchanges.php | 5 ++++- languages/messages/MessagesEn.php | 3 ++- maintenance/language/messageTypes.inc | 1 + maintenance/language/messages.inc | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ede4f3e303..36746f4818 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -238,6 +238,8 @@ PHP if you have not done so prior to upgrading MediaWiki. * UtfNormal::cleanUp on an invalid utf-8 sequence no longer returns false if intl installed. * (bug 28561) The css class small will no longer make nested elements even smaller. * (bug 13172) Array type exif data (like GPS) was not being extracted from images. +* (bug 25946) The message on the top of Special:RecentChanges is now displayed + in user language instead of content language === API changes in 1.18 === * (bug 26339) Throw warning when truncating an overlarge API result diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 936a0537f6..4c1b4c2c24 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -547,7 +547,10 @@ class SpecialRecentChanges extends IncludableSpecialPage { * @param $opts FormOptions */ function setTopText( OutputPage $out, FormOptions $opts ){ - $out->addWikiText( wfMsgForContentNoTrans( 'recentchangestext' ) ); + $message = wfMessage( 'recentchangestext' )->inContentLanguage(); + if ( $message->exists() ) { + $out->addWikiText( $message->plain() ); + } } /** diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 4007446edb..891d99d81c 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1986,7 +1986,8 @@ If you choose to provide it, this will be used for giving you attribution for yo '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/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 9f6aba6fed..9972054ce1 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -119,6 +119,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 b963abcd1f..caa0476fe3 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1168,6 +1168,7 @@ $wgMessageStructure = array( 'recentchanges', 'recentchanges-url', 'recentchanges-legend', + 'recentchanges-summary', 'recentchangestext', 'recentchanges-feed-description', 'recentchanges-label-newpage', -- 2.20.1