From c98021dcd8af94dff90ed6d4b43b3d29b367484d Mon Sep 17 00:00:00 2001 From: predominant Date: Fri, 16 Apr 2010 02:20:15 +1000 Subject: [PATCH] Converted views, router and security classes to new translation shotcut function use. --- cake/libs/overloadable.php | 2 +- cake/libs/router.php | 2 +- cake/libs/security.php | 2 +- cake/libs/validation.php | 8 +- cake/libs/view/errors/error404.ctp | 4 +- cake/libs/view/errors/error500.ctp | 4 +- cake/libs/view/errors/missing_action.ctp | 14 +-- .../view/errors/missing_behavior_class.ctp | 12 +-- .../view/errors/missing_behavior_file.ctp | 14 +-- .../view/errors/missing_component_class.ctp | 14 +-- .../view/errors/missing_component_file.ctp | 14 +-- cake/libs/view/errors/missing_connection.ctp | 14 +-- cake/libs/view/errors/missing_controller.ctp | 14 +-- .../libs/view/errors/missing_helper_class.ctp | 14 +-- cake/libs/view/errors/missing_helper_file.ctp | 14 +-- cake/libs/view/errors/missing_layout.ctp | 14 +-- cake/libs/view/errors/missing_model.ctp | 14 +-- cake/libs/view/errors/missing_scaffolddb.ctp | 14 +-- cake/libs/view/errors/missing_table.ctp | 10 +-- cake/libs/view/errors/missing_view.ctp | 14 +-- cake/libs/view/errors/private_action.ctp | 10 +-- cake/libs/view/errors/scaffold_error.ctp | 10 +-- cake/libs/view/helper.php | 2 +- cake/libs/view/helpers/form.php | 40 ++++----- cake/libs/view/helpers/js.php | 24 ++--- cake/libs/view/helpers/mootools_engine.php | 2 +- cake/libs/view/helpers/number.php | 10 +-- cake/libs/view/helpers/paginator.php | 6 +- cake/libs/view/helpers/session.php | 2 +- cake/libs/view/helpers/time.php | 58 ++++++------ cake/libs/view/layouts/default.ctp | 4 +- cake/libs/view/pages/home.ctp | 88 +++++++++---------- cake/libs/view/scaffolds/edit.ctp | 12 +-- cake/libs/view/scaffolds/index.ctp | 22 ++--- cake/libs/view/scaffolds/view.ctp | 16 ++-- cake/libs/view/view.php | 4 +- cake/libs/xml.php | 4 +- 37 files changed, 263 insertions(+), 263 deletions(-) diff --git a/cake/libs/overloadable.php b/cake/libs/overloadable.php index f70a8373a..6e7974d12 100644 --- a/cake/libs/overloadable.php +++ b/cake/libs/overloadable.php @@ -44,7 +44,7 @@ class Overloadable extends Object { */ function __call($method, $params) { if (!method_exists($this, 'call__')) { - trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR); + trigger_error(sprintf(__('Magic method handler call__ not defined in %s'), get_class($this)), E_USER_ERROR); } return $this->call__($method, $params); } diff --git a/cake/libs/router.php b/cake/libs/router.php index 43cb70299..226a55704 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -278,7 +278,7 @@ class Router { //TODO 2.0 refactor this to use a string class name, throw exception, and then construct. $Route =& new $routeClass($route, $defaults, $options); if ($routeClass !== 'CakeRoute' && !is_subclass_of($Route, 'CakeRoute')) { - trigger_error(__('Route classes must extend CakeRoute', true), E_USER_WARNING); + trigger_error(__('Route classes must extend CakeRoute'), E_USER_WARNING); return false; } $self->routes[] =& $Route; diff --git a/cake/libs/security.php b/cake/libs/security.php index 8e9b905c2..2bbc559b8 100644 --- a/cake/libs/security.php +++ b/cake/libs/security.php @@ -170,7 +170,7 @@ class Security extends Object { */ public static function cipher($text, $key) { if (empty($key)) { - trigger_error(__('You cannot use an empty key for Security::cipher()', true), E_USER_WARNING); + trigger_error(__('You cannot use an empty key for Security::cipher()'), E_USER_WARNING); return ''; } diff --git a/cake/libs/validation.php b/cake/libs/validation.php index f758f7ef1..326c49698 100644 --- a/cake/libs/validation.php +++ b/cake/libs/validation.php @@ -334,7 +334,7 @@ class Validation extends Object { break; default: $_this =& Validation::getInstance(); - $_this->errors[] = __('You must define the $operator parameter for Validation::comparison()', true); + $_this->errors[] = __('You must define the $operator parameter for Validation::comparison()'); break; } return false; @@ -357,7 +357,7 @@ class Validation extends Object { $_this->_extract($check); } if ($_this->regex === null) { - $_this->errors[] = __('You must define a regular expression for Validation::custom()', true); + $_this->errors[] = __('You must define a regular expression for Validation::custom()'); return false; } return $_this->_check(); @@ -894,11 +894,11 @@ class Validation extends Object { protected function _pass($method, $check, $classPrefix) { $className = ucwords($classPrefix) . 'Validation'; if (!class_exists($className)) { - trigger_error(sprintf(__('Could not find %s class, unable to complete validation.', true), $className), E_USER_WARNING); + trigger_error(sprintf(__('Could not find %s class, unable to complete validation.'), $className), E_USER_WARNING); return false; } if (!is_callable(array($className, $method))) { - trigger_error(sprintf(__('Method %s does not exist on %s unable to complete validation.', true), $method, $className), E_USER_WARNING); + trigger_error(sprintf(__('Method %s does not exist on %s unable to complete validation.'), $method, $className), E_USER_WARNING); return false; } $check = (array)$check; diff --git a/cake/libs/view/errors/error404.ctp b/cake/libs/view/errors/error404.ctp index 59f16626a..0f6b761c8 100644 --- a/cake/libs/view/errors/error404.ctp +++ b/cake/libs/view/errors/error404.ctp @@ -19,6 +19,6 @@ ?>

- : - '{$message}'"); ?> + : + '{$message}'"); ?>

\ No newline at end of file diff --git a/cake/libs/view/errors/error500.ctp b/cake/libs/view/errors/error500.ctp index 64e1bcc36..fbd5a64bd 100644 --- a/cake/libs/view/errors/error500.ctp +++ b/cake/libs/view/errors/error500.ctp @@ -19,6 +19,6 @@ ?>

- : - '{$message}'"); ?> + : + '{$message}'"); ?>

diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp index 0e3ce9724..1a5872388 100644 --- a/cake/libs/view/errors/missing_action.ctp +++ b/cake/libs/view/errors/missing_action.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $action . '', '' . $controller . ''); ?> + : + ' . $action . '', '' . $controller . ''); ?>

- : - ' . $controller . '::', '' . $action . '()', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> + : + ' . $controller . '::', '' . $action . '()', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> 

 <?php
@@ -41,6 +41,6 @@ class  extends AppController {
 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_behavior_class.ctp b/cake/libs/view/errors/missing_behavior_class.ctp index 954ecaf9e..1897b82cc 100644 --- a/cake/libs/view/errors/missing_behavior_class.ctp +++ b/cake/libs/view/errors/missing_behavior_class.ctp @@ -19,12 +19,12 @@ ?>

- : - %s can not be found or does not exist.', true), $behaviorClass); ?> + : + %s can not be found or does not exist.'), $behaviorClass); ?>

- : - + : + 

 <?php
@@ -34,6 +34,6 @@ class  extends ModelBehavior {
 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_behavior_file.ctp b/cake/libs/view/errors/missing_behavior_file.ctp index 2e468df60..654537404 100644 --- a/cake/libs/view/errors/missing_behavior_file.ctp +++ b/cake/libs/view/errors/missing_behavior_file.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
@@ -34,6 +34,6 @@ class  extends ModelBehavior {
 ?>

- : - + : +

diff --git a/cake/libs/view/errors/missing_component_class.ctp b/cake/libs/view/errors/missing_component_class.ctp index d591e118f..e63440c00 100644 --- a/cake/libs/view/errors/missing_component_class.ctp +++ b/cake/libs/view/errors/missing_component_class.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $component . 'Component', '' . $controller . 'Controller'); ?> + : + ' . $component . 'Component', '' . $controller . 'Controller'); ?>

- : - ' . $component . 'Component', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> + : + ' . $component . 'Component', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> 

 <?php
@@ -34,6 +34,6 @@ class Component extends Object {

 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_component_file.ctp b/cake/libs/view/errors/missing_component_file.ctp index 51e57413a..44c607cd8 100644 --- a/cake/libs/view/errors/missing_component_file.ctp +++ b/cake/libs/view/errors/missing_component_file.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - ' . $component . 'Component', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> + : + ' . $component . 'Component', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> 

 <?php
@@ -34,6 +34,6 @@ class Component extends Object {

 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_connection.ctp b/cake/libs/view/errors/missing_connection.ctp index d2aeb1963..51d082d31 100644 --- a/cake/libs/view/errors/missing_connection.ctp +++ b/cake/libs/view/errors/missing_connection.ctp @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : +

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_controller.ctp b/cake/libs/view/errors/missing_controller.ctp index 255835d75..0c7dd798b 100644 --- a/cake/libs/view/errors/missing_controller.ctp +++ b/cake/libs/view/errors/missing_controller.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $controller . ''); ?> + : + ' . $controller . ''); ?>

- : - ' . $controller . '', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> + : + ' . $controller . '', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> 

 <?php
@@ -35,6 +35,6 @@ class  extends AppController {
 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/cake/libs/view/errors/missing_helper_class.ctp index 35289f7ba..7c8a79079 100644 --- a/cake/libs/view/errors/missing_helper_class.ctp +++ b/cake/libs/view/errors/missing_helper_class.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - %s can not be found or does not exist.', true), $helperClass); ?> + : + %s can not be found or does not exist.'), $helperClass); ?>

- : - + : + 

 <?php
@@ -34,6 +34,6 @@ class  extends AppHelper {
 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/cake/libs/view/errors/missing_helper_file.ctp index 0f331c9a8..1da5d577b 100644 --- a/cake/libs/view/errors/missing_helper_file.ctp +++ b/cake/libs/view/errors/missing_helper_file.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
@@ -34,6 +34,6 @@ class  extends AppHelper {
 ?>

- : - + : +

diff --git a/cake/libs/view/errors/missing_layout.ctp b/cake/libs/view/errors/missing_layout.ctp index fe5bbbbf9..02cfba190 100644 --- a/cake/libs/view/errors/missing_layout.ctp +++ b/cake/libs/view/errors/missing_layout.ctp @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $file . ''); ?> + : + ' . $file . ''); ?>

- : - ' . $file . ''); ?> + : + ' . $file . ''); ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_model.ctp b/cake/libs/view/errors/missing_model.ctp index 86488bd34..c3d7baa63 100644 --- a/cake/libs/view/errors/missing_model.ctp +++ b/cake/libs/view/errors/missing_model.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - %s could not be found.', true), $model); ?> + : + %s could not be found.'), $model); ?>

- : - ' . $model . '', APP_DIR . DS . 'models' . DS . Inflector::underscore($model) . '.php'); ?> + : + ' . $model . '', APP_DIR . DS . 'models' . DS . Inflector::underscore($model) . '.php'); ?> 

 <?php
@@ -36,6 +36,6 @@ class  extends AppModel {
 ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_scaffolddb.ctp b/cake/libs/view/errors/missing_scaffolddb.ctp index 11848ec3a..05b248b28 100644 --- a/cake/libs/view/errors/missing_scaffolddb.ctp +++ b/cake/libs/view/errors/missing_scaffolddb.ctp @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : +

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_table.ctp b/cake/libs/view/errors/missing_table.ctp index cd60cee7d..3f0594e26 100644 --- a/cake/libs/view/errors/missing_table.ctp +++ b/cake/libs/view/errors/missing_table.ctp @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $table . '', '' . $model . ''); ?> + : + ' . $table . '', '' . $model . ''); ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp index e70897eba..121d97f9a 100644 --- a/cake/libs/view/errors/missing_view.ctp +++ b/cake/libs/view/errors/missing_view.ctp @@ -17,16 +17,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $controller . 'Controller::', '' . $action . '()'); ?> + : + ' . $controller . 'Controller::', '' . $action . '()'); ?>

- : - + : +

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/private_action.ctp b/cake/libs/view/errors/private_action.ctp index dbad2f0c2..ab9f13cdc 100644 --- a/cake/libs/view/errors/private_action.ctp +++ b/cake/libs/view/errors/private_action.ctp @@ -17,12 +17,12 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . $controller . '::', '' . $action . '()'); ?> + : + ' . $controller . '::', '' . $action . '()'); ?>

- : - + : +

\ No newline at end of file diff --git a/cake/libs/view/errors/scaffold_error.ctp b/cake/libs/view/errors/scaffold_error.ctp index 88b3a7a7d..7c1800b42 100644 --- a/cake/libs/view/errors/scaffold_error.ctp +++ b/cake/libs/view/errors/scaffold_error.ctp @@ -17,14 +17,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index 9cc6cff22..557c68637 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -151,7 +151,7 @@ class Helper {
  *
  */
 	public function __call($method, $params) {
-		trigger_error(sprintf(__('Method %1$s::%2$s does not exist', true), get_class($this), $method), E_USER_WARNING);
+		trigger_error(sprintf(__('Method %1$s::%2$s does not exist'), get_class($this), $method), E_USER_WARNING);
 	}
 
 /**
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 9bfb07bc0..74849fbc8 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -358,7 +358,7 @@ class FormHelper extends AppHelper {
 				$submitOptions = $options;
 
 				if (!$submit) {
-					$submit = __('Submit', true);
+					$submit = __('Submit');
 				}
 			}
 			$out .= $this->submit($submit, $submitOptions);
@@ -499,7 +499,7 @@ class FormHelper extends AppHelper {
 			if ($text != null) {
 				$error = $text;
 			} elseif (is_numeric($error)) {
-				$error = sprintf(__('Error in field %s', true), Inflector::humanize($this->field()));
+				$error = sprintf(__('Error in field %s'), Inflector::humanize($this->field()));
 			}
 			if ($options['escape']) {
 				$error = h($error);
@@ -542,7 +542,7 @@ class FormHelper extends AppHelper {
 			if (substr($text, -3) == '_id') {
 				$text = substr($text, 0, strlen($text) - 3);
 			}
-			$text = __(Inflector::humanize(Inflector::underscore($text)), true);
+			$text = __(Inflector::humanize(Inflector::underscore($text)));
 		}
 
 		if (is_string($options)) {
@@ -608,16 +608,16 @@ class FormHelper extends AppHelper {
 		}
 
 		if ($legend === true) {
-			$actionName = __('New %s', true);
+			$actionName = __('New %s');
 			$isEdit = (
 				strpos($this->action, 'update') !== false ||
 				strpos($this->action, 'edit') !== false
 			);
 			if ($isEdit) {
-				$actionName = __('Edit %s', true);
+				$actionName = __('Edit %s');
 			}
 			$modelName = Inflector::humanize(Inflector::underscore($model));
-			$legend = sprintf($actionName, __($modelName, true));
+			$legend = sprintf($actionName, __($modelName));
 		}
 
 		$out = null;
@@ -1034,7 +1034,7 @@ class FormHelper extends AppHelper {
 			$legend = $attributes['legend'];
 			unset($attributes['legend']);
 		} elseif (count($options) > 1) {
-			$legend = __(Inflector::humanize($this->field()), true);
+			$legend = __(Inflector::humanize($this->field()));
 		}
 		$label = true;
 
@@ -1284,7 +1284,7 @@ class FormHelper extends AppHelper {
  */
 	public function submit($caption = null, $options = array()) {
 		if (!$caption) {
-			$caption = __('Submit', true);
+			$caption = __('Submit');
 		}
 		$out = null;
 		$div = true;
@@ -2090,18 +2090,18 @@ class FormHelper extends AppHelper {
 			break;
 			case 'month':
 				if ($options['monthNames'] === true) {
-					$data['01'] = __('January', true);
-					$data['02'] = __('February', true);
-					$data['03'] = __('March', true);
-					$data['04'] = __('April', true);
-					$data['05'] = __('May', true);
-					$data['06'] = __('June', true);
-					$data['07'] = __('July', true);
-					$data['08'] = __('August', true);
-					$data['09'] = __('September', true);
-					$data['10'] = __('October', true);
-					$data['11'] = __('November', true);
-					$data['12'] = __('December', true);
+					$data['01'] = __('January');
+					$data['02'] = __('February');
+					$data['03'] = __('March');
+					$data['04'] = __('April');
+					$data['05'] = __('May');
+					$data['06'] = __('June');
+					$data['07'] = __('July');
+					$data['08'] = __('August');
+					$data['09'] = __('September');
+					$data['10'] = __('October');
+					$data['11'] = __('November');
+					$data['12'] = __('December');
 				} else if (is_array($options['monthNames'])) {
 					$data = $options['monthNames'];
 				} else {
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index d98532c16..2c302cb88 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -149,7 +149,7 @@ class JsHelper extends AppHelper {
 		if (method_exists($this, $method . '_')) {
 			return $this->dispatchMethod($method . '_', $params);
 		}
-		trigger_error(sprintf(__('JsHelper:: Missing Method %s is undefined', true), $method), E_USER_WARNING);
+		trigger_error(sprintf(__('JsHelper:: Missing Method %s is undefined'), $method), E_USER_WARNING);
 	}
 
 /**
@@ -751,7 +751,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return object instance of $this. Allows chained methods.
  */
 	public function get($selector) {
-		trigger_error(sprintf(__('%s does not have get() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have get() implemented'), get_class($this)), E_USER_WARNING);
 		return $this;
 	}
 
@@ -769,7 +769,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string completed event handler
  */
 	public function event($type, $callback, $options = array()) {
-		trigger_error(sprintf(__('%s does not have event() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have event() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -779,7 +779,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string completed domReady method
  */
 	public function domReady($functionBody) {
-		trigger_error(sprintf(__('%s does not have domReady() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have domReady() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -789,7 +789,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string completed iteration
  */
 	function each($callback) {
-		trigger_error(sprintf(__('%s does not have each() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have each() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -816,7 +816,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string completed string with effect.
  */
 	public function effect($name, $options) {
-		trigger_error(sprintf(__('%s does not have effect() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have effect() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -845,7 +845,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string XHR request.
  */
 	public function request($url, $options = array()) {
-		trigger_error(sprintf(__('%s does not have request() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have request() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -868,7 +868,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string Completed drag script
  */
 	public function drag($options = array()) {
-		trigger_error(sprintf(__('%s does not have drag() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have drag() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -889,7 +889,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string Completed drop script
  */
 	public function drop($options = array()) {
-		trigger_error(sprintf(__('%s does not have drop() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have drop() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -914,7 +914,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string Completed sortable script.
  */
 	public function sortable() {
-		trigger_error(sprintf(__('%s does not have sortable() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have sortable() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -938,7 +938,7 @@ class JsBaseEngineHelper extends AppHelper {
  * @return string Completed slider script
  */
 	public function slider() {
-		trigger_error(sprintf(__('%s does not have slider() implemented', true), get_class($this)), E_USER_WARNING);
+		trigger_error(sprintf(__('%s does not have slider() implemented'), get_class($this)), E_USER_WARNING);
 	}
 
 /**
@@ -957,7 +957,7 @@ class JsBaseEngineHelper extends AppHelper {
  */
 	public function serializeForm() {
 		trigger_error(
-			sprintf(__('%s does not have serializeForm() implemented', true), get_class($this)), E_USER_WARNING
+			sprintf(__('%s does not have serializeForm() implemented'), get_class($this)), E_USER_WARNING
 		);
 	}
 
diff --git a/cake/libs/view/helpers/mootools_engine.php b/cake/libs/view/helpers/mootools_engine.php
index b0919f418..c8229c1cf 100644
--- a/cake/libs/view/helpers/mootools_engine.php
+++ b/cake/libs/view/helpers/mootools_engine.php
@@ -307,7 +307,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
 	function drop($options = array()) {
 		if (empty($options['drag'])) {
 			trigger_error(
-				__('MootoolsEngine::drop() requires a "drag" option to properly function', true), E_USER_WARNING
+				__('MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING
 			);
 			return false;
 		}
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index 9198e487c..594befdad 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -88,15 +88,15 @@ class NumberHelper extends AppHelper {
 	public function toReadableSize($size) {
 		switch (true) {
 			case $size < 1024:
-				return sprintf(__n('%d Byte', '%d Bytes', $size, true), $size);
+				return sprintf(__n('%d Byte', '%d Bytes', $size), $size);
 			case round($size / 1024) < 1024:
-				return sprintf(__('%d KB', true), $this->precision($size / 1024, 0));
+				return sprintf(__('%d KB'), $this->precision($size / 1024, 0));
 			case round($size / 1024 / 1024, 2) < 1024:
-				return sprintf(__('%.2f MB', true), $this->precision($size / 1024 / 1024, 2));
+				return sprintf(__('%.2f MB'), $this->precision($size / 1024 / 1024, 2));
 			case round($size / 1024 / 1024 / 1024, 2) < 1024:
-				return sprintf(__('%.2f GB', true), $this->precision($size / 1024 / 1024 / 1024, 2));
+				return sprintf(__('%.2f GB'), $this->precision($size / 1024 / 1024 / 1024, 2));
 			default:
-				return sprintf(__('%.2f TB', true), $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
+				return sprintf(__('%.2f TB'), $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
 		}
 	}
 
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 52f0b7309..5a319a827 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -95,7 +95,7 @@ class PaginatorHelper extends AppHelper {
 		App::import('Helper', $ajaxProvider);
 		$classname = $ajaxProvider . 'Helper';
 		if (!is_callable(array($classname, 'link'))) {
-			trigger_error(sprintf(__('%s does not implement a link() method, it is incompatible with PaginatorHelper', true), $classname), E_USER_WARNING);
+			trigger_error(sprintf(__('%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname), E_USER_WARNING);
 		}
 	}
 
@@ -295,7 +295,7 @@ class PaginatorHelper extends AppHelper {
 
 		if (empty($key)) {
 			$key = $title;
-			$title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)), true);
+			$title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
 		}
 		$dir = isset($options['direction']) ? $options['direction'] : 'asc';
 		unset($options['direction']);
@@ -515,7 +515,7 @@ class PaginatorHelper extends AppHelper {
 			array(
 				'model' => $this->defaultModel(),
 				'format' => 'pages',
-				'separator' => __(' of ', true)
+				'separator' => __(' of ')
 			),
 		$options);
 
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index 5e28c89ec..db3a762d2 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -178,7 +178,7 @@ class SessionHelper extends CakeSession {
  * @return boolean
  */
 	public function write() {
-		trigger_error(__('You can not write to a Session from the view', true), E_USER_WARNING);
+		trigger_error(__('You can not write to a Session from the view'), E_USER_WARNING);
 	}
 
 /**
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index 2696428e3..5a4155681 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -57,19 +57,19 @@ class TimeHelper extends AppHelper {
 	function __translateSpecifier($specifier) {
 		switch ($specifier[1]) {
 			case 'a':
-				$abday = __c('abday', 5, true);
+				$abday = __c('abday', 5);
 				if (is_array($abday)) {
 					return $abday[date('w', $this->__time)];
 				}
 				break;
 			case 'A':
-				$day = __c('day',5,true);
+				$day = __c('day', 5);
 				if (is_array($day)) {
 					return $day[date('w', $this->__time)];
 				}
 				break;
 			case 'c':
-				$format = __c('d_t_fmt',5,true);
+				$format = __c('d_t_fmt', 5);
 				if ($format != 'd_t_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
@@ -82,13 +82,13 @@ class TimeHelper extends AppHelper {
 				return date('jS', $this->__time);
 			case 'b':
 			case 'h':
-				$months = __c('abmon', 5, true);
+				$months = __c('abmon', 5);
 				if (is_array($months)) {
 					return $months[date('n', $this->__time) -1];
 				}
 				return '%b';
 			case 'B':
-				$months = __c('mon',5,true);
+				$months = __c('mon', 5);
 				if (is_array($months)) {
 					return $months[date('n', $this->__time) -1];
 				}
@@ -99,14 +99,14 @@ class TimeHelper extends AppHelper {
 			case 'P':
 				$default = array('am' => 0, 'pm' => 1);
 				$meridiem = $default[date('a',$this->__time)];
-				$format = __c('am_pm', 5, true);
+				$format = __c('am_pm', 5);
 				if (is_array($format)) {
 					$meridiem = $format[$meridiem];
 					return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem);
 				}
 				break;
 			case 'r':
-				$complete = __c('t_fmt_ampm', 5, true);
+				$complete = __c('t_fmt_ampm', 5);
 				if ($complete != 't_fmt_ampm') {
 					return str_replace('%p',$this->__translateSpecifier(array('%p', 'p')),$complete);
 				}
@@ -120,13 +120,13 @@ class TimeHelper extends AppHelper {
 			case 'u':
 				return ($weekDay = date('w', $this->__time)) ? $weekDay : 7;
 			case 'x':
-				$format = __c('d_fmt', 5, true);
+				$format = __c('d_fmt', 5);
 				if ($format != 'd_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
 				break;
 			case 'X':
-				$format = __c('t_fmt',5,true);
+				$format = __c('t_fmt', 5);
 				if ($format != 't_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
@@ -224,9 +224,9 @@ class TimeHelper extends AppHelper {
 		$y = $this->isThisYear($date) ? '' : ' %Y';
 
 		if ($this->isToday($date)) {
-			$ret = sprintf(__('Today, %s',true), strftime("%H:%M", $date));
+			$ret = sprintf(__('Today, %s'), strftime("%H:%M", $date));
 		} elseif ($this->wasYesterday($date)) {
-			$ret = sprintf(__('Yesterday, %s',true), strftime("%H:%M", $date));
+			$ret = sprintf(__('Yesterday, %s'), strftime("%H:%M", $date));
 		} else {
 			$format = $this->convertSpecifiers("%b %eS{$y}, %H:%M", $date);
 			$ret = strftime($format, $date);
@@ -572,41 +572,41 @@ class TimeHelper extends AppHelper {
 		$diff = $futureTime - $pastTime;
 
 		if ($diff > abs($now - $this->fromString($end))) {
-			$relativeDate = sprintf(__('on %s',true), date($format, $inSeconds));
+			$relativeDate = sprintf(__('on %s'), date($format, $inSeconds));
 		} else {
 			if ($years > 0) {
 				// years and months and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __n('year', 'years', $years, true);
-				$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months, true) : '';
-				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks, true) : '';
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days, true) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __n('year', 'years', $years);
+				$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months) : '';
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
 			} elseif (abs($months) > 0) {
 				// months, weeks and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months, true);
-				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks, true) : '';
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days, true) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months);
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
 			} elseif (abs($weeks) > 0) {
 				// weeks and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks, true);
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days, true) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks);
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
 			} elseif (abs($days) > 0) {
 				// days and hours
-				$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days, true);
-				$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours, true) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days);
+				$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours) : '';
 			} elseif (abs($hours) > 0) {
 				// hours and minutes
-				$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours, true);
-				$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes, true) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours);
+				$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes) : '';
 			} elseif (abs($minutes) > 0) {
 				// minutes only
-				$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes, true);
+				$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes);
 			} else {
 				// seconds only
-				$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __n('second', 'seconds', $seconds, true);
+				$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __n('second', 'seconds', $seconds);
 			}
 
 			if (!$backwards) {
-				$relativeDate = sprintf(__('%s ago', true), $relativeDate);
+				$relativeDate = sprintf(__('%s ago'), $relativeDate);
 			}
 		}
 		return $relativeDate;
@@ -642,7 +642,7 @@ class TimeHelper extends AppHelper {
 	public function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
 		$tmp = str_replace(' ', '', $timeInterval);
 		if (is_numeric($tmp)) {
-			$timeInterval = $tmp . ' ' . __('days', true);
+			$timeInterval = $tmp . ' ' . __('days');
 		}
 
 		$date = $this->fromString($dateString, $userOffset);
diff --git a/cake/libs/view/layouts/default.ctp b/cake/libs/view/layouts/default.ctp
index ba5fa7e98..859dcc860 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/cake/libs/view/layouts/default.ctp
@@ -22,7 +22,7 @@
 
 	Html->charset(); ?>
 	
-		<?php __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo __('CakePHP: the rapid development php framework:'); ?>
 		<?php echo $title_for_layout; ?>
 	
 	
 		
 

-	

+	

 	
    
 action != 'add'):?>
-		
  • Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value($modelClass.'.'.$primaryKey)), null, __('Are you sure you want to delete', true).' #' . $this->Form->value($modelClass.'.'.$primaryKey)); ?>
    • 
+		
  • Html->link(__('Delete'), array('action' => 'delete', $this->Form->value($modelClass.'.'.$primaryKey)), null, __('Are you sure you want to delete').' #' . $this->Form->value($modelClass.'.'.$primaryKey)); ?>
    • 
 
-		
  • Html->link(__('List', true).' '.$pluralHumanName, array('action' => 'index'));?>
    • 
+		
  • Html->link(__('List').' '.$pluralHumanName, array('action' => 'index'));?>
    • 
  $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t
  • " . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "
    • \n";
-					echo "\t\t
  • " . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "
    • \n";
+					echo "\t\t
  • " . $this->Html->link(sprintf(__('List %s'), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "
    • \n";
+					echo "\t\t
  • " . $this->Html->link(sprintf(__('New %s'), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "
    • \n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/index.ctp b/cake/libs/view/scaffolds/index.ctp
index ce4a09a3d..e82b3b1e4 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/cake/libs/view/scaffolds/index.ctp
@@ -24,7 +24,7 @@
 
 	Paginator->sort($_field);?>
 
-	
+	
 
 \n";
-		echo "\t\t\t" . $this->Html->link(__('View', true), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
-		echo "\t\t\t" . $this->Html->link(__('Edit', true), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
-		echo "\t\t\t" . $this->Html->link(__('Delete', true), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey]) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Edit'), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Delete'), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey]) . "\n";
 		echo "\t\t\n";
 	echo "\t\n";
 
@@ -64,26 +64,26 @@ echo "\n";
 
 	
    Paginator->counter(array(
-		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%')
 	));
 	?>
    
 	
    
-	Paginator->prev('<< ' . __('previous', true), array(), null, array('class' => 'disabled')) . "\n";?>
+	Paginator->prev('<< ' . __('previous'), array(), null, array('class' => 'disabled')) . "\n";?>
 	 | Paginator->numbers() . "\n"?>
-	Paginator->next(__('next', true) .' >>', array(), null, array('class' => 'disabled')) . "\n";?>
+	Paginator->next(__('next') .' >>', array(), null, array('class' => 'disabled')) . "\n";?>
 	
    
 

 

-	

+	

 	
    
-		
  • Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')); ?>
    • 
+		
  • Html->link(sprintf(__('New %s'), $singularHumanName), array('action' => 'add')); ?>
    • 
  $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t
  • " . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
    • \n";
-					echo "\t\t
  • " . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
    • \n";
+					echo "\t\t
  • " . $this->Html->link(sprintf(__('List %s'), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
    • \n";
+					echo "\t\t
  • " . $this->Html->link(sprintf(__('New %s'), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
    • \n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/view.ctp b/cake/libs/view/scaffolds/view.ctp
index 3669d9ac9..9b4ce7d93 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/cake/libs/view/scaffolds/view.ctp
@@ -18,7 +18,7 @@
  */
 ?>
 
    
-
    
+
    
 	
    
 
 
    
 
    
-	
    
+	
    
 	
      
 " .$this->Html->link(sprintf(__('Edit %s', true), $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " \n";
-	echo "\t\t
    • " .$this->Html->link(sprintf(__('Delete %s', true), $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " 
      • \n";
-	echo "\t\t
    • " .$this->Html->link(sprintf(__('List %s', true), $pluralHumanName), array('action' => 'index')). " 
      • \n";
-	echo "\t\t
    • " .$this->Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')). " 
      • \n";
+	echo "\t\t
    • " .$this->Html->link(sprintf(__('Edit %s'), $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " 
      • \n";
+	echo "\t\t
    • " .$this->Html->link(sprintf(__('Delete %s'), $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " 
      • \n";
+	echo "\t\t
    • " .$this->Html->link(sprintf(__('List %s'), $pluralHumanName), array('action' => 'index')). " 
      • \n";
+	echo "\t\t
    • " .$this->Html->link(sprintf(__('New %s'), $singularHumanName), array('action' => 'add')). " 
      • \n";
 
 	$done = array();
 	foreach ($associations as $_type => $_data) {
 		foreach ($_data as $_alias => $_details) {
 			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-				echo "\t\t
    • " . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
      • \n";
-				echo "\t\t
    • " . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
      • \n";
+				echo "\t\t
    • " . $this->Html->link(sprintf(__('List %s'), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
      • \n";
+				echo "\t\t
    • " . $this->Html->link(sprintf(__('New %s'), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
      • \n";
 				$done[] = $_details['controller'];
 			}
 		}
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 6071affae..f8f6ae4c1 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -437,7 +437,7 @@ class View extends Object {
 			$this->hasRendered = true;
 		} else {
 			$out = $this->_render($viewFileName, $this->viewVars);
-			trigger_error(sprintf(__("Error in view %s, got: 
      %s
      ", true), $viewFileName, $out), E_USER_ERROR);
+			trigger_error(sprintf(__("Error in view %s, got: 
      %s
      "), $viewFileName, $out), E_USER_ERROR);
 		}
 		return $out;
 	}
@@ -480,7 +480,7 @@ class View extends Object {
 
 		if ($this->output === false) {
 			$this->output = $this->_render($layoutFileName, $data_for_layout);
-			trigger_error(sprintf(__("Error in layout %s, got: 
      %s
      ", true), $layoutFileName, $this->output), E_USER_ERROR);
+			trigger_error(sprintf(__("Error in layout %s, got: 
      %s
      "), $layoutFileName, $this->output), E_USER_ERROR);
 			return false;
 		}
 
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 66f26e44f..2bca6927a 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -396,7 +396,7 @@ class XmlNode extends Object {
 
 		if (is_object($child)) {
 			if ($this->compare($child)) {
-				trigger_error(__('Cannot append a node to itself.', true));
+				trigger_error(__('Cannot append a node to itself.'));
 				$return = false;
 				return $return;
 			}
@@ -890,7 +890,7 @@ class Xml extends XmlNode {
 		} elseif (file_exists($input)) {
 			$this->__rawData = file_get_contents($input);
 		} else {
-			trigger_error(__('XML cannot be read', true));
+			trigger_error(__('XML cannot be read'));
 			return false;
 		}
 		return $this->parse();