From 33f6e8146328ce8f151fdb0ad4cee1f21bd97534 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Wed, 23 Oct 2013 19:49:29 +0200 Subject: [PATCH] make Yii::t fallback behavior consistent with I18N::translate --- framework/yii/BaseYii.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/yii/BaseYii.php b/framework/yii/BaseYii.php index cf9a96f..21dc81c 100644 --- a/framework/yii/BaseYii.php +++ b/framework/yii/BaseYii.php @@ -515,7 +515,11 @@ class BaseYii if (self::$app !== null) { return self::$app->getI18n()->translate($category, $message, $params, $language ?: self::$app->language); } else { - return is_array($params) ? strtr($message, $params) : $message; + $p = []; + foreach((array) $params as $name => $value) { + $p['{' . $name . '}'] = $value; + } + return ($p === []) ? $message : strtr($message, $p); } }