Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115426
Change subject: Split revdelete-text on Special:RevisionDelete for each type
......................................................................
Split revdelete-text on Special:RevisionDelete for each type
This allows specific text for each type.
Types here are: text, image and log
Change-Id: Icb24dfb483f940e90215ecc01f5765185963c7ed
---
M includes/specials/SpecialRevisiondelete.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
4 files changed, 25 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/115426/1
diff --git a/includes/specials/SpecialRevisiondelete.php
b/includes/specials/SpecialRevisiondelete.php
index 3599dc6..4b16928 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -66,26 +66,31 @@
'check-label' => 'revdelete-hide-text',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
+ 'text' => 'revdelete-text-text',
),
'archive' => array(
'check-label' => 'revdelete-hide-text',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
+ 'text' => 'revdelete-text-text',
),
'oldimage' => array(
'check-label' => 'revdelete-hide-image',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
+ 'text' => 'revdelete-text-image',
),
'filearchive' => array(
'check-label' => 'revdelete-hide-image',
'success' => 'revdelete-success',
'failure' => 'revdelete-failure',
+ 'text' => 'revdelete-text-image',
),
'logging' => array(
'check-label' => 'revdelete-hide-name',
'success' => 'logdelete-success',
'failure' => 'logdelete-failure',
+ 'text' => 'logdelete-text',
),
);
@@ -431,7 +436,7 @@
* @todo FIXME: Wikimedia-specific policy text
*/
protected function addUsageText() {
- $this->getOutput()->addWikiMsg( 'revdelete-text' );
+ $this->getOutput()->wrapWikiMsg( "<strong>$1</strong>\n$2",
$this->typeLabels['text'], 'revdelete-text-others' );
if ( $this->getUser()->isAllowed( 'suppressrevision' ) ) {
$this->getOutput()->addWikiMsg(
'revdelete-suppress-text' );
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 3fffec2..3e3b5ac 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1712,8 +1712,10 @@
'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-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-text-text' => 'Deleted revisions will still appear in the
page history, but parts of their content will be inaccessible to the public.',
+'revdelete-text-image' => 'Deleted files will still appear in the file
history, but parts of their content will be inaccessible to the public.',
+'logdelete-text' => 'Deleted events will still appear in the
logs, but parts of their content will be inaccessible to the public.',
+'revdelete-text-others' => '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]].',
'revdelete-suppress-text' => "Suppression should <strong>only</strong> be
used for the following cases:
* potentially libelous information
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index 8a3b8e7..cae308d 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2489,8 +2489,17 @@
* $1 - number of log events
See also:
* {{msg-mw|Revdelete-selected}}',
-'revdelete-text' => '{{RevisionDelete}}
-This is the introduction explaining the feature.',
+'revdelete-text-text' => '{{RevisionDelete}}
+This is the introduction explaining the feature.
+See also: {{msg-mw|revdelete-text-image}}, {{msg-mw|logdelete-text}},
{{msg-mw|revdelete-text-others}}',
+'revdelete-text-image' => '{{RevisionDelete}}
+This is the introduction explaining the feature.
+See also: {{msg-mw|revdelete-text-text}}, {{msg-mw|logdelete-text}},
{{msg-mw|revdelete-text-others}}',
+'logdelete-text' => '{{RevisionDelete}}
+This is the introduction explaining the feature.
+See also: {{msg-mw|revdelete-text-text}}, {{msg-mw|revdelete-text-image}},
{{msg-mw|revdelete-text-others}}',
+'revdelete-text-others' => '{{RevisionDelete}}
+This message is shown after one of: {{msg-mw|revdelete-text-text}},
{{msg-mw|revdelete-text-image}}, {{msg-mw|revdelete-text-logging}}',
'revdelete-confirm' => 'This message is a part of the
[[mw:RevisionDelete|RevisionDelete]] feature.
Refers to {{msg-mw|Policy-url}}.
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index eab6cf6..ec30689 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -869,7 +869,10 @@
'revdelete-show-file-submit',
'revdelete-selected',
'logdelete-selected',
- 'revdelete-text',
+ 'revdelete-text-text',
+ 'revdelete-text-image',
+ 'logdelete-text',
+ 'revdelete-text-others',
'revdelete-confirm',
'revdelete-suppress-text',
'revdelete-legend',
--
To view, visit https://gerrit.wikimedia.org/r/115426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb24dfb483f940e90215ecc01f5765185963c7ed
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
