From: Zheng Zhu <zhengzhu@users.mediawiki.org>
Date: Mon, 29 Nov 2004 01:22:44 +0000 (+0000)
Subject: added convertForSearchResult() so that search results are correctly shown for languag... 
X-Git-Tag: 1.5.0alpha1~1204
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=907ed139a70b7feec372d8b1ba202a0283b19619;p=lhc%2Fweb%2Fwiklou.git

added convertForSearchResult() so that search results are correctly shown for languages that support multiple variants
---

diff --git a/languages/Language.php b/languages/Language.php
index 57d6b2bdba..e7d38dbbd8 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1903,6 +1903,12 @@ class Language {
 		return strtolower( $in );
 	}
 
+	function convertForSearchResult( $termsArray ) {
+		# some languages, e.g. Chinese, need to do a conversion
+		# in order for search results to be displayed correctly
+		return $termsArray;
+	}	
+
 	function firstChar( $s ) {
 		# Get the first character of a string. In ASCII, return
 		# first byte of the string. UTF8 and others have to
diff --git a/languages/LanguageLatin1.php b/languages/LanguageLatin1.php
index c24f0be2bc..e031007e4d 100644
--- a/languages/LanguageLatin1.php
+++ b/languages/LanguageLatin1.php
@@ -277,11 +277,13 @@ class LanguageLatin1 {
 		return utf8_decode( $this->lang->convertTitle( utf8_encode( $text ) ) );
 	}
 
-	
 	function getVariants() {
 		return $this->lang->getVariants();
 	}
 
+	function convertForSearchResult( $termsArray ) {
+		return $termsArray;
+	}	
 }
 
 ?>
diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php
index 59afd08000..644449a5e2 100644
--- a/languages/LanguageZh.php
+++ b/languages/LanguageZh.php
@@ -119,6 +119,12 @@ class LanguageZh extends LanguageZh_cn {
 		return $t;
 
 	}
-	
+
+	function convertForSearchResult( $termsArray ) {
+		$terms = implode( '|', $termsArray );
+		$terms = $this->autoConvert( $terms, 'zh-cn' );
+		$ret = array_unique( explode('|', $termsArray.'|'.$terms) );
+		return $ret;
+	}
 }
 ?>