* Rename "searchquery" to "searchsubtitle" and support wiki text in it

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 34e724c..d9a94bd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -629,6 +629,7 @@ Some default configuration options have changed:
   with interwiki prefixes, otherwise do what Title::makeTitleSafe() does.
 * (bug 6516) Update to Russian translation
 * New 'allpagesbadtitle' message for Special:Allpages, based on 'badtitletext'.
+* Rename "searchquery" to "searchsubtitle" and support wiki text in it
 
 == Compatibility ==
 

diff --git a/includes/AjaxFunctions.php b/includes/AjaxFunctions.php
index 73af03c..28b01ee 100644 (file)
--- a/includes/AjaxFunctions.php
+++ b/includes/AjaxFunctions.php
@@ -98,7 +98,7 @@ class AjaxCachePolicy {
                        
 
 function wfSajaxSearch( $term ) {
-       global $wgContLang, $wgAjaxCachePolicy;
+       global $wgContLang, $wgAjaxCachePolicy, $wgOut;
        $limit = 16;
        
        $l = new Linker;
@@ -140,7 +140,7 @@ function wfSajaxSearch( $term ) {
        return '<div style="float:right; border:solid 1px black;background:gainsboro;padding:2px;"><a onclick="Searching_Hide_Results();">' 
                . wfMsg( 'hideresults' ) . '</a></div>'
                . '<h1 class="firstHeading">'.wfMsg('search')
-               . '</h1><div id="contentSub">'.wfMsg('searchquery', $term) . '</div><ul><li>'
+               . '</h1><div id="contentSub">'. $wgOut->parse( wfMsg( 'searchsubtitle', $term ) ) . '</div><ul><li>'
                . $l->makeKnownLink( $wgContLang->specialPage( 'Search' ),
                                        wfMsg( 'searchcontaining', $term ),
                                        "search=$term&fulltext=Search" )

diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index bedadd0..8587ceb 100644 (file)
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -221,7 +221,7 @@ class SpecialSearch {
        function setupPage( $term ) {
                global $wgOut;
                $wgOut->setPageTitle( wfMsg( 'searchresults' ) );
-               $wgOut->setSubtitle( htmlspecialchars( wfMsg( 'searchquery', $term ) ) );
+               $wgOut->setSubtitle( $wgOut->parse( wfMsg( 'searchsubtitle', $term ) ) );
                $wgOut->setArticleRelated( false );
                $wgOut->setRobotpolicy( 'noindex,nofollow' );
        }

diff --git a/languages/Messages.php b/languages/Messages.php
index ddbdd88..2e44b77 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -635,7 +635,7 @@ is placed by the site operators.",
 #
 'searchresults' => 'Search results',
 'searchresulttext' => "For more information about searching {{SITENAME}}, see [[{{ns:project}}:Searching|Searching {{SITENAME}}]].",
-'searchquery'  => "For query \"$1\"",
+'searchsubtitle' => "You searched for '''[[$1]]'''",
 'badquery'             => 'Badly formed search query',
 'badquerytext' => 'We could not process your query.
 This is probably because you have attempted to search for a
@@ -655,7 +655,7 @@ and the text of $3 pages.",
 'viewprevnext' => "View ($1) ($2) ($3).",
 'showingresults' => "Showing below up to <b>$1</b> results starting with #<b>$2</b>.",
 'showingresultsnum' => "Showing below <b>$3</b> results starting with #<b>$2</b>.",
-'nonefound'            => "'''Note''': unsuccessful searches are
+'nonefound'            => "'''Note''': Unsuccessful searches are
 often caused by searching for common words like \"have\" and \"from\",
 which are not indexed, or by specifying more than one search term (only pages
 containing all of the search terms will appear in the result).",

diff --git a/languages/MessagesDe.php b/languages/MessagesDe.php
index 442cc33..5fe05e5 100644 (file)
--- a/languages/MessagesDe.php
+++ b/languages/MessagesDe.php
@@ -555,7 +555,7 @@ Administroren können den entfernten Inhalt oder andere entfernte Bestandteile w
 #
 "searchresults" => "Suchergebnisse",
 'searchresulttext'     => 'Für mehr Informationen zur Suche siehe „[[{{ns:project}}:Suche|{{SITENAME}} durchsuchen]]“.',
-'searchquery'          => 'Für die Suchanfrage „$1“',
+'searchsubtitle' => 'Für die Suchanfrage „[[$1]]“',
 "badquery"             => "Falsche Suchanfrage",
 'badquerytext'         => 'Wir konnten Ihre Suchanfrage nicht verarbeiten.
 Vermutlich haben Sie versucht, ein Wort zu suchen, das kürzer als vier Buchstaben ist.

diff --git a/languages/MessagesFr.php b/languages/MessagesFr.php
index 41b5b95..b8388d5 100644 (file)
--- a/languages/MessagesFr.php
+++ b/languages/MessagesFr.php
@@ -500,7 +500,7 @@ D\'autres administrateurs sur ce wiki pourront toujours accèder au contenu cach
 #
 'searchresults' => 'Résultat de la recherche',
 'searchresulttext' => 'Pour plus d\'informations sur la recherche dans {{SITENAME}}, voir [[Aide:Recherche|Chercher dans {{SITENAME}}]].',
-'searchquery' => 'Pour la requête « $1 »',
+'searchsubtitle' => 'Pour la requête « [[$1]] »',
 'badquery'  => 'Requête mal formulée',
 'badquerytext' => 'Nous n\'avons pas pu traiter votre requête. Vous avez probablement recherché un mot d\'une longueur inférieure à trois lettres, ce qui n\'est pas encore possible. Vous avez aussi pu faire une erreur de syntaxe, telle que « poisson et et écailles ». Veuillez essayer une autre requête.',
 'matchtotals' => 'La requête « $1 » correspond à $2 titre(s) d\'article et au texte de $3 article(s).',