From d82a071a05f5b1638498866f3b5718a7b365d8c5 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 9 Jan 2010 20:18:41 +0000 Subject: [PATCH] bug 21411 'Add a new message rev-suppressed-no-diff for diff without entry in public log' --- includes/diff/DifferenceInterface.php | 3 ++- languages/messages/MessagesEn.php | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php index a71a6891c2..e350945535 100644 --- a/includes/diff/DifferenceInterface.php +++ b/includes/diff/DifferenceInterface.php @@ -377,9 +377,10 @@ CONTROL; $multi = $this->getMultiNotice(); $wgOut->addHTML( $this->addHeader( '', $oldHeader, $newHeader, $multi ) ); if( !$allowed ) { + $msg = $suppressed ? 'rev-suppressed-no-diff' : 'rev-deleted-no-diff'; # Give explanation for why revision is not visible $wgOut->wrapWikiMsg( "
\n$1
\n", - array( 'rev-deleted-no-diff' ) ); + array( $msg ) ); } else { # Give explanation and add a link to view the diff... $link = $this->mTitle->getFullUrl( array( diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index aabfe0bc2e..508aa808ef 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1431,29 +1431,30 @@ Try [[Special:Search|searching on the wiki]] for relevant new pages.', 'rev-deleted-event' => '(log action removed)', 'rev-deleted-user-contribs' => '[username or IP address removed - edit hidden from contributions]', 'rev-deleted-text-permission' => "This page revision has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +Details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", 'rev-deleted-text-unhide' => "This page revision has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log]. +Details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log]. As an administrator you can still [$1 view this revision] if you wish to proceed.", 'rev-suppressed-text-unhide' => "This page revision has been '''suppressed'''. -There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. +Details can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. As an administrator you can still [$1 view this revision] if you wish to proceed.", 'rev-deleted-text-view' => "This page revision has been '''deleted'''. -As an administrator you can view it; there may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +As an administrator you can view it; details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", 'rev-suppressed-text-view' => "This page revision has been '''suppressed'''. -As an administrator you can view it; there may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", +As an administrator you can view it; details can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", 'rev-deleted-no-diff' => "You cannot view this diff because one of the revisions has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +Details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +'rev-suppressed-no-diff' => "You cannot view this diff because one of the revisions has been '''deleted'''.", 'rev-deleted-unhide-diff' => "One of the revisions of this diff has been '''deleted'''. -There may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log]. +Details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log]. As an administrator you can still [$1 view this diff] if you wish to proceed.", 'rev-suppressed-unhide-diff' => "One of the revisions of this diff has been '''suppressed'''. -There may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. +Details can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log]. As an administrator you can still [$1 view this diff] if you wish to proceed.", 'rev-deleted-diff-view' => "One of the revisions of this diff has been '''deleted'''. -As an administrator you can view this diff; there may be details in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", +As an administrator you can view this diff; details can be found in the [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} deletion log].", 'rev-suppressed-diff-view' => "One of the revisions of this diff has been '''suppressed'''. -As an administrator you can view this diff; there may be details in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", +As an administrator you can view this diff; details can be found in the [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} suppression log].", 'rev-delundel' => 'show/hide', 'rev-showdeleted' => 'show', 'revisiondelete' => 'Delete/undelete revisions', -- 2.20.1