fixes for r54633: Add wfMsgExt for parsing PLURAL in message "newmessagesdifflink"

diff --git a/includes/Skin.php b/includes/Skin.php
index a56082c..e64cedf 100644 (file)
--- 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 02ab1bd..9188723 100644 (file)
--- 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 f3d07d0..29b8fdc 100644 (file)
--- 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'             => ', ', # do not translate or duplicate this message to other languages
 'editsection'                  => 'edit',