adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate cake_error and cake_developer to simply "cake_dev"

Browse source 
it's a lot easier for adding new translations to think:
	is it for the end user?
		use 'cake' as the domain
	is it for the developer
		use 'cake_dev' as the domain
	is it for the console
		use 'cake_console' as the domain

also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
This commit is contained in:
AD7six 2011-03-20 16:35:43 +01:00
parent 7fa52710f3
commit 32df3156a7
75 changed files with 331 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Cache/Cache.php
View file

@ -143,7 +143,7 @@ class Cache {
}
$cacheClass = $class . 'Engine';
if (!is_subclass_of($cacheClass, 'CacheEngine')) {
throw new CacheException(__d('cake_error', 'Cache engines must use CacheEngine as a base class.'));
throw new CacheException(__d('cake_dev', 'Cache engines must use CacheEngine as a base class.'));
}
self::$_engines[$name] = new $cacheClass();
if (self::$_engines[$name]->init($config)) {
@ -283,7 +283,7 @@ class Cache {
self::set(null, $config);
if ($success === false && $value !== '') {
trigger_error(
__d('cake_error', "%s cache was unable to write '%s' to cache", $config, $key),
__d('cake_dev', "%s cache was unable to write '%s' to cache", $config, $key),
E_USER_WARNING
);
}

6
lib/Cake/Cache/Engine/FileEngine.php
View file

@ -251,7 +251,7 @@ class FileEngine extends CacheEngine {
* @throws CacheException
*/
public function decrement($key, $offset = 1) {
throw new CacheException(__d('cake_error', 'Files cannot be atomically decremented.'));
throw new CacheException(__d('cake_dev', 'Files cannot be atomically decremented.'));
}
/**
@ -261,7 +261,7 @@ class FileEngine extends CacheEngine {
* @throws CacheException
*/
public function increment($key, $offset = 1) {
throw new CacheException(__d('cake_error', 'Files cannot be atomically incremented.'));
throw new CacheException(__d('cake_dev', 'Files cannot be atomically incremented.'));
}
/**
@ -297,7 +297,7 @@ class FileEngine extends CacheEngine {
$dir = new SplFileInfo($this->settings['path']);
if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
$this->_init = false;
trigger_error(__d('cake_error', '%s is not writable', $this->settings['path']), E_USER_WARNING);
trigger_error(__d('cake_dev', '%s is not writable', $this->settings['path']), E_USER_WARNING);
return false;
}
return true;

4
lib/Cake/Cache/Engine/MemcacheEngine.php
View file

@ -153,7 +153,7 @@ class MemcacheEngine extends CacheEngine {
public function increment($key, $offset = 1) {
if ($this->settings['compress']) {
throw new CacheException(
__d('cake_error', 'Method increment() not implemented for compressed cache in %s', __CLASS__)
__d('cake_dev', 'Method increment() not implemented for compressed cache in %s', __CLASS__)
);
}
return $this->_Memcache->increment($key, $offset);
@ -171,7 +171,7 @@ class MemcacheEngine extends CacheEngine {
public function decrement($key, $offset = 1) {
if ($this->settings['compress']) {
throw new CacheException(
__d('cake_error', 'Method decrement() not implemented for compressed cache in %s', __CLASS__)
__d('cake_dev', 'Method decrement() not implemented for compressed cache in %s', __CLASS__)
);
}
return $this->_Memcache->decrement($key, $offset);

2
lib/Cake/Configure/IniReader.php
View file

@ -74,7 +74,7 @@ class IniReader implements ConfigReaderInterface {
if (!file_exists($filename)) {
$filename .= '.ini';
if (!file_exists($filename)) {
throw new ConfigureException(__d('cake_error', 'Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename));
}
}
$contents = parse_ini_file($filename, true);

6
lib/Cake/Configure/PhpReader.php
View file

@ -55,7 +55,7 @@ class PhpReader implements ConfigReaderInterface {
*/
public function read($key) {
if (strpos($key, '..') !== false) {
throw new ConfigureException(__d('cake_error', 'Cannot load configuration files with ../ in them.'));
throw new ConfigureException(__d('cake_dev', 'Cannot load configuration files with ../ in them.'));
}
if (substr($key, -4) === '.php') {
$key = substr($key, 0, -4);
@ -70,13 +70,13 @@ class PhpReader implements ConfigReaderInterface {
if (!file_exists($file)) {
$file .= '.php';
if (!file_exists($file)) {
throw new ConfigureException(__d('cake_error', 'Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
}
}
include $file;
if (!isset($config)) {
throw new ConfigureException(
sprintf(__d('cake_error', 'No variable $config found in %s.php'), $file)
sprintf(__d('cake_dev', 'No variable $config found in %s.php'), $file)
);
}
return $config;

16
lib/Cake/Controller/Component/AclComponent.php
View file

@ -68,7 +68,7 @@ class AclComponent extends Component {
list($plugin, $name) = pluginSplit($name);
$name .= 'Component';
} else {
throw new CakeException(__d('cake_error', 'Could not find %s.', $name));
throw new CakeException(__d('cake_dev', 'Could not find %s.', $name));
}
}
$this->adapter($name);
@ -92,7 +92,7 @@ class AclComponent extends Component {
$adapter = new $adapter();
}
if (!$adapter instanceof AclInterface) {
throw new CakeException(__d('cake_error', 'AclComponent adapters must implement AclInterface'));
throw new CakeException(__d('cake_dev', 'AclComponent adapters must implement AclInterface'));
}
$this->_Instance = $adapter;
$this->_Instance->initialize($this);
@ -163,7 +163,7 @@ class AclComponent extends Component {
* @deprecated
*/
public function grant($aro, $aco, $action = "*") {
trigger_error(__d('cake_error', 'AclComponent::grant() is deprecated, use allow() instead'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'AclComponent::grant() is deprecated, use allow() instead'), E_USER_WARNING);
return $this->_Instance->allow($aro, $aco, $action);
}
@ -177,7 +177,7 @@ class AclComponent extends Component {
* @deprecated
*/
public function revoke($aro, $aco, $action = "*") {
trigger_error(__d('cake_error', 'AclComponent::revoke() is deprecated, use deny() instead'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'AclComponent::revoke() is deprecated, use deny() instead'), E_USER_WARNING);
return $this->_Instance->deny($aro, $aco, $action);
}
}
@ -299,12 +299,12 @@ class DbAcl extends Object implements AclInterface {
$acoPath = $this->Aco->node($aco);
if (empty($aroPath) || empty($acoPath)) {
trigger_error(__d('cake_error', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
return false;
}
if ($acoPath == null || $acoPath == array()) {
trigger_error(__d('cake_error', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
return false;
}
@ -312,7 +312,7 @@ class DbAcl extends Object implements AclInterface {
$acoNode = $acoPath[0];
if ($action != '*' && !in_array('_' . $action, $permKeys)) {
trigger_error(__d('cake_error', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE);
trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE);
return false;
}
@ -386,7 +386,7 @@ class DbAcl extends Object implements AclInterface {
$save = array();
if ($perms == false) {
trigger_error(__d('cake_error', 'DbAcl::allow() - Invalid node'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'DbAcl::allow() - Invalid node'), E_USER_WARNING);
return false;
}
if (isset($perms[0])) {

2
lib/Cake/Controller/Component/Auth/BaseAuthorize.php
View file

@ -87,7 +87,7 @@ abstract class BaseAuthorize {
public function controller($controller = null) {
if ($controller) {
if (!$controller instanceof Controller) {
throw new CakeException(__d('cake_error', '$controller needs to be an instance of Controller'));
throw new CakeException(__d('cake_dev', '$controller needs to be an instance of Controller'));
}
$this->_Controller = $controller;
return true;

2
lib/Cake/Controller/Component/Auth/ControllerAuthorize.php
View file

@ -46,7 +46,7 @@ class ControllerAuthorize extends BaseAuthorize {
public function controller($controller = null) {
if ($controller) {
if (!method_exists($controller, 'isAuthorized')) {
throw new CakeException(__d('cake_error', '$controller does not implement an isAuthorized() method.'));
throw new CakeException(__d('cake_dev', '$controller does not implement an isAuthorized() method.'));
}
}
return parent::controller($controller);

2
lib/Cake/Controller/Component/Auth/CrudAuthorize.php
View file

@ -81,7 +81,7 @@ class CrudAuthorize extends BaseAuthorize {
*/
public function authorize($user, CakeRequest $request) {
if (!isset($this->settings['actionMap'][$request->params['action']])) {
trigger_error(__d('cake_error',
trigger_error(__d('cake_dev',
'CrudAuthorize::authorize() - Attempted access of un-mapped action "%1$s" in controller "%2$s"',
$request->action,
$request->controller

8
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -411,10 +411,10 @@ class AuthComponent extends Component {
$className = $class . 'Authorize';
App::uses($className, $plugin . 'Controller/Component/Auth');
if (!class_exists($className)) {
throw new CakeException(__d('cake_error', 'Authorization adapter "%s" was not found.', $class));
throw new CakeException(__d('cake_dev', 'Authorization adapter "%s" was not found.', $class));
}
if (!method_exists($className, 'authorize')) {
throw new CakeException(__d('cake_error', 'Authorization objects must implement an authorize method.'));
throw new CakeException(__d('cake_dev', 'Authorization objects must implement an authorize method.'));
}
$settings = array_merge($global, (array)$settings);
$this->_authorizeObjects[] = new $className($this->_Collection, $settings);
@ -651,10 +651,10 @@ class AuthComponent extends Component {
$className = $class . 'Authenticate';
App::uses($className, $plugin . 'Controller/Component/Auth');
if (!class_exists($className)) {
throw new CakeException(__d('cake_error', 'Authentication adapter "%s" was not found.', $class));
throw new CakeException(__d('cake_dev', 'Authentication adapter "%s" was not found.', $class));
}
if (!method_exists($className, 'authenticate')) {
throw new CakeException(__d('cake_error', 'Authentication objects must implement an authenticate method.'));
throw new CakeException(__d('cake_dev', 'Authentication objects must implement an authenticate method.'));
}
$settings = array_merge($global, (array)$settings);
$this->_authenticateObjects[] = new $className($this->_Collection, $settings);

2
lib/Cake/Controller/Component/EmailComponent.php
View file

@ -725,7 +725,7 @@ class EmailComponent extends Component {
$formatted = array();
if ($this->_lineLength !== null) {
trigger_error(__d('cake_error', '_lineLength cannot be accessed please use lineLength'), E_USER_WARNING);
trigger_error(__d('cake_dev', '_lineLength cannot be accessed please use lineLength'), E_USER_WARNING);
$this->lineLength = $this->_lineLength;
}

4
lib/Cake/Core/Configure.php
View file

@ -70,13 +70,13 @@ class Configure {
));
if (!include(CONFIGS . 'core.php')) {
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);
trigger_error(__d('cake_dev', "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_error', "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_dev', "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'])) {

2
lib/Cake/Error/exceptions.php
View file

@ -184,7 +184,7 @@ class CakeException extends RuntimeException {
public function __construct($message, $code = 500) {
if (is_array($message)) {
$this->_attributes = $message;
$message = __d('cake_error', $this->_messageTemplate, $message);
$message = __d('cake_dev', $this->_messageTemplate, $message);
}
parent::__construct($message, $code);
}

6
lib/Cake/Log/CakeLog.php
View file

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

4
lib/Cake/Model/AclNode.php
View file

@ -133,7 +133,7 @@ class AclNode extends AppModel {
$model = ClassRegistry::init(array('class' => $name, 'alias' => $name));
if (empty($model)) {
trigger_error(__d('cake_error', "Model class '%s' not found in AclNode::node() when trying to bind %s object", $type, $this->alias), E_USER_WARNING);
trigger_error(__d('cake_dev', "Model class '%s' not found in AclNode::node() when trying to bind %s object", $type, $this->alias), E_USER_WARNING);
return null;
}
@ -178,7 +178,7 @@ class AclNode extends AppModel {
$result = $db->read($this, $queryData, -1);
if (!$result) {
trigger_error(__d('cake_error', "AclNode::node() - Couldn't find %s node identified by \"%s\"", $type, print_r($ref, true)), E_USER_WARNING);
trigger_error(__d('cake_dev', "AclNode::node() - Couldn't find %s node identified by \"%s\"", $type, print_r($ref, true)), E_USER_WARNING);
}
}
return $result;

2
lib/Cake/Model/Behavior/AclBehavior.php
View file

@ -54,7 +54,7 @@ class AclBehavior extends ModelBehavior {
}
$model->{$type} = ClassRegistry::init($type);
if (!method_exists($model, 'parentNode')) {
trigger_error(__d('cake_error', 'Callback parentNode() not defined in %s', $model->alias), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Callback parentNode() not defined in %s', $model->alias), E_USER_WARNING);
}
}

2
lib/Cake/Model/Behavior/ContainableBehavior.php
View file

@ -359,7 +359,7 @@ class ContainableBehavior extends ModelBehavior {
if (!isset($Model->{$name}) || !is_object($Model->{$name})) {
if ($throwErrors) {
trigger_error(__d('cake_error', 'Model "%s" is not associated with model "%s"', $Model->alias, $name), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Model "%s" is not associated with model "%s"', $Model->alias, $name), E_USER_WARNING);
}
continue;
}

4
lib/Cake/Model/Behavior/TranslateBehavior.php
View file

@ -55,7 +55,7 @@ class TranslateBehavior extends ModelBehavior {
$db = ConnectionManager::getDataSource($model->useDbConfig);
if (!$db->connected) {
trigger_error(
__d('cake_error', 'Datasource %s for TranslateBehavior of model %s is not connected', $model->useDbConfig, $model->alias),
__d('cake_dev', 'Datasource %s for TranslateBehavior of model %s is not connected', $model->useDbConfig, $model->alias),
E_USER_ERROR
);
return false;
@ -426,7 +426,7 @@ class TranslateBehavior extends ModelBehavior {
foreach (array('hasOne', 'hasMany', 'belongsTo', 'hasAndBelongsToMany') as $type) {
if (isset($model->{$type}[$association]) || isset($model->__backAssociation[$type][$association])) {
trigger_error(
__d('cake_error', 'Association %s is already binded to model %s', $association, $model->alias),
__d('cake_dev', 'Association %s is already binded to model %s', $association, $model->alias),
E_USER_ERROR
);
return false;

2
lib/Cake/Model/BehaviorCollection.php
View file

@ -219,7 +219,7 @@ class BehaviorCollection extends ObjectCollection {
$method = $this->hasMethod($method, true);
if ($strict && empty($method)) {
trigger_error(__d('cake_error', "BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", $method), E_USER_WARNING);
trigger_error(__d('cake_dev', "BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", $method), E_USER_WARNING);
return null;
}
if (empty($method)) {

2
lib/Cake/Model/CakeSchema.php
View file

@ -592,7 +592,7 @@ class CakeSchema extends Object {
$value['key'] = 'primary';
}
if (!isset($db->columns[$value['type']])) {
trigger_error(__d('cake_error', 'Schema generation error: invalid column type %s does not exist in DBO', $value['type']), E_USER_NOTICE);
trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s does not exist in DBO', $value['type']), E_USER_NOTICE);
continue;
} else {
$defaultCol = $db->columns[$value['type']];

8
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -254,7 +254,7 @@ class CakeSession {
self::__overwrite($_SESSION, Set::remove($_SESSION, $name));
return (self::check($name) == false);
}
self::__setError(2, __d('cake_error', "%s doesn't exist", $name));
self::__setError(2, __d('cake_dev', "%s doesn't exist", $name));
return false;
}
@ -480,7 +480,7 @@ class CakeSession {
foreach ($sessionConfig['ini'] as $setting => $value) {
if (ini_set($setting, $value) === false) {
throw new CakeSessionException(sprintf(
__d('cake_error', 'Unable to configure the session, setting %s failed.'),
__d('cake_dev', 'Unable to configure the session, setting %s failed.'),
$setting
));
}
@ -514,13 +514,13 @@ class CakeSession {
list($plugin, $class) = pluginSplit($handler, true);
App::uses($class, $plugin . 'Model/Datasource/Session');
if (!class_exists($class)) {
throw new CakeSessionException(__d('cake_error', 'Could not load %s to handle the session.', $class));
throw new CakeSessionException(__d('cake_dev', 'Could not load %s to handle the session.', $class));
}
$handler = new $class();
if ($handler instanceof CakeSessionHandlerInterface) {
return $handler;
}
throw new CakeSessionException(__d('cake_error', 'Chosen SessionHandler does not implement CakeSessionHandlerInterface it cannot be used with an engine key.'));
throw new CakeSessionException(__d('cake_dev', 'Chosen SessionHandler does not implement CakeSessionHandlerInterface it cannot be used with an engine key.'));
}
/**

2
lib/Cake/Model/Datasource/Database/Mssql.php
View file

@ -116,7 +116,7 @@ class DboMssql extends DboSource {
function __construct($config, $autoConnect = true) {
if ($autoConnect) {
if (!function_exists('mssql_min_message_severity')) {
trigger_error(__d('cake_error', "PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/"), E_USER_WARNING);
trigger_error(__d('cake_dev', "PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/"), E_USER_WARNING);
}
mssql_min_message_severity(15);
mssql_min_error_severity(2);

2
lib/Cake/Model/Datasource/Database/Mysql.php
View file

@ -298,7 +298,7 @@ class Mysql extends DboSource {
$fields = false;
$cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $this->fullTableName($model));
if (!$cols) {
throw new CakeException(__d('cake_error', 'Could not describe table for %s', $model->name));
throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $model->name));
}
foreach ($cols as $column) {

6
lib/Cake/Model/Datasource/Database/Oracle.php
View file

@ -571,7 +571,7 @@ class DboOracle extends DboSource {
*/
function constraint($action, $table) {
if (empty($table)) {
trigger_error(__d('cake_error', 'Must specify table to operate on constraints'));
trigger_error(__d('cake_dev', 'Must specify table to operate on constraints'));
}
$table = strtoupper($table);
@ -629,7 +629,7 @@ class DboOracle extends DboSource {
return $constraints;
break;
default:
trigger_error(__d('cake_error', 'DboOracle::constraint() accepts only enable, disable, or list'));
trigger_error(__d('cake_dev', 'DboOracle::constraint() accepts only enable, disable, or list'));
}
}
return true;
@ -976,7 +976,7 @@ class DboOracle extends DboSource {
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!isset($resultSet) || !is_array($resultSet)) {
if (Configure::read('debug') > 0) {
echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . __d('cake_error', 'SQL Error in model %s:', $model->alias) . ' ';
echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . __d('cake_dev', 'SQL Error in model %s:', $model->alias) . ' ';
if (isset($this->error) && $this->error != null) {
echo $this->error;
}

4
lib/Cake/Model/Datasource/Database/Sqlite.php
View file

@ -387,12 +387,12 @@ class Sqlite extends DboSource {
extract($column);
if (empty($name) || empty($type)) {
trigger_error(__d('cake_error', 'Column name or type not defined in schema'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Column name or type not defined in schema'), E_USER_WARNING);
return null;
}
if (!isset($this->columns[$type])) {
trigger_error(__d('cake_error', 'Column type %s does not exist', $type), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING);
return null;
}

16
lib/Cake/Model/Datasource/DboSource.php
View file

@ -941,11 +941,11 @@ class DboSource extends DataSource {
if (Configure::read('debug') > 0) {
$out = null;
if ($error) {
trigger_error('<span style="color:Red;text-align:left"><b>' . __d('cake_developer', 'SQL Error:') . "</b> {$this->error}</span>", E_USER_WARNING);
trigger_error('<span style="color:Red;text-align:left"><b>' . __d('cake_dev', 'SQL Error:') . "</b> {$this->error}</span>", E_USER_WARNING);
} else {
$out = ('<small>[' . __d('cake_developer', 'Aff:%s Num:%s Took:%sms', $this->affected, $this->numRows, $this->took) . ']</small>');
$out = ('<small>[' . __d('cake_dev', 'Aff:%s Num:%s Took:%sms', $this->affected, $this->numRows, $this->took) . ']</small>');
}
pr(sprintf('<p style="text-align:left"><b>' . __d('cake_developer', 'Query:') . '</b> %s %s</p>', $sql, $out));
pr(sprintf('<p style="text-align:left"><b>' . __d('cake_dev', 'Query:') . '</b> %s %s</p>', $sql, $out));
}
}
@ -1169,7 +1169,7 @@ class DboSource extends DataSource {
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!is_array($resultSet)) {
if (Configure::read('debug') > 0) {
echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . __d('cake_developer', 'SQL Error in model %s:', $model->alias) . ' ';
echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . __d('cake_dev', 'SQL Error in model %s:', $model->alias) . ' ';
if (isset($this->error) && $this->error != null) {
echo $this->error;
}
@ -2725,7 +2725,7 @@ class DboSource extends DataSource {
*/
public function length($real) {
if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
trigger_error(__d('cake_error', "FIXME: Can't parse field: " . $real), E_USER_WARNING);
trigger_error(__d('cake_dev', "FIXME: Can't parse field: " . $real), E_USER_WARNING);
$col = str_replace(array(')', 'unsigned'), '', $real);
$limit = null;
@ -2833,7 +2833,7 @@ class DboSource extends DataSource {
*/
public function createSchema($schema, $tableName = null) {
if (!is_a($schema, 'CakeSchema')) {
trigger_error(__d('cake_error', 'Invalid schema object'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Invalid schema object'), E_USER_WARNING);
return null;
}
$out = '';
@ -2915,12 +2915,12 @@ class DboSource extends DataSource {
extract(array_merge(array('null' => true), $column));
if (empty($name) || empty($type)) {
trigger_error(__d('cake_error', 'Column name or type not defined in schema'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Column name or type not defined in schema'), E_USER_WARNING);
return null;
}
if (!isset($this->columns[$type])) {
trigger_error(__d('cake_error', 'Column type %s does not exist', $type), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING);
return null;
}

8
lib/Cake/Model/Model.php
View file

@ -1005,7 +1005,7 @@ class Model extends Object {
public function getColumnTypes() {
$columns = $this->schema();
if (empty($columns)) {
trigger_error(__d('cake_error', '(Model::getColumnTypes) Unable to build model field data. If you are using a model without a database table, try implementing schema()'), E_USER_WARNING);
trigger_error(__d('cake_dev', '(Model::getColumnTypes) Unable to build model field data. If you are using a model without a database table, try implementing schema()'), E_USER_WARNING);
}
$cols = array();
foreach ($columns as $field => $values) {
@ -2602,7 +2602,7 @@ class Model extends Object {
if (isset($validator['message'])) {
$message = $validator['message'];
} else {
$message = __d('cake_error', 'This field cannot be left blank');
$message = __d('cake_dev', 'This field cannot be left blank');
}
if (
@ -2650,7 +2650,7 @@ class Model extends Object {
} elseif (!is_array($validator['rule'])) {
$valid = preg_match($rule, $data[$fieldName]);
} elseif (Configure::read('debug') > 0) {
trigger_error(__d('cake_error', 'Could not find validation handler %s for %s', $rule, $fieldName), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Could not find validation handler %s for %s', $rule, $fieldName), E_USER_WARNING);
}
if (!$valid || (is_string($valid) && strlen($valid) > 0)) {
@ -2957,7 +2957,7 @@ class Model extends Object {
return array($with, array_unique(array_merge($assoc[$with], $keys)));
}
trigger_error(
__d('cake_error', 'Invalid join model settings in %s', $model->alias),
__d('cake_dev', 'Invalid join model settings in %s', $model->alias),
E_USER_WARNING
);
}

2
lib/Cake/Network/CakeRequest.php
View file

@ -380,7 +380,7 @@ class CakeRequest implements ArrayAccess {
$type = strtolower(substr($name, 2));
return $this->is($type);
}
throw new CakeException(__d('cake_error', 'Method %s does not exist', $name));
throw new CakeException(__d('cake_dev', 'Method %s does not exist', $name));
}
/**

2
lib/Cake/Network/CakeResponse.php
View file

@ -459,7 +459,7 @@ class CakeResponse {
return $this->_status;
}
if (!isset($this->_statusCodes[$code])) {
throw new CakeException(__d('cake_error', 'Unknown status code'));
throw new CakeException(__d('cake_dev', 'Unknown status code'));
}
return $this->_status = $code;
}

2
lib/Cake/Network/CakeSocket.php
View file

@ -221,7 +221,7 @@ class CakeSocket {
$buffer = fread($this->connection, $length);
$info = stream_get_meta_data($this->connection);
if ($info['timed_out']) {
$this->setLastError(E_WARNING, __d('cake_error', 'Connection timed out'));
$this->setLastError(E_WARNING, __d('cake_dev', 'Connection timed out'));
return false;
}
return $buffer;

6
lib/Cake/Network/Http/HttpResponse.php
View file

@ -126,11 +126,11 @@ class HttpResponse implements ArrayAccess {
*/
public function parseResponse($message) {
if (!is_string($message)) {
throw new SocketException(__d('cake_error', 'Invalid response.'));
throw new SocketException(__d('cake_dev', 'Invalid response.'));
}
if (!preg_match("/^(.+\r\n)(.*)(?<=\r\n)\r\n/Us", $message, $match)) {
throw new SocketException(__d('cake_error', 'Invalid HTTP response.'));
throw new SocketException(__d('cake_dev', 'Invalid HTTP response.'));
}
list(, $statusLine, $header) = $match;
@ -198,7 +198,7 @@ class HttpResponse implements ArrayAccess {
while ($chunkLength !== 0) {
if (!preg_match("/^([0-9a-f]+) *(?:;(.+)=(.+))?\r\n/iU", $body, $match)) {
throw new SocketException(__d('cake_error', 'HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.'));
throw new SocketException(__d('cake_dev', 'HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.'));
}
$chunkSize = 0;

16
lib/Cake/Network/Http/HttpSocket.php
View file

@ -211,7 +211,7 @@ class HttpSocket extends CakeSocket {
return;
}
if (!is_resource($resource)) {
throw new SocketException(__d('cake_error', 'Invalid resource.'));
throw new SocketException(__d('cake_dev', 'Invalid resource.'));
}
$this->_contentResource = $resource;
}
@ -364,7 +364,7 @@ class HttpSocket extends CakeSocket {
}
if (!App::import('Lib', $this->responseClass)) {
throw new SocketException(__d('cake_error', 'Class %s not found.', $this->responseClass));
throw new SocketException(__d('cake_dev', 'Class %s not found.', $this->responseClass));
}
$responseClass = $this->responseClass;
$this->response = new $responseClass($response);
@ -535,10 +535,10 @@ class HttpSocket extends CakeSocket {
App::uses($authClass, $plugin . 'Network/Http');
if (!class_exists($authClass)) {
throw new SocketException(__d('cake_error', 'Unknown authentication method.'));
throw new SocketException(__d('cake_dev', 'Unknown authentication method.'));
}
if (!method_exists($authClass, 'authentication')) {
throw new SocketException(sprintf(__d('cake_error', 'The %s do not support authentication.'), $authClass));
throw new SocketException(sprintf(__d('cake_dev', 'The %s do not support authentication.'), $authClass));
}
call_user_func_array("$authClass::authentication", array($this, &$this->_auth[$method]));
}
@ -564,10 +564,10 @@ class HttpSocket extends CakeSocket {
App::uses($authClass, $plugin. 'Network/Http');
if (!class_exists($authClass)) {
throw new SocketException(__d('cake_error', 'Unknown authentication method for proxy.'));
throw new SocketException(__d('cake_dev', 'Unknown authentication method for proxy.'));
}
if (!method_exists($authClass, 'proxyAuthentication')) {
throw new SocketException(sprintf(__d('cake_error', 'The %s do not support proxy authentication.'), $authClass));
throw new SocketException(sprintf(__d('cake_dev', 'The %s do not support proxy authentication.'), $authClass));
}
call_user_func_array("$authClass::proxyAuthentication", array($this, &$this->_proxy));
}
@ -785,7 +785,7 @@ class HttpSocket extends CakeSocket {
if (is_string($request)) {
$isValid = preg_match("/(.+) (.+) (.+)\r\n/U", $request, $match);
if (!$this->quirksMode && (!$isValid || ($match[2] == '*' && !in_array($match[3], $asteriskMethods)))) {
throw new SocketException(__d('cake_error', 'HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.'));
throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.'));
}
return $request;
} elseif (!is_array($request)) {
@ -803,7 +803,7 @@ class HttpSocket extends CakeSocket {
}
if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
throw new SocketException(__d('cake_error', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods)));
throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods)));
}
return $request['method'] . ' ' . $request['uri'] . ' ' . $versionToken . "\r\n";
}

2
lib/Cake/Routing/Router.php
View file

@ -263,7 +263,7 @@ class Router {
if (isset($options['routeClass'])) {
$routeClass = $options['routeClass'];
if (!is_subclass_of($routeClass, 'CakeRoute')) {
throw new RouterException(__d('cake_error', 'Route classes must extend CakeRoute'));
throw new RouterException(__d('cake_dev', 'Route classes must extend CakeRoute'));
}
unset($options['routeClass']);
if ($routeClass == 'RedirectRoute' && isset($defaults['redirect'])) {

2
lib/Cake/TestSuite/CakeTestCase.php
View file

@ -184,7 +184,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
*/
function loadFixtures() {
if (empty($this->fixtureManager)) {
throw new Exception(__d('cake_error', 'No fixture manager to load the test fixture'));
throw new Exception(__d('cake_dev', 'No fixture manager to load the test fixture'));
}
$args = func_get_args();
foreach ($args as $class) {

2
lib/Cake/TestSuite/CakeTestRunner.php
View file

@ -84,7 +84,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
if (class_exists($arguments['fixtureManager'])) {
return new $arguments['fixtureManager'];
}
throw new RuntimeException(__d('cake_error', 'Could not find fixture manager %s.', $arguments['fixtureManager']));
throw new RuntimeException(__d('cake_dev', 'Could not find fixture manager %s.', $arguments['fixtureManager']));
}
App::uses('AppFixtureManager', 'TestSuite');
if (class_exists('AppFixtureManager')) {

2
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

@ -239,7 +239,7 @@ class CakeFixtureManager {
$fixture->truncate($db);
$fixture->insert($db);
} else {
throw new UnexpectedValueException(__d('cake_error', 'Referenced fixture class %s not found', $name));
throw new UnexpectedValueException(__d('cake_dev', 'Referenced fixture class %s not found', $name));
}
}

2
lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
View file

@ -187,7 +187,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter {
if (!$this->_headerSent) {
echo $this->paintHeader();
}
echo __d('cake_developer', 'Running %s', $suite->getName()) . "\n";
echo __d('cake_dev', 'Running %s', $suite->getName()) . "\n";
}
/**

10
lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
View file

@ -234,8 +234,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
echo "<li class='fail'>\n";
echo "<span>Failed</span>";
echo "<div class='msg'><pre>" . $this->_htmlEntities($message->toString()) . "</pre></div>\n";
echo "<div class='msg'>" . __d('cake_developer', 'Test case: %s', $testName) . "</div>\n";
echo "<div class='msg'>" . __d('cake_developer', 'Stack trace:') . '<br />' . $trace . "</div>\n";
echo "<div class='msg'>" . __d('cake_dev', 'Test case: %s', $testName) . "</div>\n";
echo "<div class='msg'>" . __d('cake_dev', 'Stack trace:') . '<br />' . $trace . "</div>\n";
echo "</li>\n";
}
@ -272,8 +272,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
echo "<span>" . get_class($message) . "</span>";
echo "<div class='msg'>" . $this->_htmlEntities($message->getMessage()) . "</div>\n";
echo "<div class='msg'>" . __d('cake_developer', 'Test case: %s', $testName) . "</div>\n";
echo "<div class='msg'>" . __d('cake_developer', 'Stack trace:') . '<br />' . $trace . "</div>\n";
echo "<div class='msg'>" . __d('cake_dev', 'Test case: %s', $testName) . "</div>\n";
echo "<div class='msg'>" . __d('cake_dev', 'Stack trace:') . '<br />' . $trace . "</div>\n";
echo "</li>\n";
}
@ -341,6 +341,6 @@ class CakeHtmlReporter extends CakeBaseReporter {
if (!$this->_headerSent) {
echo $this->paintHeader();
}
echo '<h2>' . __d('cake_developer', 'Running %s', $suite->getName()) . '</h2>';
echo '<h2>' . __d('cake_dev', 'Running %s', $suite->getName()) . '</h2>';
}
}

4
lib/Cake/Utility/ClassRegistry.php
View file

@ -149,7 +149,7 @@ class ClassRegistry {
}
if (!isset(${$class})) {
trigger_error(__d('cake_error', '(ClassRegistry::init() could not create instance of %1$s class %2$s ', $class, $type), E_USER_WARNING);
trigger_error(__d('cake_dev', '(ClassRegistry::init() could not create instance of %1$s class %2$s ', $class, $type), E_USER_WARNING);
return $false;
}
@ -159,7 +159,7 @@ class ClassRegistry {
$_this->map($alias, $class);
}
} elseif (is_numeric($settings)) {
trigger_error(__d('cake_error', '(ClassRegistry::init() Attempted to create instance of a class with a numeric name'), E_USER_WARNING);
trigger_error(__d('cake_dev', '(ClassRegistry::init() Attempted to create instance of a class with a numeric name'), E_USER_WARNING);
return $false;
}
}

4
lib/Cake/Utility/Debugger.php
View file

@ -647,11 +647,11 @@ class Debugger {
*/
public static function checkSecurityKeys() {
if (Configure::read('Security.salt') == 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') {
trigger_error(__d('cake_error', 'Please change the value of \'Security.salt\' in app/config/core.php to a salt value specific to your application'), E_USER_NOTICE);
trigger_error(__d('cake_dev', 'Please change the value of \'Security.salt\' in app/config/core.php to a salt value specific to your application'), E_USER_NOTICE);
}
if (Configure::read('Security.cipherSeed') === '76859309657453542496749683645') {
trigger_error(__d('cake_error', 'Please change the value of \'Security.cipherSeed\' in app/config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE);
trigger_error(__d('cake_dev', 'Please change the value of \'Security.cipherSeed\' in app/config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE);
}
}

32
lib/Cake/Utility/Folder.php
View file

@ -345,11 +345,11 @@ class Folder {
if ($recursive === false && is_dir($path)) {
if (@chmod($path, intval($mode, 8))) {
$this->__messages[] = __d('cake_developer', '%s changed to %s', $path, $mode);
$this->__messages[] = __d('cake_dev', '%s changed to %s', $path, $mode);
return true;
}
$this->__errors[] = __d('cake_developer', '%s NOT changed to %s', $path, $mode);
$this->__errors[] = __d('cake_dev', '%s NOT changed to %s', $path, $mode);
return false;
}
@ -366,7 +366,7 @@ class Folder {
}
if (@chmod($fullpath, intval($mode, 8))) {
$this->__messages[] = __d('cake_developer', '%s changed to %s', $fullpath, $mode);
$this->__messages[] = __d('cake_dev', '%s changed to %s', $fullpath, $mode);
} else {
$this->__errors[] = __d('cake_deverloper', '%s NOT changed to %s', $fullpath, $mode);
}
@ -453,7 +453,7 @@ class Folder {
}
if (is_file($pathname)) {
$this->__errors[] = __d('cake_developer', '%s is a file', $pathname);
$this->__errors[] = __d('cake_dev', '%s is a file', $pathname);
return false;
}
$pathname = rtrim($pathname, DS);
@ -464,11 +464,11 @@ class Folder {
$old = umask(0);
if (mkdir($pathname, $mode)) {
umask($old);
$this->__messages[] = __d('cake_developer', '%s created', $pathname);
$this->__messages[] = __d('cake_dev', '%s created', $pathname);
return true;
} else {
umask($old);
$this->__errors[] = __d('cake_developer', '%s NOT created', $pathname);
$this->__errors[] = __d('cake_dev', '%s NOT created', $pathname);
return false;
}
}
@ -541,9 +541,9 @@ class Folder {
}
if (is_file($file) === true) {
if (@unlink($file)) {
$this->__messages[] = __d('cake_developer', '%s removed', $file);
$this->__messages[] = __d('cake_dev', '%s removed', $file);
} else {
$this->__errors[] = __d('cake_developer', '%s NOT removed', $file);
$this->__errors[] = __d('cake_dev', '%s NOT removed', $file);
}
} elseif (is_dir($file) === true && $this->delete($file) === false) {
return false;
@ -552,10 +552,10 @@ class Folder {
}
$path = substr($path, 0, strlen($path) - 1);
if (rmdir($path) === false) {
$this->__errors[] = __d('cake_developer', '%s NOT removed', $path);
$this->__errors[] = __d('cake_dev', '%s NOT removed', $path);
return false;
} else {
$this->__messages[] = __d('cake_developer', '%s removed', $path);
$this->__messages[] = __d('cake_dev', '%s removed', $path);
}
}
return true;
@ -590,7 +590,7 @@ class Folder {
$mode = $options['mode'];
if (!$this->cd($fromDir)) {
$this->__errors[] = __d('cake_developer', '%s not found', $fromDir);
$this->__errors[] = __d('cake_dev', '%s not found', $fromDir);
return false;
}
@ -599,7 +599,7 @@ class Folder {
}
if (!is_writable($toDir)) {
$this->__errors[] = __d('cake_developer', '%s not writable', $toDir);
$this->__errors[] = __d('cake_dev', '%s not writable', $toDir);
return false;
}
@ -613,9 +613,9 @@ class Folder {
if (copy($from, $to)) {
chmod($to, intval($mode, 8));
touch($to, filemtime($from));
$this->__messages[] = __d('cake_developer', '%s copied to %s', $from, $to);
$this->__messages[] = __d('cake_dev', '%s copied to %s', $from, $to);
} else {
$this->__errors[] = __d('cake_developer', '%s NOT copied to %s', $from, $to);
$this->__errors[] = __d('cake_dev', '%s NOT copied to %s', $from, $to);
}
}
@ -626,11 +626,11 @@ class Folder {
$old = umask(0);
chmod($to, $mode);
umask($old);
$this->__messages[] = __d('cake_developer', '%s created', $to);
$this->__messages[] = __d('cake_dev', '%s created', $to);
$options = array_merge($options, array('to'=> $to, 'from'=> $from));
$this->copy($options);
} else {
$this->__errors[] = __d('cake_developer', '%s not created', $to);
$this->__errors[] = __d('cake_dev', '%s not created', $to);
}
}
}

2
lib/Cake/Utility/ObjectCollection.php
View file

@ -105,7 +105,7 @@ abstract class ObjectCollection {
$list = array_keys($this->_loaded);
}
if ($options['modParams'] !== false && !isset($params[$options['modParams']])) {
throw new CakeException(__d('cake_error', 'Cannot use modParams with indexes that do not exist.'));
throw new CakeException(__d('cake_dev', 'Cannot use modParams with indexes that do not exist.'));
}
foreach ($list as $name) {
$result = call_user_func_array(array($this->_loaded[$name], $callback), $params);

2
lib/Cake/Utility/Security.php
View file

@ -136,7 +136,7 @@ class Security {
*/
public static function cipher($text, $key) {
if (empty($key)) {
trigger_error(__d('cake_error', 'You cannot use an empty key for Security::cipher()'), E_USER_WARNING);
trigger_error(__d('cake_dev', 'You cannot use an empty key for Security::cipher()'), E_USER_WARNING);
return '';
}

8
lib/Cake/Utility/Validation.php
View file

@ -246,7 +246,7 @@ class Validation {
}
break;
default:
self::$errors[] = __d('cake_developer', 'You must define the $operator parameter for Validation::comparison()');
self::$errors[] = __d('cake_dev', 'You must define the $operator parameter for Validation::comparison()');
break;
}
return false;
@ -265,7 +265,7 @@ class Validation {
extract(self::_defaults($check));
}
if ($regex === null) {
self::$errors[] = __d('cake_developer', 'You must define a regular expression for Validation::custom()');
self::$errors[] = __d('cake_dev', 'You must define a regular expression for Validation::custom()');
return false;
}
return self::_check($check, $regex);
@ -724,11 +724,11 @@ class Validation {
protected static function _pass($method, $check, $classPrefix) {
$className = ucwords($classPrefix) . 'Validation';
if (!class_exists($className)) {
trigger_error(__d('cake_error', 'Could not find %s class, unable to complete validation.', $className), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Could not find %s class, unable to complete validation.', $className), E_USER_WARNING);
return false;
}
if (!method_exists($className, $method)) {
trigger_error(__d('cake_error', 'Method %s does not exist on %s unable to complete validation.', $method, $className), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Method %s does not exist on %s unable to complete validation.', $method, $className), E_USER_WARNING);
return false;
}
$check = (array)$check;

14
lib/Cake/Utility/Xml.php
View file

@ -100,9 +100,9 @@ class Xml {
$dom->load($input);
return $dom;
} elseif (!is_string($input)) {
throw new XmlException(__d('cake_error', 'Invalid input.'));
throw new XmlException(__d('cake_dev', 'Invalid input.'));
}
throw new XmlException(__d('cake_error', 'XML cannot be read.'));
throw new XmlException(__d('cake_dev', 'XML cannot be read.'));
}
/**
@ -144,11 +144,11 @@ class Xml {
*/
public static function fromArray($input, $options = array()) {
if (!is_array($input) || count($input) !== 1) {
throw new XmlException(__d('cake_error', 'Invalid input.'));
throw new XmlException(__d('cake_dev', 'Invalid input.'));
}
$key = key($input);
if (is_integer($key)) {
throw new XmlException(__d('cake_error', 'The key of input must be alphanumeric'));
throw new XmlException(__d('cake_dev', 'The key of input must be alphanumeric'));
}
if (!is_array($options)) {
@ -212,7 +212,7 @@ class Xml {
}
} else {
if ($key[0] === '@') {
throw new XmlException(__d('cake_error', 'Invalid array'));
throw new XmlException(__d('cake_dev', 'Invalid array'));
}
if (array_keys($value) === range(0, count($value) - 1)) { // List
foreach ($value as $item) {
@ -225,7 +225,7 @@ class Xml {
}
}
} else {
throw new XmlException(__d('cake_error', 'Invalid array'));
throw new XmlException(__d('cake_dev', 'Invalid array'));
}
}
}
@ -277,7 +277,7 @@ class Xml {
$obj = simplexml_import_dom($obj);
}
if (!($obj instanceof SimpleXMLElement)) {
throw new XmlException(__d('cake_error', 'The input is not instance of SimpleXMLElement, DOMDocument or DOMNode.'));
throw new XmlException(__d('cake_dev', 'The input is not instance of SimpleXMLElement, DOMDocument or DOMNode.'));
}
$result = array();
$namespaces = array_merge(array('' => ''), $obj->getNamespaces(true));

2
lib/Cake/View/Helper.php
View file

@ -124,7 +124,7 @@ class Helper extends Object {
* @param array $params Array of params for the method.
*/
public function __call($method, $params) {
trigger_error(__d('cake_error', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
trigger_error(__d('cake_dev', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
}
/**

2
lib/Cake/View/Helper/FormHelper.php
View file

@ -1151,7 +1151,7 @@ class FormHelper extends AppHelper {
public function __call($method, $params) {
$options = array();
if (empty($params)) {
throw new CakeException(__d('cake_error', 'Missing field name for FormHelper::%s', $method));
throw new CakeException(__d('cake_dev', 'Missing field name for FormHelper::%s', $method));
}
if (isset($params[1])) {
$options = $params[1];

4
lib/Cake/View/Helper/HtmlHelper.php
View file

@ -940,13 +940,13 @@ class HtmlHelper extends AppHelper {
$reader = $configFile[1];
}
} else {
throw new ConfigureException(__d('cake_error', 'Cannot load the configuration file. Wrong "configFile" configuration.'));
throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Wrong "configFile" configuration.'));
}
$readerClass = Inflector::camelize($reader) . 'Reader';
App::uses($readerClass, 'Configure');
if (!class_exists($readerClass)) {
throw new ConfigureException(__d('cake_error', 'Cannot load the configuration file. Unknown reader.'));
throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Unknown reader.'));
}
$readerObj = new $readerClass($path);

2
lib/Cake/View/Helper/JsHelper.php
View file

@ -153,7 +153,7 @@ class JsHelper extends AppHelper {
if (method_exists($this, $method . '_')) {
return call_user_func(array(&$this, $method . '_'), $params);
}
trigger_error(__d('cake_error', 'JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING);
trigger_error(__d('cake_dev', 'JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING);
}
/**

2
lib/Cake/View/Helper/MootoolsEngineHelper.php
View file

@ -307,7 +307,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
function drop($options = array()) {
if (empty($options['drag'])) {
trigger_error(
__d('cake_error', 'MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING
__d('cake_dev', 'MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING
);
return false;
}

2
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -102,7 +102,7 @@ class PaginatorHelper extends AppHelper {
$classname = $ajaxProvider . 'Helper';
if (!method_exists($classname, 'link')) {
throw new CakeException(sprintf(
__d('cake_error', '%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname
__d('cake_dev', '%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname
));
}
parent::__construct($View, $settings);

4
lib/Cake/View/View.php
View file

@ -396,7 +396,7 @@ class View extends Object {
$layout = $this->layout;
}
if ($this->output === false) {
throw new CakeException(__d('cake_error', "Error in view %s, got no content.", $viewFileName));
throw new CakeException(__d('cake_dev', "Error in view %s, got no content.", $viewFileName));
}
if ($layout && $this->autoLayout) {
$this->output = $this->renderLayout($this->output, $layout);
@ -439,7 +439,7 @@ class View extends Object {
$this->output = $this->_render($layoutFileName);
if ($this->output === false) {
throw new CakeException(__d('cake_error', "Error in layout %s, got no content.", $layoutFileName));
throw new CakeException(__d('cake_dev', "Error in layout %s, got no content.", $layoutFileName));
}
$this->Helpers->trigger('afterLayout', array($layoutFileName));

14
lib/Cake/View/errors/missing_action.ctp
View file

@ -16,13 +16,13 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Method in %s', $controller); ?></h2> <p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The action %1$s is not defined in controller %2$s', '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
<h2><?php echo __d('cake_dev', 'Missing Method in %s', $controller); ?></h2> <p class="error">
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The action %1$s is not defined in controller %2$s', '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create %1$s%2$s in file: %3$s.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create %1$s%2$s in file: %3$s.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
</p>
<pre>
&lt;?php
@ -37,7 +37,7 @@ class <?php echo $controller;?> extends AppController {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_behavior_class.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Behavior Class'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Behavior Class'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The behavior class <em>%s</em> can not be found or does not exist.', $class); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The behavior class <em>%s</em> can not be found or does not exist.', $class); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends ModelBehavior {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_behavior_file.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Behavior File'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Behavior File'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The Behavior file %s can not be found or does not exist.', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The Behavior file %s can not be found or does not exist.', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends ModelBehavior {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_component_class.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Component Class'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Component Class'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Component class %1$s was not found.', '<em>' . $class . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Component class %1$s was not found.', '<em>' . $class . '</em>'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends Component {<br />
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_component_file.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Component File'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Component File'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The component file was not found.'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The component file was not found.'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends Component {<br />
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_connection.ctp
View file

@ -16,18 +16,18 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Database Connection'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Database Connection'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', '%s requires a database connection', $class); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', '%s requires a database connection', $class); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Confirm you have created the file : %s.', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Confirm you have created the file : %s.', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s.', APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s.', APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_controller.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Controller'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Controller'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', '%s could not be found.', '<em>' . $controller . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', '%s could not be found.', '<em>' . $controller . '</em>'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class %s below in file: %s', '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class %s below in file: %s', '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $controller;?> extends AppController {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_database.ctp
View file

@ -16,18 +16,18 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Database Connection'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Database Connection'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Scaffold requires a database connection'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Scaffold requires a database connection'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Confirm you have created the file: %s', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

10
lib/Cake/View/errors/missing_datasource_config.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Datasource Configuration'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Datasource Configuration'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The datasource configuration %1$s was not found in databases.php.', '<em>' . $config . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The datasource configuration %1$s was not found in databases.php.', '<em>' . $config . '</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_config.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_config.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

10
lib/Cake/View/errors/missing_datasource_file.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Datasource Class'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Datasource Class'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Datasource class %1$s was not found.', '<em>' . $class . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Datasource class %1$s was not found.', '<em>' . $class . '</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_file.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_file.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_helper_class.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Helper Class'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Helper Class'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The helper class <em>%s</em> can not be found or does not exist.', $class); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The helper class <em>%s</em> can not be found or does not exist.', $class); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends AppHelper {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_helper_file.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Helper File'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Helper File'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The helper file %s can not be found or does not exist.', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The helper file %s can not be found or does not exist.', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<pre>
&lt;?php
@ -33,8 +33,8 @@ class <?php echo $class;?> extends AppHelper {
?&gt;
</pre>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_layout.ctp
View file

@ -16,18 +16,18 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Layout'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Layout'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The layout file %s can not be found or does not exist.', '<em>' . $file . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The layout file %s can not be found or does not exist.', '<em>' . $file . '</em>'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Confirm you have created the file: %s', '<em>' . $file . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', '<em>' . $file . '</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

10
lib/Cake/View/errors/missing_table.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing Database Table'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing Database Table'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Database table %1$s for model %2$s was not found.', '<em>' . $table . '</em>', '<em>' . $class . '</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Database table %1$s for model %2$s was not found.', '<em>' . $table . '</em>', '<em>' . $class . '</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

14
lib/Cake/View/errors/missing_view.ctp
View file

@ -16,18 +16,18 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Missing View'); ?></h2>
<h2><?php echo __d('cake_dev', 'Missing View'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'The view for %1$s%2$s was not found.', '<em>' . Inflector::camelize($this->request->controller) . 'Controller::</em>', '<em>' . $this->request->action . '()</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'The view for %1$s%2$s was not found.', '<em>' . Inflector::camelize($this->request->controller) . 'Controller::</em>', '<em>' . $this->request->action . '()</em>'); ?>
</p>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Confirm you have created the file: %s', $file); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Confirm you have created the file: %s', $file); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

10
lib/Cake/View/errors/private_action.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Private Method in %s', $controller); ?></h2>
<h2><?php echo __d('cake_dev', 'Private Method in %s', $controller); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', '%s%s cannot be accessed directly.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', '%s%s cannot be accessed directly.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
</p>
<?php echo $this->element('exception_stack_trace'); ?>

10
lib/Cake/View/errors/scaffold_error.ctp
View file

@ -16,14 +16,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
<h2><?php echo __d('cake_developer', 'Scaffold Error'); ?></h2>
<h2><?php echo __d('cake_dev', 'Scaffold Error'); ?></h2>
<p class="error">
<strong><?php echo __d('cake_developer', 'Error'); ?>: </strong>
<?php echo __d('cake_developer', 'Method _scaffoldError in was not found in the controller'); ?>
<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
<?php echo __d('cake_dev', 'Method _scaffoldError in was not found in the controller'); ?>
</p>
<p class="notice">
<strong><?php echo __d('cake_developer', 'Notice'); ?>: </strong>
<?php echo __d('cake_developer', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
<?php echo __d('cake_dev', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
</p>
<pre>
&lt;?php

2
lib/Cake/View/layouts/default.ctp
View file

@ -16,7 +16,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
$cakeDescription = __d('cake_developer', 'CakePHP: the rapid development php framework');
$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

88
lib/Cake/View/pages/home.ctp
View file

@ -20,8 +20,8 @@ if (Configure::read('debug') == 0):
endif;
App::uses('Debugger', 'Utility');
?>
<h2><?php echo __d('cake_developer', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake_developer', 'Read the changelog'); ?> </a>
<h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake_dev', 'Read the changelog'); ?> </a>
<?php
if (Configure::read('debug') > 0):
Debugger::checkSecurityKeys();
@ -31,11 +31,11 @@ endif;
<?php
if (is_writable(TMP)):
echo '<span class="notice success">';
echo __d('cake_developer', 'Your tmp directory is writable.');
echo __d('cake_dev', 'Your tmp directory is writable.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your tmp directory is NOT writable.');
echo __d('cake_dev', 'Your tmp directory is NOT writable.');
echo '</span>';
endif;
?>
@ -45,11 +45,11 @@ endif;
$settings = Cache::settings();
if (!empty($settings)):
echo '<span class="notice success">';
echo __d('cake_developer', 'The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
echo __d('cake_dev', 'The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
echo '</span>';
endif;
?>
@ -59,14 +59,14 @@ endif;
$filePresent = null;
if (file_exists(CONFIGS.'database.php')):
echo '<span class="notice success">';
echo __d('cake_developer', 'Your database configuration file is present.');
echo __d('cake_dev', 'Your database configuration file is present.');
$filePresent = true;
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your database configuration file is NOT present.');
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
echo __d('cake_developer', 'Rename config/database.php.default to config/database.php');
echo __d('cake_dev', 'Rename config/database.php.default to config/database.php');
echo '</span>';
endif;
?>
@ -84,11 +84,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
echo __d('cake_developer', 'Cake is able to connect to the database.');
echo __d('cake_dev', 'Cake is able to connect to the database.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Cake is NOT able to connect to the database.');
echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
echo '</span>';
endif;
?>
@ -104,20 +104,20 @@ if (isset($filePresent)):
echo '</span></p>';
}
?>
<h3><?php echo __d('cake_developer', 'Editing this Page'); ?></h3>
<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>
<p>
<?php
echo __d('cake_developer', 'To change the content of this page, create: APP/views/pages/home.ctp.<br />
echo __d('cake_dev', 'To change the content of this page, create: APP/views/pages/home.ctp.<br />
To change its layout, create: APP/views/layouts/default.ctp.<br />
You can also add some CSS styles for your pages at: APP/webroot/css.');
?>
</p>
<h3><?php echo __d('cake_developer', 'Getting Started'); ?></h3>
<h3><?php echo __d('cake_dev', 'Getting Started'); ?></h3>
<p>
<?php
echo $this->Html->link(
sprintf('<strong>%s</strong> %s', __d('cake_developer', 'New'), __d('cake_developer', 'CakePHP 1.3 Docs')),
sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 1.3 Docs')),
'http://book.cakephp.org/view/875/x1-3-Collection',
array('target' => '_blank', 'escape' => false)
);
@ -126,46 +126,46 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
<p>
<?php
echo $this->Html->link(
__d('cake_developer', 'The 15 min Blog Tutorial'),
__d('cake_dev', 'The 15 min Blog Tutorial'),
'http://book.cakephp.org/view/1528/Blog',
array('target' => '_blank', 'escape' => false)
);
?>
</p>
<h3><?php echo __d('cake_developer', 'More about Cake'); ?></h3>
<h3><?php echo __d('cake_dev', 'More about Cake'); ?></h3>
<p>
<?php echo __d('cake_developer', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
<?php echo __d('cake_dev', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
</p>
<p>
<?php echo __d('cake_developer', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
<?php echo __d('cake_dev', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
</p>
<ul>
<li><a href="http://cakefoundation.org/"><?php echo __d('cake_developer', 'Cake Software Foundation'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Promoting development related to CakePHP'); ?></li></ul></li>
<li><a href="http://www.cakephp.org"><?php echo __d('cake_developer', 'CakePHP'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'The Rapid Development Framework'); ?></li></ul></li>
<li><a href="http://book.cakephp.org"><?php echo __d('cake_developer', 'CakePHP Documentation'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Your Rapid Development Cookbook'); ?></li></ul></li>
<li><a href="http://api.cakephp.org"><?php echo __d('cake_developer', 'CakePHP API'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Quick Reference'); ?></li></ul></li>
<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_developer', 'The Bakery'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Everything CakePHP'); ?></li></ul></li>
<li><a href="http://live.cakephp.org"><?php echo __d('cake_developer', 'The Show'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake_developer', 'CakePHP Google Group'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Community mailing list'); ?></li></ul></li>
<li><a href="http://cakefoundation.org/"><?php echo __d('cake_dev', 'Cake Software Foundation'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Promoting development related to CakePHP'); ?></li></ul></li>
<li><a href="http://www.cakephp.org"><?php echo __d('cake_dev', 'CakePHP'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
<li><a href="http://api.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Quick Reference'); ?></li></ul></li>
<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>
<li><a href="http://live.cakephp.org"><?php echo __d('cake_dev', 'The Show'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake_dev', 'CakePHP Google Group'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Community mailing list'); ?></li></ul></li>
<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
<ul><li><?php echo __d('cake_developer', 'Live chat about CakePHP'); ?></li></ul></li>
<li><a href="http://github.com/cakephp/"><?php echo __d('cake_developer', 'CakePHP Code'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __d('cake_developer', 'CakePHP Lighthouse'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
<li><a href="http://www.cakeforge.org"><?php echo __d('cake_developer', 'CakeForge'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Open Development for CakePHP'); ?></li></ul></li>
<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake_developer', 'Book Store'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Recommended Software Books'); ?></li></ul></li>
<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake_developer', 'CakePHP gear'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
<ul><li><?php echo __d('cake_dev', 'Live chat about CakePHP'); ?></li></ul></li>
<li><a href="http://github.com/cakephp/"><?php echo __d('cake_dev', 'CakePHP Code'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __d('cake_dev', 'CakePHP Lighthouse'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
<li><a href="http://www.cakeforge.org"><?php echo __d('cake_dev', 'CakeForge'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Open Development for CakePHP'); ?></li></ul></li>
<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake_dev', 'Book Store'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Recommended Software Books'); ?></li></ul></li>
<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake_dev', 'CakePHP gear'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
</ul>

2
lib/Cake/tests/cases/libs/cake_socket.test.php
View file

@ -174,7 +174,7 @@ class CakeSocketTest extends CakeTestCase {
$this->Socket = new CakeSocket($config);
$this->assertTrue($this->Socket->connect());
$this->assertFalse($this->Socket->read(1024 * 1024));
$this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_error', 'Connection timed out'));
$this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_dev', 'Connection timed out'));
$config = array('host' => 'cakephp.org', 'port' => 80, 'timeout' => 20);
$this->Socket = new CakeSocket($config);

2
lib/Cake/tests/cases/libs/file.test.php
View file

@ -482,7 +482,7 @@ class FileTest extends CakeTestCase {
$assertLine = $assertLine->traceMethod();
$shortPath = substr($tmpFile, strlen(ROOT));
$message = __d('cake_developer', '[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine;
$message = __d('cake_dev', '[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine;
$this->_reporter->paintSkip($message);
}
return false;

2
lib/Cake/tests/test_app/views/layouts/default.ctp
View file

@ -17,7 +17,7 @@
*/
$this->loadHelper('Html');
$cakeDescription = __d('cake_developer', 'CakePHP: the rapid development php framework');
$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

88
lib/Cake/tests/test_app/views/pages/home.ctp
View file

@ -20,8 +20,8 @@ if (Configure::read('debug') == 0):
endif;
App::uses('Debugger', 'Utility');
?>
<h2><?php echo __d('cake_developer', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake_developer', 'Read the changelog'); ?> </a>
<h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake_dev', 'Read the changelog'); ?> </a>
<?php
if (Configure::read('debug') > 0):
Debugger::checkSecurityKeys();
@ -31,11 +31,11 @@ endif;
<?php
if (is_writable(TMP)):
echo '<span class="notice success">';
echo __d('cake_developer', 'Your tmp directory is writable.');
echo __d('cake_dev', 'Your tmp directory is writable.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your tmp directory is NOT writable.');
echo __d('cake_dev', 'Your tmp directory is NOT writable.');
echo '</span>';
endif;
?>
@ -45,11 +45,11 @@ endif;
$settings = Cache::settings();
if (!empty($settings)):
echo '<span class="notice success">';
echo __d('cake_developer', 'The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
echo __d('cake_dev', 'The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
echo '</span>';
endif;
?>
@ -59,14 +59,14 @@ endif;
$filePresent = null;
if (file_exists(CONFIGS.'database.php')):
echo '<span class="notice success">';
echo __d('cake_developer', 'Your database configuration file is present.');
echo __d('cake_dev', 'Your database configuration file is present.');
$filePresent = true;
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Your database configuration file is NOT present.');
echo __d('cake_dev', 'Your database configuration file is NOT present.');
echo '<br/>';
echo __d('cake_developer', 'Rename config/database.php.default to config/database.php');
echo __d('cake_dev', 'Rename config/database.php.default to config/database.php');
echo '</span>';
endif;
?>
@ -84,11 +84,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
echo __d('cake_developer', 'Cake is able to connect to the database.');
echo __d('cake_dev', 'Cake is able to connect to the database.');
echo '</span>';
else:
echo '<span class="notice">';
echo __d('cake_developer', 'Cake is NOT able to connect to the database.');
echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
echo '</span>';
endif;
?>
@ -104,20 +104,20 @@ if (isset($filePresent)):
echo '</span></p>';
}
?>
<h3><?php echo __d('cake_developer', 'Editing this Page'); ?></h3>
<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>
<p>
<?php
echo __d('cake_developer', 'To change the content of this page, create: APP/views/pages/home.ctp.<br />
echo __d('cake_dev', 'To change the content of this page, create: APP/views/pages/home.ctp.<br />
To change its layout, create: APP/views/layouts/default.ctp.<br />
You can also add some CSS styles for your pages at: APP/webroot/css.');
?>
</p>
<h3><?php echo __d('cake_developer', 'Getting Started'); ?></h3>
<h3><?php echo __d('cake_dev', 'Getting Started'); ?></h3>
<p>
<?php
echo $this->Html->link(
sprintf('<strong>%s</strong> %s', __d('cake_developer', 'New'), __d('cake_developer', 'CakePHP 1.3 Docs')),
sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 1.3 Docs')),
'http://book.cakephp.org/view/875/x1-3-Collection',
array('target' => '_blank', 'escape' => false)
);
@ -126,46 +126,46 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
<p>
<?php
echo $this->Html->link(
__d('cake_developer', 'The 15 min Blog Tutorial'),
__d('cake_dev', 'The 15 min Blog Tutorial'),
'http://book.cakephp.org/view/1528/Blog',
array('target' => '_blank', 'escape' => false)
);
?>
</p>
<h3><?php echo __d('cake_developer', 'More about Cake'); ?></h3>
<h3><?php echo __d('cake_dev', 'More about Cake'); ?></h3>
<p>
<?php echo __d('cake_developer', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
<?php echo __d('cake_dev', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
</p>
<p>
<?php echo __d('cake_developer', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
<?php echo __d('cake_dev', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
</p>
<ul>
<li><a href="http://cakefoundation.org/"><?php echo __d('cake_developer', 'Cake Software Foundation'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Promoting development related to CakePHP'); ?></li></ul></li>
<li><a href="http://www.cakephp.org"><?php echo __d('cake_developer', 'CakePHP'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'The Rapid Development Framework'); ?></li></ul></li>
<li><a href="http://book.cakephp.org"><?php echo __d('cake_developer', 'CakePHP Documentation'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Your Rapid Development Cookbook'); ?></li></ul></li>
<li><a href="http://api.cakephp.org"><?php echo __d('cake_developer', 'CakePHP API'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Quick Reference'); ?></li></ul></li>
<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_developer', 'The Bakery'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Everything CakePHP'); ?></li></ul></li>
<li><a href="http://live.cakephp.org"><?php echo __d('cake_developer', 'The Show'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake_developer', 'CakePHP Google Group'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Community mailing list'); ?></li></ul></li>
<li><a href="http://cakefoundation.org/"><?php echo __d('cake_dev', 'Cake Software Foundation'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Promoting development related to CakePHP'); ?></li></ul></li>
<li><a href="http://www.cakephp.org"><?php echo __d('cake_dev', 'CakePHP'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
<li><a href="http://api.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Quick Reference'); ?></li></ul></li>
<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>
<li><a href="http://live.cakephp.org"><?php echo __d('cake_dev', 'The Show'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake_dev', 'CakePHP Google Group'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Community mailing list'); ?></li></ul></li>
<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
<ul><li><?php echo __d('cake_developer', 'Live chat about CakePHP'); ?></li></ul></li>
<li><a href="http://github.com/cakephp/"><?php echo __d('cake_developer', 'CakePHP Code'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __d('cake_developer', 'CakePHP Lighthouse'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
<li><a href="http://www.cakeforge.org"><?php echo __d('cake_developer', 'CakeForge'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Open Development for CakePHP'); ?></li></ul></li>
<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake_developer', 'Book Store'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Recommended Software Books'); ?></li></ul></li>
<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake_developer', 'CakePHP gear'); ?> </a>
<ul><li><?php echo __d('cake_developer', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
<ul><li><?php echo __d('cake_dev', 'Live chat about CakePHP'); ?></li></ul></li>
<li><a href="http://github.com/cakephp/"><?php echo __d('cake_dev', 'CakePHP Code'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __d('cake_dev', 'CakePHP Lighthouse'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
<li><a href="http://www.cakeforge.org"><?php echo __d('cake_dev', 'CakeForge'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Open Development for CakePHP'); ?></li></ul></li>
<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake_dev', 'Book Store'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Recommended Software Books'); ?></li></ul></li>
<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake_dev', 'CakePHP gear'); ?> </a>
<ul><li><?php echo __d('cake_dev', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
</ul>