Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/241703
Change subject: SpecialMergeHistory: add redirect=no on target parameter on
success message
......................................................................
SpecialMergeHistory: add redirect=no on target parameter on success message
Removes mergehistory-success message and introduce mergehistory-done
so that fullurl doesn't have to be added to each translation message.
Bug: T85650
Change-Id: I9931bf48182bd41ff32bdac1798336319f233341
---
M includes/specials/SpecialMergeHistory.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/241703/1
diff --git a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index 7edf961..56b4fdc 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -485,10 +485,13 @@
$logId = $logEntry->insert();
$logEntry->publish( $logId );
- # @todo message should use redirect=no
- $this->getOutput()->addWikiText( $this->msg(
'mergehistory-success',
- $targetTitle->getPrefixedText(),
$destTitle->getPrefixedText() )->numParams(
- $count )->text() );
+ $this->getOutput()->addWikiMsg( $this->msg( 'mergehistory-done'
)
+ ->rawParams(
+ Linker::link( $targetTitle,
$targetTitle->getPrefixedText(), array(), array( 'redirect' => 'no' ) )
+ )
+ ->params( $destTitle->getPrefixedText() )
+ ->numParams( $count )
+ );
Hooks::run( 'ArticleMergeComplete', array( $targetTitle,
$destTitle ) );
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 3fc297c..bef64ef 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -856,7 +856,7 @@
"mergehistory-go": "Show mergeable edits",
"mergehistory-submit": "Merge revisions",
"mergehistory-empty": "No revisions can be merged.",
- "mergehistory-success": "$3 {{PLURAL:$3|revision|revisions}} of [[:$1]]
successfully merged into [[:$2]].",
+ "mergehistory-done": "$3 {{PLURAL:$3|revision|revisions}} of $1
successfully merged into [[:$2]].",
"mergehistory-fail": "Unable to perform history merge, please recheck
the page and time parameters.",
"mergehistory-fail-toobig" : "Unable to perform history merge as more
than the limit of $1 {{PLURAL:$1|revision|revisions}} would be moved.",
"mergehistory-no-source": "Source page $1 does not exist.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 79d8a69..025197f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1029,7 +1029,7 @@
"mergehistory-go": "Used as the label for Submit button in the Merge
form, in [[Special:MergeHistory]].\n\nSee also:\n*
{{msg-mw|mergehistory-header}}\n* {{msg-mw|mergehistory-box}}\n*
{{msg-mw|mergehistory-from}}\n* {{msg-mw|mergehistory-into}}",
"mergehistory-submit": "Used as label for Submit button in
[[Special:MergeHistory]].",
"mergehistory-empty": "Used in [[Special:MergeHistory]].",
- "mergehistory-success": "Used in [[Special:MergeHistory]].\n* $1 -
target page title\n* $2 - destination page title\n* $3 - number of revisions
which succeeded to merge",
+ "mergehistory-done": "Success message shown on
[[Special:MergeHistory]].\n* $1 - link to target page\n* $2 - destination page
title\n* $3 - number of revisions which succeeded to merge",
"mergehistory-fail": "Used as error message in
[[Special:MergeHistory]].",
"mergehistory-fail-toobig": "Used as error message in
[[Special:MergeHistory]].\n* $1 - maximum allowed number of revisions that can
be moved",
"mergehistory-no-source": "Used as error message in
[[Special:MergeHistory]].\n* $1 - source page title\nSee also:\n*
{{msg-mw|mergehistory-invalid-source}}\n*
{{msg-mw|mergehistory-invalid-destination}}\n*
{{msg-mw|mergehistory-no-destination}}\n*
{{msg-mw|mergehistory-same-destination}}",
--
To view, visit https://gerrit.wikimedia.org/r/241703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9931bf48182bd41ff32bdac1798336319f233341
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
