From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Fri, 27 Jun 2008 15:08:07 +0000 (+0000)
Subject: fixing encoding problems on r36664
X-Git-Tag: 1.31.0-rc.0~46857
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=9bfe56aa37003956216a9cb1b54e4db1ff8d3fd4;p=lhc%2Fweb%2Fwiklou.git

fixing encoding problems on r36664
  patch by fdcn
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 5e47ded72b..6a1d5aa51e 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -411,7 +411,7 @@ class LanguageConverter {
 			$text .= $this->mVariantNames[$k].':'.$v.';';
 		foreach($unidtable as $k => $a)
 			foreach($a as $from=>$to)
-				$text.=$from.'Ë'.$this->mVariantNames[$k].':'.$to.';';
+				$text.=$from.'⇒'.$this->mVariantNames[$k].':'.$to.';';
 		return $text;
 	}
 
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index ec427b7baf..c0c0a44dce 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -29,7 +29,7 @@ class ZhConverter extends LanguageConverter {
 			'zh-hk'   => '香港',
 			'zh-mo'   => '澳門',
 			'zh-sg'   => '新加坡',
-			'zh-my'   => '马来西亚',
+			'zh-my'   => '大马',
 		);
 		$this->mVariantNames = array_merge($this->mVariantNames,$names);
 	}
@@ -69,8 +69,8 @@ class ZhConverter extends LanguageConverter {
 	/* description of convert code in chinese language*/
 	function getRulesDesc($bidtable,$unidtable){
 		$text=parent::getRulesDesc($bidtable,$unidtable);
-		$text=str_replace(':','F',$text);
-		$text=str_replace(';','G',$text);
+		$text=str_replace(':','：',$text);
+		$text=str_replace(';','；',$text);
 		return $text;
 	}