diff options
| author | xue <> | 2006-04-16 18:02:31 +0000 |
|---|---|---|
| committer | xue <> | 2006-04-16 18:02:31 +0000 |
| commit | 9db90898be134c9f70c0b334ec071223e60ed76c (patch) | |
| tree | c499036f6ca4b350b3f4ae48b0d55cf8308b385d /framework/PradoBase.php | |
| parent | fc38326ea80e73717fb1d187a16421f7bc1b1b04 (diff) | |
Merge from 3.0 branch till 924
Diffstat (limited to 'framework/PradoBase.php')
| -rw-r--r-- | framework/PradoBase.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/PradoBase.php b/framework/PradoBase.php index 08e503b1..7e631cb8 100644 --- a/framework/PradoBase.php +++ b/framework/PradoBase.php @@ -533,14 +533,14 @@ class PradoBase public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
{
Prado::using('System.I18N.Translation');
- $app = Prado::getApplication()->getGlobalization();
+ $app = Prado::getApplication()->getGlobalization(false);
$params = array();
foreach($parameters as $key => $value)
$params['{'.$key.'}'] = $value;
//no translation handler provided
- if(($config = $app->getTranslationConfiguration())===null)
+ if($app===null || ($config = $app->getTranslationConfiguration())===null)
return strtr($text, $params);
Translation::init();
|