From a29df585167d8ddc1871c41b55871163f5feae91 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Thu, 9 Jan 2014 02:26:29 +0400 Subject: [PATCH] Removed translations for messages intended for developers --- framework/yii/log/EmailTarget.php | 2 +- framework/yii/web/Response.php | 4 ++-- framework/yii/web/VerbFilter.php | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/framework/yii/log/EmailTarget.php b/framework/yii/log/EmailTarget.php index f3bd98f..c4e936a 100644 --- a/framework/yii/log/EmailTarget.php +++ b/framework/yii/log/EmailTarget.php @@ -59,7 +59,7 @@ class EmailTarget extends Target // moved initialization of subject here because of the following issue // https://github.com/yiisoft/yii2/issues/1446 if (empty($this->message['subject'])) { - $this->message['subject'] = Yii::t('yii', 'Application Log'); + $this->message['subject'] = 'Application Log'; } $messages = array_map([$this, 'formatMessage'], $this->messages); $body = wordwrap(implode("\n", $messages), 70); diff --git a/framework/yii/web/Response.php b/framework/yii/web/Response.php index fcc0629..b4781df 100644 --- a/framework/yii/web/Response.php +++ b/framework/yii/web/Response.php @@ -386,7 +386,7 @@ class Response extends \yii\base\Response $range = $this->getHttpRange($contentLength); if ($range === false) { $headers->set('Content-Range', "bytes */$contentLength"); - throw new HttpException(416, Yii::t('yii', 'Requested range not satisfiable')); + throw new HttpException(416, 'Requested range not satisfiable'); } $headers->setDefault('Pragma', 'public') @@ -428,7 +428,7 @@ class Response extends \yii\base\Response $range = $this->getHttpRange($fileSize); if ($range === false) { $headers->set('Content-Range', "bytes */$fileSize"); - throw new HttpException(416, Yii::t('yii', 'Requested range not satisfiable')); + throw new HttpException(416, 'Requested range not satisfiable'); } list($begin, $end) = $range; diff --git a/framework/yii/web/VerbFilter.php b/framework/yii/web/VerbFilter.php index 65d182b..1ca08c2 100644 --- a/framework/yii/web/VerbFilter.php +++ b/framework/yii/web/VerbFilter.php @@ -100,9 +100,7 @@ class VerbFilter extends Behavior $event->isValid = false; // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.7 Yii::$app->getResponse()->getHeaders()->set('Allow', implode(', ', $allowed)); - throw new MethodNotAllowedHttpException(Yii::t('yii', 'Method Not Allowed. This url can only handle the following request methods: {methods}.', [ - 'methods' => implode(', ', $allowed), - ])); + throw new MethodNotAllowedHttpException('Method Not Allowed. This url can only handle the following request methods: ' . implode(', ', $allowed) . '.'); } return $event->isValid;