MediaWiki 1.16.1

[autoinstallsdev/mediawiki.git] / languages / classes / LanguageZh.php

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index cbb748c34ecab63be07618f33c7d4c6446808d26..0b88dbb2f2143188a055c270d496b7be1cceb298 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -11,7 +11,6 @@ class ZhConverter extends LanguageConverter {
        function __construct($langobj, $maincode,
                                                                $variants=array(),
                                                                $variantfallbacks=array(),
-                                                               $markup=array(),
                                                                $flags = array(),
                                                                $manualLevel = array() ) {
                $this->mDescCodeSep = '：';
@@ -19,7 +18,6 @@ class ZhConverter extends LanguageConverter {
                parent::__construct($langobj, $maincode,
                                                                        $variants,
                                                                        $variantfallbacks,
-                                                                       $markup,
                                                                        $flags,
                                                                        $manualLevel);
                $names = array(
@@ -34,53 +32,6 @@ class ZhConverter extends LanguageConverter {
                        'zh-my'   => '大马',
                );
                $this->mVariantNames = array_merge($this->mVariantNames,$names);
-               $this->loadNamespaceTables();
-       }
-       
-       function loadNamespaceTables() {
-               global $wgMetaNamespace;
-               $nsproject     = $wgMetaNamespace;
-               $projecttable  = array(
-                       'Wikipedia'       => '维基百科',
-                       'Wikisource'      => '维基文库',
-                       'Wikinews'        => '维基新闻',
-                       'Wiktionary'      => '维基词典',
-                       'Wikibooks'       => '维基教科书',
-                       'Wikiquote'       => '维基语录',
-               );
-               $this->mNamespaceTables['zh-hans'] = array(
-                       'Media'          => '媒体',
-                       'Special'        => '特殊',
-                       'Talk'           => '讨论',
-                       'User'           => '用户',
-                       'User talk'      => '用户讨论',
-                       $nsproject
-                                       => isset($projecttable[$nsproject]) ? 
-                                               $projecttable[$nsproject] : $nsproject,
-                       $nsproject . ' talk'
-                                       => isset($projecttable[$nsproject]) ?
-                                               $projecttable[$nsproject] . '讨论' : $nsproject . '讨论',
-                       'File'           => '文件',
-                       'File talk'      => '文件讨论',
-                       'MediaWiki'      => 'MediaWiki',
-                       'MediaWiki talk' => 'MediaWiki讨论',
-                       'Template'       => '模板',
-                       'Template talk'  => '模板讨论',
-                       'Help'           => '帮助',
-                       'Help talk'      => '帮助讨论',
-                       'Category'       => '分类',
-                       'Category talk'  => '分类讨论',
-               );
-               $this->mNamespaceTables['zh-hant'] = array_merge($this->mNamespaceTables['zh-hans']);
-               $this->mNamespaceTables['zh-hant']['File'] = '檔案';
-               $this->mNamespaceTables['zh-hant']['File talk'] = '檔案討論';
-               $this->mNamespaceTables['zh'] = array_merge($this->mNamespaceTables['zh-hans']);
-               $this->mNamespaceTables['zh-cn'] = array_merge($this->mNamespaceTables['zh-hans']);
-               $this->mNamespaceTables['zh-hk'] = array_merge($this->mNamespaceTables['zh-hant']);
-               $this->mNamespaceTables['zh-mo'] = array_merge($this->mNamespaceTables['zh-hant']);
-               $this->mNamespaceTables['zh-my'] = array_merge($this->mNamespaceTables['zh-hans']);
-               $this->mNamespaceTables['zh-sg'] = array_merge($this->mNamespaceTables['zh-hans']);
-               $this->mNamespaceTables['zh-tw'] = array_merge($this->mNamespaceTables['zh-hant']);
        }
 
        function loadDefaultTables() {
@@ -133,6 +84,7 @@ class LanguageZh extends LanguageZh_hans {
                parent::__construct();
 
                $variants = array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
+               
                $variantfallbacks = array(
                        'zh'      => array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
                        'zh-hans' => array('zh-cn','zh-sg','zh-my'),
@@ -152,7 +104,7 @@ class LanguageZh extends LanguageZh_hans {
 
                $this->mConverter = new ZhConverter( $this, 'zh',
                                                                $variants, $variantfallbacks,
-                                                               array(),array(),
+                                                               array(),
                                                                $ml);
 
                $wgHooks['ArticleSaveComplete'][] = $this->mConverter;
@@ -171,31 +123,31 @@ class LanguageZh extends LanguageZh_hans {
                        "\"$1\"", $text);
        }
 
-       // word segmentation
-       function stripForSearch( $string ) {
+       /**
+        * auto convert to zh-hans and normalize special characters.
+        *
+        * @param $string String
+        * @param $autoVariant String, default to 'zh-hans'
+        * @return String
+        */
+       function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
                wfProfileIn( __METHOD__ );
 
-               // eventually this should be a word segmentation
-               // for now just treat each character as a word
-               // @fixme only do this for Han characters...
-               $t = preg_replace(
-                               "/([\\xc0-\\xff][\\x80-\\xbf]*)/",
-                               " $1", $string);
-
-        //always convert to zh-hans before indexing. it should be
-               //better to use zh-hans for search, since conversion from
-               //Traditional to Simplified is less ambiguous than the
-               //other way around
-
-               $t = $this->mConverter->autoConvert($t, 'zh-hans');
-               $t = parent::stripForSearch( $t );
+               // always convert to zh-hans before indexing. it should be
+               // better to use zh-hans for search, since conversion from
+               // Traditional to Simplified is less ambiguous than the
+               // other way around
+               $s = $this->mConverter->autoConvert( $string, $autoVariant );
+               // LanguageZh_hans::normalizeForSearch
+               $s = parent::normalizeForSearch( $s );
                wfProfileOut( __METHOD__ );
-               return $t;
+               return $s;
 
        }
 
        function convertForSearchResult( $termsArray ) {
                $terms = implode( '|', $termsArray );
+               $terms = self::convertDoubleWidth( $terms );
                $terms = implode( '|', $this->mConverter->autoConvertToAllVariants( $terms ) );
                $ret = array_unique( explode('|', $terms) );
                return $ret;