r54714 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r54713‎ | r54714 | r54715 >
Date:11:29, 10 August 2009
Author:jan
Status:reverted
Tags:
Comment:
(r54628 + r54633) Display (...) only if there new messages
Modified paths:
  • /trunk/phase3/includes/SkinTemplate.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/SkinTemplate.php
@@ -536,19 +536,20 @@
537537 if ( $wgUser->getNewtalk() ) {
538538 # do not show text when we are viewing our
539539 # own talk page
540 - if( !$title->equals( $wgUser->getTalkPage() ) ) {
541 - $newtalk = $wgUser->getnewMessagesCount();
 540+ if( !$title->equals( $wgUser->getTalkPage() ) ) {
 541+ $newmessagescount = $wgUser->getnewMessagesCount();
 542+ $newtalk = wfMsg( 'word-separator' ) . wfMsg( 'parentheses', $newmessagescount );
542543
543544 # disable caching
544545 $wgOut->setSquidMaxage( 0 );
545546 $wgOut->enableClientCache( false );
546547 }
547548 else {
548 - $newtalk = 0;
 549+ $newtalk = '';
549550 }
550551 }
551552 else {
552 - $newtalk = 0;
 553+ $newtalk = '';
553554 }
554555 $personal_urls['mytalk'] = array(
555556 'text' => wfMsg( 'mytalk', $newtalk ),
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -751,7 +751,7 @@
752752 'cancel' => 'Cancel',
753753 'moredotdotdot' => 'More...',
754754 'mypage' => 'My page',
755 -'mytalk' => 'My talk ($1)',
 755+'mytalk' => 'My talk$1',
756756 'anontalk' => 'Talk for this IP',
757757 'navigation' => 'Navigation',
758758 'and' => ' and',

Follow-up revisions

RevisionCommit summaryAuthorDate
r54733Pull back r54590, r54591, r54628, r54633, r54636, r54714 "Add after the link ...brion19:03, 10 August 2009
r54740Localisation updates for core messages from translatewiki.net...siebrand20:45, 10 August 2009

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r54628(fixes for r54590 & bug 20103) Use now only one query and add number to messa...jan10:37, 8 August 2009
r54633(fixes for r54628) Add PLURAL to "last change" messagejan16:02, 8 August 2009

Status & tagging log