Fixes for r60599:

[lhc/web/wiklou.git] / languages / classes / LanguageZh.php

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 6a45289..6a004a0 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -11,13 +11,13 @@ class ZhConverter extends LanguageConverter {
        function __construct($langobj, $maincode,
                                                                $variants=array(),
                                                                $variantfallbacks=array(),
-                                                               $markup=array(),
                                                                $flags = array(),
                                                                $manualLevel = array() ) {
+               $this->mDescCodeSep = '：';
+               $this->mDescVarSep = '；';
                parent::__construct($langobj, $maincode,
                                                                        $variants,
                                                                        $variantfallbacks,
-                                                                       $markup,
                                                                        $flags,
                                                                        $manualLevel);
                $names = array(
@@ -32,6 +32,53 @@ 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() {
@@ -65,14 +112,6 @@ class ZhConverter extends LanguageConverter {
        function markNoConversion($text, $noParse = false) {
                return $text;
        }
-       
-       /* description of convert code in chinese language*/
-       function getRulesDesc($bidtable,$unidtable){
-               $text=parent::getRulesDesc($bidtable,$unidtable);
-               $text=str_replace(':','：',$text);
-               $text=str_replace(';','；',$text);
-               return $text;
-       }
 
        function convertCategoryKey( $key ) {
                return $this->autoConvert( $key, 'zh' );
@@ -92,6 +131,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'),
@@ -111,7 +151,7 @@ class LanguageZh extends LanguageZh_hans {
 
                $this->mConverter = new ZhConverter( $this, 'zh',
                                                                $variants, $variantfallbacks,
-                                                               array(),array(),
+                                                               array(),
                                                                $ml);
 
                $wgHooks['ArticleSaveComplete'][] = $this->mConverter;
@@ -131,30 +171,24 @@ class LanguageZh extends LanguageZh_hans {
        }
 
        // word segmentation
-       function stripForSearch( $string ) {
-               $fname="LanguageZh::stripForSearch";
-               wfProfileIn( $fname );
-
-               // eventually this should be a word segmentation
-               // for now just treat each character as a word
-               $t = preg_replace(
-                               "/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-                               "' ' .\"$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 );
-               wfProfileOut( $fname );
-               return $t;
+       function stripForSearch( $string, $doStrip = true, $autoVariant = 'zh-hans' ) {
+               wfProfileIn( __METHOD__ );
+
+               // 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::stripForSearch
+               $s = parent::stripForSearch( $s, $doStrip );
+               wfProfileOut( __METHOD__ );
+               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;