* Add PLURAL support for 'undeletepagetext'

* Remove commented out line
* Add a space between input field and submit button

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 28add11..6bcba24 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -679,17 +679,16 @@ class UndeleteForm {
                        Xml::openElement( 'form', array(
                                'method' => 'get',
                                'action' => $wgScript ) ) .
-                       '<fieldset>' .
-                       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' ) ) .
-                       '</fieldset>' .
-                       '</form>' );
+                       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 7e815bd..f6f78bf 100644 (file)
--- 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'''''.