Index: trunk/phase3/includes/SkinTemplate.php |
— | — | @@ -280,7 +280,12 @@ |
281 | 281 | $ntl = wfMsg( 'newmessages', |
282 | 282 | $this->makeKnownLinkObj( |
283 | 283 | $usertalktitle, |
284 | | - wfMsg('newmessageslink') |
| 284 | + wfMsgHtml( 'newmessageslink' ) |
| 285 | + ), |
| 286 | + $this->makeKnownLinkObj( |
| 287 | + $usertalktitle, |
| 288 | + wfMsgHtml( 'newmessagesdifflink' ), |
| 289 | + 'diff=cur' |
285 | 290 | ) |
286 | 291 | ); |
287 | 292 | # Disable Cache |
Index: trunk/phase3/includes/Skin.php |
— | — | @@ -623,13 +623,12 @@ |
624 | 624 | } |
625 | 625 | |
626 | 626 | if ( $wgUser->getNewtalk() ) { |
627 | | - # do not show "You have new messages" text when we are viewing our |
628 | | - # own talk page |
629 | | - |
| 627 | + # do not show "You have new messages" text when we are viewing our |
| 628 | + # own talk page |
630 | 629 | if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) { |
631 | | - $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), |
632 | | - wfMsg('newmessageslink') ); |
633 | | - $s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>'; |
| 630 | + $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ) ); |
| 631 | + $dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ) ); |
| 632 | + $s.= ' | <strong>'. wfMsg( 'newmessages', $tl, $dl ) . '</strong>'; |
634 | 633 | # disable caching |
635 | 634 | $wgOut->setSquidMaxage(0); |
636 | 635 | $wgOut->enableClientCache(false); |
Index: trunk/phase3/languages/Language.php |
— | — | @@ -495,8 +495,9 @@ |
496 | 496 | 'pagetitle' => '$1 - {{SITENAME}}', |
497 | 497 | 'sitesubtitle' => '', |
498 | 498 | 'retrievedfrom' => 'Retrieved from "$1"', |
499 | | -'newmessages' => 'You have $1.', |
| 499 | +'newmessages' => 'You have $1 ($2).', |
500 | 500 | 'newmessageslink' => 'new messages', |
| 501 | +'newmessagesdifflink' => 'diff to penultimate revision', |
501 | 502 | 'editsection'=>'edit', |
502 | 503 | 'toc' => 'Contents', |
503 | 504 | 'showtoc' => 'show', |