php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-19 07:50:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

applied new style of Yii::t params to all occurences

Browse Source
This commit is contained in:
Carsten Brandt
2013-10-16 22:03:26 +02:00
parent 5d6bad5faa
commit 6507e2e316
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/yii/console/Application.php
View File

@@ -9,6 +9,7 @@
namespace yii\console; namespace yii\console;
use Yii;
use yii\base\InvalidRouteException; use yii\base\InvalidRouteException;
/** /**
@@ -129,7 +130,7 @@ class Application extends \yii\base\Application
try { try {
return parent::runAction($route, $params); return parent::runAction($route, $params);
} catch (InvalidRouteException $e) { } catch (InvalidRouteException $e) {
throw new Exception(\Yii::t('yii', 'Unknown command "{command}".', array('{command}' => $route)), 0, $e); throw new Exception(Yii::t('yii', 'Unknown command "{command}".', array('command' => $route)), 0, $e);
} }
} }

4
framework/yii/console/Controller.php
View File

@@ -99,7 +99,7 @@ class Controller extends \yii\base\Controller
$args[] = $value; $args[] = $value;
} else { } else {
throw new Exception(Yii::t('yii', 'Unknown option: --{name}', array( throw new Exception(Yii::t('yii', 'Unknown option: --{name}', array(
'{name}' => $name, 'name' => $name,
))); )));
} }
} }
@@ -125,7 +125,7 @@ class Controller extends \yii\base\Controller
if (!empty($missing)) { if (!empty($missing)) {
throw new Exception(Yii::t('yii', 'Missing required arguments: {params}', array( throw new Exception(Yii::t('yii', 'Missing required arguments: {params}', array(
'{params}' => implode(', ', $missing), 'params' => implode(', ', $missing),
))); )));
} }

4
framework/yii/console/controllers/HelpController.php
View File

@@ -58,7 +58,7 @@ class HelpController extends Controller
$result = Yii::$app->createController($command); $result = Yii::$app->createController($command);
if ($result === false) { if ($result === false) {
throw new Exception(Yii::t('yii', 'No help for unknown command "{command}".', array( throw new Exception(Yii::t('yii', 'No help for unknown command "{command}".', array(
'{command}' => $this->ansiFormat($command, Console::FG_YELLOW), 'command' => $this->ansiFormat($command, Console::FG_YELLOW),
))); )));
} }
@@ -243,7 +243,7 @@ class HelpController extends Controller
$action = $controller->createAction($actionID); $action = $controller->createAction($actionID);
if ($action === null) { if ($action === null) {
throw new Exception(Yii::t('yii', 'No help for unknown sub-command "{command}".', array( throw new Exception(Yii::t('yii', 'No help for unknown sub-command "{command}".', array(
'{command}' => rtrim($controller->getUniqueId() . '/' . $actionID, '/'), 'command' => rtrim($controller->getUniqueId() . '/' . $actionID, '/'),
))); )));
} }
if ($action instanceof InlineAction) { if ($action instanceof InlineAction) {

2
framework/yii/web/Controller.php
View File

@@ -60,7 +60,7 @@ class Controller extends \yii\base\Controller
if (!empty($missing)) { if (!empty($missing)) {
throw new HttpException(400, Yii::t('yii', 'Missing required parameters: {params}', array( throw new HttpException(400, Yii::t('yii', 'Missing required parameters: {params}', array(
'{params}' => implode(', ', $missing), 'params' => implode(', ', $missing),
))); )));
} }