(fixes for r54628) Add PLURAL to "last change" message

diff --git a/includes/Skin.php b/includes/Skin.php
index 0df32f0..a56082c 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1040,9 +1040,11 @@ END;
                        # do not show "You have new messages" text when we are viewing our
                        # own talk page
                        if( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
+                               $nu = $wgUser->getnewMessagesCount();
+                               
                                $tl = $this->link(
                                        $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessageslink' ),
+                                       wfMsgHtml( 'newmessageslink'),
                                        array(),
                                        array( 'redirect' => 'no' ),
                                        array( 'known', 'noclasses' )
@@ -1050,7 +1052,7 @@ END;
 
                                $dl = $this->link(
                                        $wgUser->getTalkPage(),
-                                       wfMsgHtml( 'newmessagesdifflink' ),
+                                       wfMsgHtml( 'newmessagesdifflink', $nu ),
                                        array(),
                                        array( 'diff' => 'cur' ),
                                        array( 'known', 'noclasses' )

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index a4e5eff..02ab1bd 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -302,6 +302,8 @@ class SkinTemplate extends Skin {
                if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
                        $usertitle = $this->mUser->getUserPage();
                        $usertalktitle = $usertitle->getTalkPage();
+                       
+                       $newmessagescount = $wgUser->getnewMessagesCount();
 
                        if( !$usertalktitle->equals( $this->mTitle ) ) {
                                $newmessageslink = $this->link(
@@ -314,19 +316,16 @@ class SkinTemplate extends Skin {
 
                                $newmessagesdifflink = $this->link(
                                        $usertalktitle,
-                                       wfMsgHtml( 'newmessagesdifflink' ),
+                                       wfMsgHtml( 'newmessagesdifflink', $newmessagescount ),
                                        array(),
                                        array( 'diff' => 'cur' ),
                                        array( 'known', 'noclasses' )
                                );
-                               
-                               $newmessagesnumber = $wgUser->getNewtalkNumber();
 
                                $ntl = wfMsg(
                                        'youhavenewmessages',
                                        $newmessageslink,
                                        $newmessagesdifflink,
-                                       $newmessagesnumber
                                );
                                # Disable Cache
                                $out->setSquidMaxage( 0 );
@@ -538,7 +537,7 @@ class SkinTemplate extends Skin {
                                # do not show text when we are viewing our
                                # own talk page
                                if( !$title->equals( $wgUser->getTalkPage() ) ) {                                       
-                                       $newtalk = $wgUser->getNewtalkNumber();
+                                       $newtalk = $wgUser->getnewMessagesCount();
                                        
                                        # disable caching
                                        $wgOut->setSquidMaxage( 0 );

diff --git a/includes/User.php b/includes/User.php
index ca11fdc..c2eead2 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -217,7 +217,7 @@ class User {
        
        static $idCacheByName = array();
        
-       var $mNewtalknumber;
+       public $mNewtalknumber;
 
        /**
         * Lightweight constructor for an anonymous user.
@@ -1639,7 +1639,7 @@ class User {
         * Return the number of new messages
         * @return \int The number of new messages
         */
-        public function getNewtalkNumber() {
+        public function getnewMessagesCount() {
                global $wgLang;
                return $wgLang->formatNum( $this->mNewtalknumber );
         }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index af8a701..f3d07d0 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -895,7 +895,7 @@ See [[Special:Version|version page]].',
 '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'              => 'new messages',
+'newmessageslink'              => '{{PLURAL:$1|new message|new messages}}',
 'newmessagesdifflink'          => 'last change',
 'youhavenewmessagesmulti'      => 'You have new messages on $1',
 'newtalkseparator'             => ', ', # do not translate or duplicate this message to other languages