From 27112b1d02e76b60f2bada5365dcb9aa99b4ada6 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 28 Feb 2007 18:11:09 +0000
Subject: [PATCH] =?utf8?q?*=20(bug=208539=20Enable=20PLURAL=20option=20for?=
 =?utf8?q?=20another=20message=20of=20Recentchanges=20*=20Patch=20by=20Nik?=
 =?utf8?q?las=20Laxstr=C3=B6m?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 RELEASE-NOTES                     |  1 +
 includes/ChangesList.php          | 18 +++++++++++++-----
 languages/messages/MessagesDe.php |  2 +-
 languages/messages/MessagesEn.php |  2 +-
 maintenance/language/messages.inc |  3 ++-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cccb26fee7..f0f9c8e2a2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -241,6 +241,7 @@ lighter making things easier to read.
 * (bug 5805) Enable PLURAL option for some messages of watchlist and statistic
 * (bug 3953) Work around poor display of parenthesis in the in other
   languages section of MonoBook skin
+* (bug 8539) Enable PLURAL option for another message of recentchanges.
 
 == Languages updated ==
 
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 8f0ec8ef83..43fd543703 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -60,7 +60,7 @@ class ChangesList {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
 			foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last '.
-				'blocklink changes history boteditletter' ) as $msg ) {
+				'blocklink history boteditletter' ) as $msg ) {
 				$this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
 			}
 		}
@@ -418,7 +418,7 @@ class EnhancedChangesList extends ChangesList {
 	 * Enhanced RC group
 	 */
 	function recentChangesBlockGroup( $block ) {
-		global $wgContLang, $wgRCShowChangedSize;
+		global $wgLang, $wgContLang, $wgRCShowChangedSize;
 		$r = '';
 
 		# Collate list of users
@@ -480,13 +480,21 @@ class EnhancedChangesList extends ChangesList {
 		$currentRevision = $block[0]->mAttribs['rc_this_oldid'];
 		if( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
 			# Changes
-			$r .= ' ('.count($block).' ';
+
+			$n = count($block);
+			static $nchanges = array();
+			if ( !isset( $nchanges[$n] ) ) {
+				$nchanges[$n] = wfMsgExt( 'nchanges', array( 'parsemag', 'escape'),
+					$wgLang->formatNum( $n ) );
+			}
+
+			$r .= ' (';
 
 			if( $isnew ) {
-				$r .= $this->message['changes'];
+				$r .= $nchanges[$n];
 			} else {
 				$r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(),
-					$this->message['changes'], $curIdEq."&diff=$currentRevision&oldid=$oldid" );
+					$nchanges[$n], $curIdEq."&diff=$currentRevision&oldid=$oldid" );
 			}
 
 			$r .= ') . . ';
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index e6ac290545..ec1ddffd33 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -873,7 +873,7 @@ Nicht selektierte Gruppen werden nicht geändert. Eine Selektion kann mit '''Str
 'grouppage-bureaucrat' => '{{ns:project}}:Bürokraten',
 
 # Recent changes
-'changes'                           => 'Änderungen',
+'nchanges'                          => '$1 {{PLURAL:$1|Änderung|Änderungen}}',
 'recentchanges'                     => 'Letzte Änderungen',
 'recentchangestext'                 => "Auf dieser Seite können Sie die letzten Änderungen auf '''{{SITENAME}}''' nachverfolgen.",
 'recentchanges-feed-description'    => 'Verfolge mit diesem Feed die letzten Änderungen in {{SITENAME}}.',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 46218149a5..6f2900b6a1 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1264,7 +1264,7 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left
 
 # Recent changes
 #
-'changes' => 'changes',
+'nchanges'      => '$1 {{PLURAL:$1|change|changes}}',
 'recentchanges' => 'Recent changes',
 'recentchanges-url' => 'Special:Recentchanges',
 'recentchangestext' => 'Track the most recent changes to the wiki on this page.',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 09a57b4477..f0265e5899 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -693,7 +693,7 @@ $wgMessageStructure = array(
 		'rightsnone',
 	),
 	'recentchanges' => array(
-		'changes',
+		'nchanges',
 		'recentchanges',
 		'recentchanges-url',
 		'recentchangestext',
@@ -883,6 +883,7 @@ $wgMessageStructure = array(
 		'nmembers',
 		'nrevisions',
 		'nviews',
+		'nchanges',
 		'specialpage-empty',
 		'lonelypages',
 		'lonelypages-summary',
-- 
2.20.1