summaryrefslogtreecommitdiff
path: root/framework/I18N
diff options
context:
space:
mode:
authorwei <>2006-08-01 02:10:24 +0000
committerwei <>2006-08-01 02:10:24 +0000
commit560338d15d2b84eb5b3cffaaf200c040866d4943 (patch)
treeccdeeabddc832fd4f4f90822c087c0c2f3664760 /framework/I18N
parentf8fe7d47cc5adb3c9e1901082c65c8766441f09e (diff)
Fixed #306
Diffstat (limited to 'framework/I18N')
-rw-r--r--framework/I18N/core/MessageFormat.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/I18N/core/MessageFormat.php b/framework/I18N/core/MessageFormat.php
index dab7434c..3faa663d 100644
--- a/framework/I18N/core/MessageFormat.php
+++ b/framework/I18N/core/MessageFormat.php
@@ -161,6 +161,10 @@ class MessageFormat
public function format($string,$args=array(), $catalogue=null, $charset=null)
{
if(empty($charset)) $charset = $this->getCharset();
+
+ //force args as UTF-8
+ foreach($args as $k => $v)
+ $args[$k] = I18N_toUTF8($v, $charset);
$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
return I18N_toEncoding($s, $charset);
}