Merge "Make label on Special:Undelete search reflect whether search is full-text...

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 1a2153d..864ea0f 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -235,6 +235,7 @@ class SpecialUndelete extends SpecialPage {
        function showSearchForm() {
                $out = $this->getOutput();
                $out->setPageTitle( $this->msg( 'undelete-search-title' ) );
+               $fuzzySearch = $this->getRequest()->getVal( "fuzzy", false );
                $out->addHTML(
                        Xml::openElement( 'form', [ 'method' => 'get', 'action' => wfScript() ] ) .
                                Xml::fieldset( $this->msg( 'undelete-search-box' )->text() ) .
@@ -243,7 +244,8 @@ class SpecialUndelete extends SpecialPage {
                                Html::rawElement(
                                        'label',
                                        [ 'for' => 'prefix' ],
-                                       $this->msg( 'undelete-search-prefix' )->parse()
+                                       $this->msg( $fuzzySearch ? 'undelete-search-full' : 'undelete-search-prefix' )
+                                               ->parse()
                                ) .
                                Xml::input(
                                        'prefix',
@@ -264,7 +266,7 @@ class SpecialUndelete extends SpecialPage {
                if ( $this->mSearchPrefix ) {
                        // For now, we enable search engine match only when specifically asked to
                        // by using fuzzy=1 parameter.
-                       if ( $this->getRequest()->getVal( "fuzzy", false ) ) {
+                       if ( $fuzzySearch ) {
                                $result = PageArchive::listPagesBySearch( $this->mSearchPrefix );
                        } else {
                                $result = PageArchive::listPagesByPrefix( $this->mSearchPrefix );

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0599dbc..4d51c9e 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2378,6 +2378,7 @@
        "undelete-search-title": "Search deleted pages",
        "undelete-search-box": "Search deleted pages",
        "undelete-search-prefix": "Show pages starting with:",
+       "undelete-search-full": "Show page titles containing:",
        "undelete-search-submit": "Search",
        "undelete-no-results": "No matching pages found in the deletion archive.",
        "undelete-filename-mismatch": "Cannot undelete file revision with timestamp $1: Filename mismatch.",

diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e2857aa..72f7aa9 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2565,10 +2565,11 @@
        "cannotundelete": "Message shown when undeletion failed for some reason. Parameters:\n* $1 - the combined wikitext of messages for all errors that caused the failure",
        "undeletedpage": "Used as success message. Parameters:\n* $1 - page title, with link",
        "undelete-header": "Used in [[Special:Undelete]].",
-       "undelete-search-title": "Page title when showing the search form in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-prefix}}\n* {{msg-mw|undelete-search-submit}}",
-       "undelete-search-box": "Used as legend for the Search form in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-prefix}}\n* {{msg-mw|undelete-search-submit}}",
-       "undelete-search-prefix": "Used as label for the input box in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-submit}}",
-       "undelete-search-submit": "Used as Submit button text in Search form on [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-prefix}}\n{{Identical|Search}}",
+       "undelete-search-title": "Page title when showing the search form in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-prefix}}\n* {{msg-mw|undelete-search-full}}\n* {{msg-mw|undelete-search-submit}}",
+       "undelete-search-box": "Used as legend for the Search form in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-prefix}}\n* {{msg-mw|undelete-search-full}}\n* {{msg-mw|undelete-search-submit}}",
+       "undelete-search-prefix": "Used as label for the input box in [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-submit}}\n* {{msg-mw|undelete-search-full}}",
+       "undelete-search-full": "Used as label for the input box in [[Special:Undelete]] when full-text search is used.\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-submit}}\n* {{msg-mw|undelete-search-prefix}}",
+       "undelete-search-submit": "Used as Submit button text in Search form on [[Special:Undelete]].\n\nSee also:\n* {{msg-mw|undelete-search-title}}\n* {{msg-mw|undelete-search-box}}\n* {{msg-mw|undelete-search-prefix}}\n* {{msg-mw|undelete-search-full}}\n{{Identical|Search}}",
        "undelete-no-results": "Used as Search result in [[Special:Undelete]] if no results.\n\nSee also:\n* {{msg-mw|Undeletepagetext}}",
        "undelete-filename-mismatch": "Used as error message. Parameters:\n* $1 - timestamp (date and time)",
        "undelete-bad-store-key": "Used as error message. Parameters:\n* $1 - timestamp (date and time)",