From 79dcce058e16f5bf0b6a9b1a98f9c0484f1baeb2 Mon Sep 17 00:00:00 2001 From: Dereckson Date: Sun, 3 Jun 2012 16:09:11 +0200 Subject: [PATCH] (bug 37179) Allow undelete revision rows l10n Patch set 5: Update spacing in changes in SpecialUndelete.php per convention. Change-Id: I95756fa53c1f3b2a62fa9b5f6a63475dd5462442 --- includes/specials/SpecialUndelete.php | 8 +++++--- languages/messages/MessagesEn.php | 1 + languages/messages/MessagesQqq.php | 8 ++++++++ maintenance/language/messageTypes.inc | 1 + maintenance/language/messages.inc | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 654d5b7fb0..79c051a215 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -1166,7 +1166,7 @@ class SpecialUndelete extends SpecialPage { private function formatRevisionRow( $row, $earliestLiveTime, $remaining ) { $rev = Revision::newFromArchiveRow( $row, array( 'page' => $this->mTargetObj->getArticleID() ) ); - $stxt = ''; + $revTextSize = ''; $ts = wfTimestamp( TS_MW, $row->ar_timestamp ); // Build checkboxen... if( $this->mAllowed ) { @@ -1215,13 +1215,15 @@ class SpecialUndelete extends SpecialPage { // Revision text size $size = $row->ar_len; if( !is_null( $size ) ) { - $stxt = Linker::formatRevisionSize( $size ); + $revTextSize = Linker::formatRevisionSize( $size ); } // Edit summary $comment = Linker::revComment( $rev ); // Revision delete links $revdlink = Linker::getRevDeleteLink( $user, $rev, $this->mTargetObj ); - return "
  • $checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment
  • "; + + $revisionRow = $this->msg( 'undelete-revisionrow' )->rawParams( $checkBox, $revdlink, $last, $pageLink , $userLink, $revTextSize, $comment )->escaped(); + return "
  • $revisionRow
  • "; } private function formatFileRow( $row ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a42be0204b..37e2e05636 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3054,6 +3054,7 @@ It may have already been undeleted.', $1', 'undelete-show-file-confirm' => 'Are you sure you want to view the deleted revision of the file "$1" from $2 at $3?', 'undelete-show-file-submit' => 'Yes', +'undelete-revisionrow' => "$1 $2 $3 $4 . . $5 $6 $7", # Namespace form on various pages 'namespace' => 'Namespace:', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index 6ab88dfc23..a65d7b38da 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -2801,6 +2801,14 @@ This message was something like "unlock move protection" in the past.', {{identical|Are you sure you want to view the deleted revision of the file...}}', 'undelete-show-file-submit' => '{{Identical|Yes}}', +'undelete-revisionrow' => "A revision row in the undelete page. Parameters: +* $1 is a checkBox to indicate whether to restore this specific revision +* $2 is a link to the revision +* $3 is a link to the last revision of a page ({{msg-mw|last}}) +* $4 is a link to the page +* $5 is a link to the revision's user +* $6 is the revision size +* $7 is the revision comment", # Namespace form on various pages 'namespace' => 'This message is located at [[Special:Contributions]].', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index bca4c3403b..9cdbf34ff5 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -473,6 +473,7 @@ $wgOptionalMessages = array( 'version-entrypoints-scriptpath', 'mergehistory-revisionrow', 'categoryviewer-pagedlinks', + 'undelete-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 d5ec2097b0..1493010331 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -2067,6 +2067,7 @@ $wgMessageStructure = array( 'undelete-error-long', 'undelete-show-file-confirm', 'undelete-show-file-submit', + 'undelete-revisionrow', ), 'nsform' => array( 'namespace', -- 2.20.1