From 456093430e511672d21c6242339b7d27521069d6 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Tue, 16 Dec 2008 12:42:53 +0000 Subject: [PATCH] * Add PLURAL support for 'undeletepagetext' * Remove commented out line * Add a space between input field and submit button --- includes/specials/SpecialUndelete.php | 14 ++++++-------- languages/messages/MessagesEn.php | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 28add116e2..6bcba24dff 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -679,17 +679,16 @@ class UndeleteForm { Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) . - '
' . - Xml::element( 'legend', array(), - wfMsg( 'undelete-search-box' ) ) . + Xml::fieldset( wfMsg( 'undelete-search-box' ) ) . Xml::hidden( 'title', SpecialPage::getTitleFor( 'Undelete' )->getPrefixedDbKey() ) . Xml::inputLabel( wfMsg( 'undelete-search-prefix' ), 'prefix', 'prefix', 20, - $this->mSearchPrefix ) . + $this->mSearchPrefix ) . ' ' . Xml::submitButton( wfMsg( 'undelete-search-submit' ) ) . - '
' . - '' ); + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ) + ); } // Generic list of deleted pages @@ -701,7 +700,7 @@ class UndeleteForm { return; } - $wgOut->addWikiMsg( "undeletepagetext" ); + $wgOut->addHTML( wfMsgExt( 'undeletepagetext', array( 'parseinline' ), $wgLang->formatNum( $result->numRows() ) ) ); $sk = $wgUser->getSkin(); $undelete = SpecialPage::getTitleFor( 'Undelete' ); @@ -710,7 +709,6 @@ class UndeleteForm { $title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title ); $link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ), 'target=' . $title->getPrefixedUrl() ); - #$revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) ); $revs = wfMsgExt( 'undeleterevisions', array( 'parseinline' ), $wgLang->formatNum( $row->count ) ); diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 7e815bdc25..f6f78bf3db 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2453,7 +2453,7 @@ You can change this page's protection level, but it will not affect the cascadin 'undeletepage' => 'View and restore deleted pages', 'undeletepagetitle' => "'''The following consists of deleted revisions of [[:$1|$1]]'''.", 'viewdeletedpage' => 'View deleted pages', -'undeletepagetext' => 'The following pages have been deleted but are still in the archive and can be restored. +'undeletepagetext' => 'The following {{PLURAL:$1|page has been deleted but is|$1 pages have been deleted but are}} still in the archive and can be restored. The archive may be periodically cleaned out.', 'undelete-fieldset-title' => 'Restore revisions', 'undeleteextrahelp' => "To restore the page's entire history, leave all checkboxes deselected and click '''''Restore'''''. -- 2.20.1