X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=languages%2Fclasses%2FLanguageZh.php;h=4271ed346f86f5da106d71a699f5664b9511f8e6;hb=ff05579d1c7fcf9d449bdd474b48338dd58b1c5d;hp=cb712179043e6feb4e025f12a106499af03f3b45;hpb=aa21e125a34e8ca44e05d5dd96bb28562ec8e347;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index cb71217904..4271ed346f 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -67,23 +67,35 @@ class ZhConverter extends LanguageConverter {
 		$this->mTables = array(
 			'zh-hans' => new ReplacementArray( $zh2Hans ),
 			'zh-hant' => new ReplacementArray( $zh2Hant ),
-			'zh-cn' => new ReplacementArray( array_merge( $zh2Hans, $zh2CN ) ),
-			'zh-hk' => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
-			'zh-mo' => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
-			'zh-my' => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
-			'zh-sg' => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
-			'zh-tw' => new ReplacementArray( array_merge( $zh2Hant, $zh2TW ) ),
+			'zh-cn' => new ReplacementArray( $zh2CN ),
+			'zh-hk' => new ReplacementArray( $zh2HK ),
+			'zh-mo' => new ReplacementArray( $zh2HK ),
+			'zh-my' => new ReplacementArray( $zh2SG ),
+			'zh-sg' => new ReplacementArray( $zh2SG ),
+			'zh-tw' => new ReplacementArray( $zh2TW ),
 			'zh' => new ReplacementArray
 		);
 	}
 
 	function postLoadTables() {
-		$this->mTables['zh-cn']->merge( $this->mTables['zh-hans'] );
-		$this->mTables['zh-hk']->merge( $this->mTables['zh-hant'] );
-		$this->mTables['zh-mo']->merge( $this->mTables['zh-hant'] );
-		$this->mTables['zh-my']->merge( $this->mTables['zh-hans'] );
-		$this->mTables['zh-sg']->merge( $this->mTables['zh-hans'] );
-		$this->mTables['zh-tw']->merge( $this->mTables['zh-hant'] );
+		$this->mTables['zh-cn']->setArray(
+			$this->mTables['zh-cn']->getArray() + $this->mTables['zh-hans']->getArray()
+		);
+		$this->mTables['zh-hk']->setArray(
+			$this->mTables['zh-hk']->getArray() + $this->mTables['zh-hant']->getArray()
+		);
+		$this->mTables['zh-mo']->setArray(
+			$this->mTables['zh-mo']->getArray() + $this->mTables['zh-hant']->getArray()
+		);
+		$this->mTables['zh-my']->setArray(
+			$this->mTables['zh-my']->getArray() + $this->mTables['zh-hans']->getArray()
+		);
+		$this->mTables['zh-sg']->setArray(
+			$this->mTables['zh-sg']->getArray() + $this->mTables['zh-hans']->getArray()
+		);
+		$this->mTables['zh-tw']->setArray(
+			$this->mTables['zh-tw']->getArray() + $this->mTables['zh-hant']->getArray()
+		);
 	}
 
 	/**