From aa0f3bbaeb12ff7b2979fa422f695f8f664dc46f Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Sun, 22 Feb 2009 11:32:33 +0000 Subject: [PATCH] Move
...
from message text to program code for consinstency with all other messages. --- includes/Article.php | 4 ++-- includes/EditPage.php | 4 ++-- includes/diff/DifferenceEngine.php | 11 ++++++----- includes/specials/SpecialUndelete.php | 4 ++-- languages/messages/MessagesEn.php | 14 ++++++-------- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 3179b86a05..b45005776b 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -923,12 +923,12 @@ class Article { # Allow admins to see deleted content if explicitly requested if( $this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { if( !$unhide || !$this->mRevision->userCan(Revision::DELETED_TEXT) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); wfProfileOut( __METHOD__ ); return; } else { - $wgOut->addWikiMsg( 'rev-deleted-text-view' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); // and we are allowed to see... } } diff --git a/includes/EditPage.php b/includes/EditPage.php index bf7a3602f6..fafc0ee453 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1183,9 +1183,9 @@ class EditPage { // Let sysop know that this will make private content public if saved if ( !$this->mArticle->mRevision->userCan( Revision::DELETED_TEXT ) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); } else if ( $this->mArticle->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-view' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); } if ( !$this->mArticle->mRevision->isCurrent() ) { diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 5bd947c069..ad57cdc2de 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -271,7 +271,8 @@ CONTROL; $this->showDiffStyle(); $multi = $this->getMultiNotice(); $wgOut->addHTML( $this->addHeader( '', $oldHeader, $newHeader, $multi ) ); - $wgOut->addWikiMsg( 'rev-deleted-no-diff' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", + array( 'rev-deleted-no-diff' ) ); } else if( $wgEnableHtmlDiff && $this->htmldiff ) { $multi = $this->getMultiNotice(); $wgOut->addHTML('
'.$sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'wikicodecomparison' ), @@ -301,9 +302,9 @@ CONTROL; $wgOut->addHTML( "

{$this->mPagetitle}

\n" ); # Add deleted rev tag if needed if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); } else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-view' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); } if( !$this->mNewRev->isCurrent() ) { @@ -356,9 +357,9 @@ CONTROL; $wgOut->addHTML( '

'.wfMsgHtml( 'visual-comparison' )."

\n" ); #add deleted rev tag if needed if( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-permission' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); } else if( $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) { - $wgOut->addWikiMsg( 'rev-deleted-text-view' ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); } if( !$this->mNewRev->isCurrent() ) { diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index d40180cbdb..c783710ecf 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -737,10 +737,10 @@ class UndeleteForm { if( $rev->isDeleted(Revision::DELETED_TEXT) ) { if( !$rev->userCan(Revision::DELETED_TEXT) ) { - $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-permission' ); return; } else { - $wgOut->addWikiText( wfMsg( 'rev-deleted-text-view' ) ); + $wgOut->wrapWikiMsg( "
\n$1
\n", 'rev-deleted-text-view' ); $wgOut->addHTML( '
' ); // and we are allowed to see... } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index c73e232551..6db4d1bd16 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1291,15 +1291,13 @@ Try [[Special:Search|searching on the wiki]] for relevant new pages.', 'rev-deleted-comment' => '(comment removed)', 'rev-deleted-user' => '(username removed)', 'rev-deleted-event' => '(log action removed)', -'rev-deleted-text-permission' => '
-This page revision has been removed from the public archives. -There may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].
', -'rev-deleted-text-view' => '
-This page revision has been removed from the public archives. +'rev-deleted-text-permission' => 'This page revision has been removed from the public archives. +There may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].', +'rev-deleted-text-view' => 'This page revision has been removed from the public archives. As an administrator on {{SITENAME}} you can view it; -there may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].
', -'rev-deleted-no-diff' => '
You cannot view this diff because one of the revisions has been removed from the public archives. -There may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].
', +there may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].', +'rev-deleted-no-diff' => 'You cannot view this diff because one of the revisions has been removed from the public archives. +There may be details in the [{{fullurl:Special:Log/delete|page={{FULLPAGENAMEE}}}} deletion log].', 'rev-delundel' => 'show/hide', 'revisiondelete' => 'Delete/undelete revisions', 'revdelete-nooldid-title' => 'Invalid target revision', -- 2.20.1