using the domain cake_error for messages intended for the developer

cakephp · Mar 19, 2011 · b19ca3c · b19ca3c
1 parent f95340b
commit b19ca3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php
@@ -70,13 +70,13 @@ public static function bootstrap($boot = true) {
 			));
 
 			if (!include(CONFIGS . 'core.php')) {
-				trigger_error(__d('cake', "Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR);
+				trigger_error(__d('cake_error', "Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR);
 			}
 
 			App::init();
 			App::build();
 			if (!include(CONFIGS . 'bootstrap.php')) {
-				trigger_error(__d('cake', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR);
+				trigger_error(__d('cake_error', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR);
 			}
 			$level = -1;
 			if (isset(self::$_values['Error']['level'])) {

diff --git a/lib/Cake/Error/exceptions.php b/lib/Cake/Error/exceptions.php
@@ -184,7 +184,7 @@ class CakeException extends RuntimeException {
 	public function __construct($message, $code = 500) {
 		if (is_array($message)) {
 			$this->_attributes = $message;
-			$message = __d('cake', $this->_messageTemplate, $message);
+			$message = __d('cake_error', $this->_messageTemplate, $message);
 		}
 		parent::__construct($message, $code);
 	}

diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php
@@ -82,15 +82,15 @@ class CakeLog {
  */
 	public static function config($key, $config) {
 		if (empty($config['engine'])) {
-			throw new CakeLogException(__d('cake', 'Missing logger classname'));
+			throw new CakeLogException(__d('cake_error', 'Missing logger classname'));
 		}
 		$loggerName = $config['engine'];
 		unset($config['engine']);
 		$className = self::_getLogger($loggerName);
 		$logger = new $className($config);
 		if (!$logger instanceof CakeLogInterface) {
 			throw new CakeLogException(sprintf(
-				__d('cake', 'logger class %s does not implement a write method.'), $loggerName
+				__d('cake_error', 'logger class %s does not implement a write method.'), $loggerName
 			));
 		}
 		self::$_streams[$key] = $logger;
@@ -109,7 +109,7 @@ protected static function _getLogger($loggerName) {
 
 		App::uses($loggerName, $plugin . 'Log/Engine');
 		if (!class_exists($loggerName)) {
-			throw new CakeLogException(__d('cake', 'Could not load class %s', $loggerName));
+			throw new CakeLogException(__d('cake_error', 'Could not load class %s', $loggerName));
 		}
 		return $loggerName;
 	}