From 297b813cbbfaf7cde2e6a35ad253514440513256 Mon Sep 17 00:00:00 2001 From: Jan Luca Naumann Date: Mon, 10 Aug 2009 11:29:33 +0000 Subject: [PATCH] (r54628 + r54633) Display (...) only if there new messages --- includes/SkinTemplate.php | 9 +++++---- languages/messages/MessagesEn.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 91887235c7..0e0f058914 100644 --- 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 29b8fdcee5..a0f3d514fa 100644 --- 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', -- 2.20.1