| Index: trunk/phase3/includes/SpecialSearch.php |
| — | — | @@ -593,21 +593,27 @@ |
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | $redirect = Xml::check( 'redirs', $this->searchRedirects, array( 'value' => '1', 'id' => 'redirs' ) ); |
| 597 | | - $redirectLabel = Xml::label( wfMsg( 'powersearchtext-redir' ), 'redirs' ); |
| | 597 | + $redirectLabel = Xml::label( wfMsg( 'powersearch-redir' ), 'redirs' ); |
| 598 | 598 | $searchField = Xml::input( 'search', 50, $term, array( 'type' => 'text', 'id' => 'powerSearchText' ) ); |
| 599 | 599 | $searchButton = Xml::submitButton( wfMsg( 'powersearch' ), array( 'name' => 'fulltext' ) ) . "\n"; |
| 600 | 600 | |
| 601 | 601 | $out = Xml::openElement( 'form', array( 'id' => 'powersearch', 'method' => 'get', 'action' => $wgScript ) ) . |
| 602 | | - Xml::openElement( 'fieldset' ) . |
| 603 | | - Xml::element( 'legend', array( ), wfMsg( 'powersearch-legend' ) ) . |
| 604 | | - Xml::hidden( 'title', 'Special:Search' ) . |
| 605 | | - wfMsgExt( 'powersearchtext-ns', array( 'parse', 'replaceafter' ), $namespaces) . |
| 606 | | - Xml::openElement( 'p' ) . |
| 607 | | - $redirect . " " . $redirectLabel . |
| 608 | | - Xml::closeElement( 'p') . |
| 609 | | - wfMsgExt( 'powersearchtext-field', array( 'parse', 'replaceafter' ), $searchField, $searchButton) . |
| 610 | | - Xml::closeElement( 'fieldset' ) . |
| 611 | | - Xml::closeElement( 'form' ); |
| | 602 | + Xml::fieldset( wfMsg( 'powersearch-legend' ), |
| | 603 | + Xml::hidden( 'title', 'Special:Search' ) . |
| | 604 | + "<p>" . |
| | 605 | + wfMsgExt( 'powersearch-ns', array( 'parseinline' ) ) . |
| | 606 | + "<br />" . |
| | 607 | + $namespaces . |
| | 608 | + "</p>" . |
| | 609 | + "<p>" . |
| | 610 | + $redirect . " " . $redirectLabel . |
| | 611 | + "</p>" . |
| | 612 | + wfMsgExt( 'powersearch-field', array( 'parseinline' ) ) . |
| | 613 | + " " . |
| | 614 | + $searchField . |
| | 615 | + " " . |
| | 616 | + $searchButton ) . |
| | 617 | + "</form>"; |
| 612 | 618 | |
| 613 | 619 | return $out; |
| 614 | 620 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1318,9 +1318,9 @@ |
| 1319 | 1319 | 'nonefound' => "'''Note''': Only some namespaces are searched by default. Try prefixing your query with ''all:'' to search all content (including talk pages, templates, etc), or use the desired namespace as prefix.", |
| 1320 | 1320 | 'powersearch' => 'Advanced search', |
| 1321 | 1321 | 'powersearch-legend' => 'Advanced search', |
| 1322 | | -'powersearchtext-ns' => 'Search in namespaces:<br />$1<br />', |
| 1323 | | -'powersearchtext-redir' => 'List redirects', |
| 1324 | | -'powersearchtext-field' => 'Search for $1 $2', |
| | 1322 | +'powersearch-ns' => 'Search in namespaces:', |
| | 1323 | +'powersearch-redir' => 'List redirects', |
| | 1324 | +'powersearch-field' => 'Search for', |
| 1325 | 1325 | 'search-external' => 'External search', |
| 1326 | 1326 | 'searchdisabled' => '{{SITENAME}} search is disabled. |
| 1327 | 1327 | You can search via Google in the meantime. |