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

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 145a12a..7b75480 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -476,10 +476,13 @@ class SpecialMergeHistory extends SpecialPage {
                $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() );
+               $targetLink = Linker::link( $targetTitle, $targetTitle->getPrefixedText(), array(), array( 'redirect' => 'no' ) );
+
+               $this->getOutput()->addWikiMsg( $this->msg( 'mergehistory-done' )
+                       ->rawParams( $targetLink )
+                       ->params( $destTitle->getPrefixedText() )
+                       ->numParams( $count )
+               );
 
                Hooks::run( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );
 

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index dc06b10..df55298 100644 (file)
--- 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 were 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 5657549..6c3f459 100644 (file)
--- 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}}",