(r54628 + r54633) Display (...) only if there new messages

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9188723..0e0f058 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -536,19 +536,20 @@ class SkinTemplate extends Skin {
                        if ( $wgUser->getNewtalk() ) {
                                # do not show text when we are viewing our
                                # own talk page
-                               if( !$title->equals( $wgUser->getTalkPage() ) ) {                                       
-                                       $newtalk = $wgUser->getnewMessagesCount();
+                               if( !$title->equals( $wgUser->getTalkPage() ) ) {
+                                       $newmessagescount = $wgUser->getnewMessagesCount();
+                                       $newtalk = wfMsg( 'word-separator' ) . wfMsg( 'parentheses', $newmessagescount );
                                        
                                        # disable caching
                                        $wgOut->setSquidMaxage( 0 );
                                        $wgOut->enableClientCache( false );
                                }
                                else {
-                                       $newtalk = 0;
+                                       $newtalk = '';
                                }
                        }
                        else {
-                               $newtalk = 0;
+                               $newtalk = '';
                        }
                        $personal_urls['mytalk'] = array(
                                'text' => wfMsg( 'mytalk', $newtalk ),

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 29b8fdc..a0f3d51 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -751,7 +751,7 @@ XHTML id names.
 'cancel'        => 'Cancel',
 'moredotdotdot' => 'More...',
 'mypage'        => 'My page',
-'mytalk'        => 'My talk ($1)',
+'mytalk'        => 'My talk$1',
 'anontalk'      => 'Talk for this IP',
 'navigation'    => 'Navigation',
 'and'           => ' and',