Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115640
Change subject: Add a 'revdelete-selected-file' message on
Special:RevisionDelete
......................................................................
Add a 'revdelete-selected-file' message on Special:RevisionDelete
This allows a file adjusted message when delete file versions and can
make clear the difference between deleting a revision of the file
description page or a version of the file.
Also renamed 'revdelete-selected' to 'revdelete-selected-text' to be
able to reorder the params, this allows using the same code for each
type (log, text and file)
Change-Id: I02514eda2f267ede16b4298ed5cae64c6787f79d
---
M includes/specials/SpecialRevisiondelete.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
4 files changed, 27 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/115640/1
diff --git a/includes/specials/SpecialRevisiondelete.php
b/includes/specials/SpecialRevisiondelete.php
index 3599dc6..296ef1f 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -63,26 +63,31 @@
*/
static $UILabels = array(
'revision' => array(
+ 'selected' => 'revdelete-selected-text',
'check-label' => 'revdelete-hide-text',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
),
'archive' => array(
+ 'selected' => 'revdelete-selected-text',
'check-label' => 'revdelete-hide-text',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
),
'oldimage' => array(
+ 'selected' => 'revdelete-selected-file',
'check-label' => 'revdelete-hide-image',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
),
'filearchive' => array(
+ 'selected' => 'revdelete-selected-file',
'check-label' => 'revdelete-hide-image',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
),
'logging' => array(
+ 'selected' => 'logdelete-selected',
'check-label' => 'revdelete-hide-name',
'success' => 'logdelete-success',
'failure' => 'logdelete-failure',
@@ -330,12 +335,8 @@
protected function showForm() {
$UserAllowed = true;
- if ( $this->typeName == 'logging' ) {
- $this->getOutput()->addWikiMsg( 'logdelete-selected',
$this->getLanguage()->formatNum( count( $this->ids ) ) );
- } else {
- $this->getOutput()->addWikiMsg( 'revdelete-selected',
- $this->targetObj->getPrefixedText(), count(
$this->ids ) );
- }
+ $this->getOutput()->wrapWikiMsg( "<strong>$1</strong>", array(
$this->typeLabels['selected'],
+ $this->getLanguage()->formatNum( count( $this->ids ) ),
$this->targetObj->getPrefixedText() ) );
$this->getOutput()->addHTML( "<ul>" );
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 3fffec2..9323908 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1710,8 +1710,9 @@
'revdelete-no-file' => 'The file specified does not exist.',
'revdelete-show-file-confirm' => 'Are you sure you want to view a deleted
revision of the file "<nowiki>$1</nowiki>" from $2 at $3?',
'revdelete-show-file-submit' => 'Yes',
-'revdelete-selected' => "<strong>{{PLURAL:$2|Selected
revision|Selected revisions}} of [[:$1]]:</strong>",
-'logdelete-selected' => "<strong>{{PLURAL:$1|Selected log
event|Selected log events}}:</strong>",
+'revdelete-selected-text' => "{{PLURAL:$1|Selected revision|Selected
revisions}} of [[:$2]]:",
+'revdelete-selected-file' => "{{PLURAL:$1|Selected file version|Selected
file versions}} of [[:$2]]:",
+'logdelete-selected' => "{{PLURAL:$1|Selected log event|Selected log
events}}:",
'revdelete-text' => "<strong>Deleted revisions and events will
still appear in the page history and logs, but parts of their content will be
inaccessible to the public.</strong>
Other administrators on {{SITENAME}} will still be able to access the hidden
content and can undelete it again through this same interface, unless
additional restrictions are set.",
'revdelete-confirm' => 'Please confirm that you intend to do this,
that you understand the consequences, and that you are doing this in accordance
with [[{{MediaWiki:Policy-url}}|the policy]].',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 345bcd9..e8558a3 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2478,18 +2478,29 @@
'revdelete-show-file-submit' => 'Reply to
{{msg-mw|Revdelete-show-file-confirm}}.
{{Identical|Yes}}',
-'revdelete-selected' => '{{RevisionDelete}}
+'revdelete-selected-text' => '{{RevisionDelete}}
Parameters:
-* $1 - page title
-* $2 - number of revisions
+* $1 - number of revisions
+* $2 - page title
See also:
* {{msg-mw|Logdelete-selected}}
+* {{msg-mw|Revdelete-selected-file}}
+[[File:RevDelete Special-RevisionDelete (r60428).png|frame|center|Screenshot
of the interface]]',
+'revdelete-selected-file' => '{{RevisionDelete}}
+Parameters:
+* $1 - number of file versions
+* $2 - file name
+See also:
+* {{msg-mw|Logdelete-selected}}
+* {{msg-mw|Revdelete-selected-text}}
[[File:RevDelete Special-RevisionDelete (r60428).png|frame|center|Screenshot
of the interface]]',
'logdelete-selected' => '{{RevisionDelete}}
Parameters:
* $1 - number of log events
+* $2 - localized name of Special:Log, maybe with type as subpage [unused]
See also:
-* {{msg-mw|Revdelete-selected}}',
+* {{msg-mw|Revdelete-selected-text}}
+* {{msg-mw|Revdelete-selected-file}}',
'revdelete-text' => '{{RevisionDelete}}
This is the introduction explaining the feature.',
'revdelete-confirm' => 'This message is a part of the
[[mw:RevisionDelete|RevisionDelete]] feature.
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index eab6cf6..84029e5 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -867,7 +867,8 @@
'revdelete-no-file',
'revdelete-show-file-confirm',
'revdelete-show-file-submit',
- 'revdelete-selected',
+ 'revdelete-selected-text',
+ 'revdelete-selected-file',
'logdelete-selected',
'revdelete-text',
'revdelete-confirm',
--
To view, visit https://gerrit.wikimedia.org/r/115640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02514eda2f267ede16b4298ed5cae64c6787f79d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
