From dd556e93240d3eaa78d3282e1f9a11eb83fb367a Mon Sep 17 00:00:00 2001 From: Liangent Date: Thu, 14 Mar 2013 23:26:29 +0800 Subject: [PATCH] Apply conversion on namespace names on Special:Search Change-Id: I2dc8d1a28dd6b273a63dc6e5a06d3c18c720b3f7 --- includes/specials/SpecialSearch.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 8a2163b56c..41828464e7 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -875,6 +875,8 @@ class SpecialSearch extends SpecialPage { * @return String: HTML form */ protected function powerSearchBox( $term, $opts ) { + global $wgContLang; + // Groups namespaces into rows according to subject $rows = array(); foreach ( SearchEngine::searchableNamespaces() as $namespace => $name ) { @@ -882,10 +884,12 @@ class SpecialSearch extends SpecialPage { if ( !array_key_exists( $subject, $rows ) ) { $rows[$subject] = ""; } - $name = str_replace( '_', ' ', $name ); + + $name = $wgContLang->getConverter()->convertNamespace( $namespace ); if ( $name == '' ) { $name = $this->msg( 'blanknamespace' )->text(); } + $rows[$subject] .= Xml::openElement( 'td', array( 'style' => 'white-space: nowrap' ) @@ -898,6 +902,7 @@ class SpecialSearch extends SpecialPage { ) . Xml::closeElement( 'td' ); } + $rows = array_values( $rows ); $numRows = count( $rows ); @@ -909,9 +914,11 @@ class SpecialSearch extends SpecialPage { 'table', array( 'cellpadding' => 0, 'cellspacing' => 0 ) ); + for ( $j = $i; $j < $i + 4 && $j < $numRows; $j++ ) { $namespaceTables .= Xml::tags( 'tr', null, $rows[$j] ); } + $namespaceTables .= Xml::closeElement( 'table' ); } -- 2.20.1