http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95931
Revision: 95931
Author: johnduhart
Date: 2011-09-01 04:26:21 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Follow-up r95930, consolidate into one message per CR
Modified Paths:
--------------
trunk/phase3/includes/EditPage.php
trunk/phase3/languages/messages/MessagesEn.php
Modified: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php 2011-09-01 03:56:33 UTC (rev 95930)
+++ trunk/phase3/includes/EditPage.php 2011-09-01 04:26:21 UTC (rev 95931)
@@ -1606,14 +1606,12 @@
}
$curUP = $wgUser->getUserPage();
- $sk = $wgOut->getSkin();
if ( $this->mTitle->getNamespace() == NS_USER
&& substr( $this->mTitle->getPrefixedText(), 0, strlen(
$curUP->getPrefixedText() ) ) != $curUP->getPrefixedText()
&& $this->formtype != 'preview'
&& $this->formtype != 'diff' )
{
- $utpLink = $sk->makeKnownLinkObj(
$this->mTitle->getTalkPage(), wfMsgHtml( 'editinguserpagetalklink' ),
'action=edit' );
- $wgOut->addHTML( wfMsgWikiHtml( 'editinguserpage',
$utpLink ) );
+ $wgOut->addHTML( wfMessage( 'editinguserpage',
$this->mTitle->getTalkPage()->getFullURL( 'action=edit' ) )->parse() );
}
if ( wfReadOnly() ) {
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-09-01 03:56:33 UTC
(rev 95930)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-09-01 04:26:21 UTC
(rev 95931)
@@ -1437,8 +1437,7 @@
'edit-no-change' => 'Your edit was ignored, because no
change was made to the text.',
'edit-already-exists' => 'Could not create a new page.
It already exists.',
-'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user
page]]. To leave this user a message, $1.",
-'editinguserpagetalklink' => 'edit their talk page',
+'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user
page]]. To leave this user a message, [$1 edit their talk page].",
'addsection-preload' => '', # do not translate or duplicate this
message to other languages
'addsection-editintro' => '', # do not translate or duplicate this
message to other languages
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
