From 33468645eba825f957925a6a69450ad478e44933 Mon Sep 17 00:00:00 2001
From: Jan Luca Naumann <jan@users.mediawiki.org>
Date: Sat, 8 Aug 2009 17:34:12 +0000
Subject: [PATCH] fixes for r54633: Add wfMsgExt for parsing PLURAL in message
 "newmessagesdifflink"

---
 includes/Skin.php                 | 4 ++--
 includes/SkinTemplate.php         | 6 +++---
 languages/messages/MessagesEn.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index a56082c465..e64cedf28a 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1044,7 +1044,7 @@ END;
 				
 				$tl = $this->link(
 					$wgUser->getTalkPage(),
-					wfMsgHtml( 'newmessageslink'),
+					wfMsgExt( 'newmessageslink', array( 'parsemag', 'escape' ) ),
 					array(),
 					array( 'redirect' => 'no' ),
 					array( 'known', 'noclasses' )
@@ -1052,7 +1052,7 @@ END;
 
 				$dl = $this->link(
 					$wgUser->getTalkPage(),
-					wfMsgHtml( 'newmessagesdifflink', $nu ),
+					wfMsgExt( 'newmessagesdifflink', array( 'parsemag', 'escape' ), $nu ),
 					array(),
 					array( 'diff' => 'cur' ),
 					array( 'known', 'noclasses' )
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 02ab1bdcee..91887235c7 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -308,7 +308,7 @@ class SkinTemplate extends Skin {
 			if( !$usertalktitle->equals( $this->mTitle ) ) {
 				$newmessageslink = $this->link(
 					$usertalktitle,
-					wfMsgHtml( 'newmessageslink' ),
+					wfMsgExt( 'newmessageslink', array( 'parsemag', 'escape' ) ),
 					array(),
 					array( 'redirect' => 'no' ),
 					array( 'known', 'noclasses' )
@@ -316,7 +316,7 @@ class SkinTemplate extends Skin {
 
 				$newmessagesdifflink = $this->link(
 					$usertalktitle,
-					wfMsgHtml( 'newmessagesdifflink', $newmessagescount ),
+					wfMsgExt( 'newmessagesdifflink', array( 'parsemag', 'escape' ), $newmessagescount ),
 					array(),
 					array( 'diff' => 'cur' ),
 					array( 'known', 'noclasses' )
@@ -325,7 +325,7 @@ class SkinTemplate extends Skin {
 				$ntl = wfMsg(
 					'youhavenewmessages',
 					$newmessageslink,
-					$newmessagesdifflink,
+					$newmessagesdifflink
 				);
 				# Disable Cache
 				$out->setSquidMaxage( 0 );
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f3d07d0543..29b8fdcee5 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -894,9 +894,9 @@ See [[Special:Version|version page]].',
 'pagetitle'                    => '$1 - {{SITENAME}}', # only translate this message to other languages if you have to change it
 'pagetitle-view-mainpage'      => '{{SITENAME}}', # only translate this message to other languages if you have to change it
 'retrievedfrom'                => 'Retrieved from "$1"',
-'youhavenewmessages'           => 'You have $3 $1 ($2).',
-'newmessageslink'              => '{{PLURAL:$1|new message|new messages}}',
-'newmessagesdifflink'          => 'last change',
+'youhavenewmessages'           => 'You have $1 ($2).',
+'newmessageslink'              => 'new messages',
+'newmessagesdifflink'          => '{{PLURAL:$1|one change|$1 changes}}',
 'youhavenewmessagesmulti'      => 'You have new messages on $1',
 'newtalkseparator'             => ',&#32;', # do not translate or duplicate this message to other languages
 'editsection'                  => 'edit',
-- 
2.20.1