summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authortof <>2008-06-03 14:33:23 +0000
committertof <>2008-06-03 14:33:23 +0000
commitfc7a265444190876cf18e83d1ce89c8e71ec237f (patch)
treeb68893c877c1903c73beb6045929b16a4f3702a3 /framework
parent9868f4ec0609bcdf4684df97b8ada90b838807df (diff)
Fixed #860
Diffstat (limited to 'framework')
-rw-r--r--framework/PradoBase.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index d9e9444e..2fba2ffd 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -571,11 +571,11 @@ class PradoBase
//no translation handler provided
if($app===null || ($config = $app->getTranslationConfiguration())===null)
return strtr($text, $params);
-
- Translation::init();
-
- if(empty($catalogue) && isset($config['catalogue']))
- $catalogue = $config['catalogue'];
+
+ if ($catalogue===null)
+ $catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+
+ Translation::init($catalogue);
//globalization charset
$appCharset = $app===null ? '' : $app->getCharset();
@@ -587,7 +587,7 @@ class PradoBase
if(empty($charset)) $charset = $appCharset;
if(empty($charset)) $charset = $defaultCharset;
- return Translation::formatter()->format($text,$params,$catalogue,$charset);
+ return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
}
}