php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-18 09:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2013-06-07 11:02:35 -04:00
parent 29ac3aeea6 a08399bcc5
commit c0ab801fce
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/yii/YiiBase.php
View File

@ -606,7 +606,10 @@ class YiiBase
public static function t($category, $message, $params = array(), $language = null)
{
if (self::$app !== null) {
return self::$app->getI18N()->translate($category, $message, $params, $language);
if ($language === null) {
$language = self::$app->language;
}
return self::$app->getI18N()->translate($category, $message, $language);
} else {
return is_array($params) ? strtr($message, $params) : $message;
}