From 78dc0996c640596bf94847264d75bd051251e3ae Mon Sep 17 00:00:00 2001 From: Zheng Zhu Date: Tue, 15 Mar 2005 20:57:04 +0000 Subject: [PATCH] make conversion table for zh-sg default to zh-cn, and zh-hk default to zh-tw --- languages/LanguageZh.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php index bdefc3ac38..c97e41f3f8 100644 --- a/languages/LanguageZh.php +++ b/languages/LanguageZh.php @@ -102,8 +102,8 @@ class LanguageZh extends LanguageZh_cn { $this->mTables = array(); $this->mTables['zh-cn'] = $zh2CN; $this->mTables['zh-tw'] = $zh2TW; - $this->mTables['zh-sg'] = array_merge($zh2CN, $zh2SG); - $this->mTables['zh-hk'] = array_merge($zh2TW, $zh2HK); + $this->mTables['zh-sg'] = $zh2SG; + $this->mTables['zh-hk'] = $zh2HK; $cached = $this->parseCachedTable('zh-cn'); $this->mTables['zh-cn'] = array_merge($this->mTables['zh-cn'], $cached); @@ -112,10 +112,10 @@ class LanguageZh extends LanguageZh_cn { $this->mTables['zh-tw'] = array_merge($this->mTables['zh-tw'], $cached); $cached = $this->parseCachedTable('zh-sg'); - $this->mTables['zh-sg'] = array_merge($this->mTables['zh-sg'], $cached); + $this->mTables['zh-sg'] = array_merge($this->mTables['zh-cn'], $this->mTables['zh-sg'], $cached); $cached = $this->parseCachedTable('zh-hk'); - $this->mTables['zh-hk'] = array_merge($this->mTables['zh-hk'], $cached); + $this->mTables['zh-hk'] = array_merge($this->mTables['zh-tw'], $this->mTables['zh-hk'], $cached); if($this->lockCache()) { $wgMemc->set($this->mCacheKey, $this->mTables, 43200); $this->unlockCache(); -- 2.20.1