(bug 37177) Make revision row localisable.

Change-Id: Ie35a8b918151467400683a8474775790d45a5b55

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 0aa8b30..7fbe910 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -285,7 +285,10 @@ class SpecialMergeHistory extends SpecialPage {
                }
                $comment = Linker::revComment( $rev );
 
-               return "<li>$checkBox ($last) $pageLink . . $userLink $stxt $comment</li>";
+               $revisionRow = $this->msg( 'mergehistory-revisionrow' )->rawParams( $checkBox, $last, $pageLink, $userLink, $stxt, $comment)->escaped();
+               $revisionRow .= "<li>" . $line . "</li>";
+
+               return $revisionRow;
        }
 
        function merge() {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index dcddc10..017c7aa 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1661,6 +1661,7 @@ Note that using the navigation links will reset this column.',
 'mergehistory-comment'             => 'Merged [[:$1]] into [[:$2]]: $3',
 'mergehistory-same-destination'    => 'Source and destination pages cannot be the same',
 'mergehistory-reason'              => 'Reason:',
+'mergehistory-revisionrow'         => '$1 ($2) $3 . . $4 $5 $6',
 
 # Merge log
 'mergelog'           => 'Merge log',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 16453ea..f8cb7ab 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1241,6 +1241,13 @@ Parameters:
 *Parameter $3 is a log comment for the merge',
 'mergehistory-same-destination' => 'Error message shown on [[Special:MergeHistory]] when the user entered the same page title to both source and destination',
 'mergehistory-reason' => '{{Identical|Reason}}',
+'mergehistory-revisionrow'                => 'A revision row in the merge history page. Parameters:
+* $1 is a radio button to indicate a merge point,
+* $2 is a link to the last revision of a page ({{msg-mw|last}}),
+* $3 is a page link,
+* $4 is a user link,
+* $5 is a revision size,
+* $6 is a revision comment',
 
 # Merge log
 'mergelog' => 'This is the name of a log of merge actions done on [[Special:MergeHistory]]. This special page and this log is not enabled by default.',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 3a9b18e..295b684 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -471,6 +471,7 @@ $wgOptionalMessages = array(
        'nocookiesforlogin',
        'version-entrypoints-articlepath',
        'version-entrypoints-scriptpath',
+       'mergehistory-revisionrow',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 8b6618d..3196c81 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -832,7 +832,8 @@ $wgMessageStructure = array(
                'mergehistory-autocomment',
                'mergehistory-comment',
                'mergehistory-same-destination',
-               'mergehistory-reason'
+               'mergehistory-reason',
+               'mergehistory-revisionrow'
        ),
        'mergelog' => array(
                'mergelog',