From ca254dae98639501bd004b5d21161f897b638d1d Mon Sep 17 00:00:00 2001 From: AD7six Date: Sat, 19 Mar 2011 18:40:24 +0100 Subject: [PATCH] update language domains used in standard views --- lib/Cake/View/errors/error400.ctp | 2 +- lib/Cake/View/errors/error500.ctp | 4 +- lib/Cake/View/errors/missing_action.ctp | 17 ++-- .../View/errors/missing_behavior_class.ctp | 16 ++-- .../View/errors/missing_behavior_file.ctp | 16 ++-- .../View/errors/missing_component_class.ctp | 14 +-- .../View/errors/missing_component_file.ctp | 14 +-- lib/Cake/View/errors/missing_connection.ctp | 14 +-- lib/Cake/View/errors/missing_controller.ctp | 16 ++-- lib/Cake/View/errors/missing_database.ctp | 14 +-- .../View/errors/missing_datasource_config.ctp | 10 +-- .../View/errors/missing_datasource_file.ctp | 10 +-- lib/Cake/View/errors/missing_helper_class.ctp | 14 +-- lib/Cake/View/errors/missing_helper_file.ctp | 14 +-- lib/Cake/View/errors/missing_layout.ctp | 14 +-- lib/Cake/View/errors/missing_table.ctp | 10 +-- lib/Cake/View/errors/missing_view.ctp | 14 +-- lib/Cake/View/errors/private_action.ctp | 10 +-- lib/Cake/View/errors/scaffold_error.ctp | 10 +-- lib/Cake/View/layouts/default.ctp | 6 +- lib/Cake/View/pages/home.ctp | 88 +++++++++---------- 21 files changed, 163 insertions(+), 164 deletions(-) diff --git a/lib/Cake/View/errors/error400.ctp b/lib/Cake/View/errors/error400.ctp index bc861ca49..38e1aedaa 100644 --- a/lib/Cake/View/errors/error400.ctp +++ b/lib/Cake/View/errors/error400.ctp @@ -24,7 +24,7 @@ "'{$url}'" ); ?>

- 0 ): echo $this->element('exception_stack_trace'); endif; diff --git a/lib/Cake/View/errors/error500.ctp b/lib/Cake/View/errors/error500.ctp index ba0c41bea..247f2db78 100644 --- a/lib/Cake/View/errors/error500.ctp +++ b/lib/Cake/View/errors/error500.ctp @@ -21,8 +21,8 @@ :

- 0 ): echo $this->element('exception_stack_trace'); endif; -?> +?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/errors/missing_action.ctp index df8a7fc9f..fb2a805e0 100644 --- a/lib/Cake/View/errors/missing_action.ctp +++ b/lib/Cake/View/errors/missing_action.ctp @@ -16,14 +16,13 @@ * @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
@@ -38,7 +37,7 @@ class  extends AppController {
 ?>

- : - + : +

-element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_behavior_class.ctp b/lib/Cake/View/errors/missing_behavior_class.ctp index cec3a107a..e95042fe5 100644 --- a/lib/Cake/View/errors/missing_behavior_class.ctp +++ b/lib/Cake/View/errors/missing_behavior_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : + 

 <?php
@@ -33,8 +33,8 @@ class  extends ModelBehavior {
 ?>

- : - + : +

-element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_behavior_file.ctp b/lib/Cake/View/errors/missing_behavior_file.ctp index ae04f123f..836ea8430 100644 --- a/lib/Cake/View/errors/missing_behavior_file.ctp +++ b/lib/Cake/View/errors/missing_behavior_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
@@ -33,8 +33,8 @@ class  extends ModelBehavior {
 ?>

- : - + : +

-element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_component_class.ctp b/lib/Cake/View/errors/missing_component_class.ctp index 674c04524..d15db35e3 100644 --- a/lib/Cake/View/errors/missing_component_class.ctp +++ b/lib/Cake/View/errors/missing_component_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

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

 <?php
@@ -33,8 +33,8 @@ class  extends Component {

 ?>

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_component_file.ctp b/lib/Cake/View/errors/missing_component_file.ctp index a39303ed0..803a26f6d 100644 --- a/lib/Cake/View/errors/missing_component_file.ctp +++ b/lib/Cake/View/errors/missing_component_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

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

 <?php
@@ -33,8 +33,8 @@ class  extends Component {

 ?>

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_connection.ctp b/lib/Cake/View/errors/missing_connection.ctp index 6f53202d7..ad41e1551 100644 --- a/lib/Cake/View/errors/missing_connection.ctp +++ b/lib/Cake/View/errors/missing_connection.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : +

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_controller.ctp b/lib/Cake/View/errors/missing_controller.ctp index 9919427ec..41bca987a 100644 --- a/lib/Cake/View/errors/missing_controller.ctp +++ b/lib/Cake/View/errors/missing_controller.ctp @@ -16,14 +16,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
@@ -33,8 +33,8 @@ class  extends AppController {
 ?>

- : - + : +

-element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_database.ctp b/lib/Cake/View/errors/missing_database.ctp index 798bfa05d..488113796 100644 --- a/lib/Cake/View/errors/missing_database.ctp +++ b/lib/Cake/View/errors/missing_database.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : +

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_datasource_config.ctp b/lib/Cake/View/errors/missing_datasource_config.ctp index 51296083c..20c3bf784 100644 --- a/lib/Cake/View/errors/missing_datasource_config.ctp +++ b/lib/Cake/View/errors/missing_datasource_config.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_datasource_file.ctp b/lib/Cake/View/errors/missing_datasource_file.ctp index 452682655..2821f90cb 100644 --- a/lib/Cake/View/errors/missing_datasource_file.ctp +++ b/lib/Cake/View/errors/missing_datasource_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_helper_class.ctp b/lib/Cake/View/errors/missing_helper_class.ctp index 58d07eb3e..d7a88772e 100644 --- a/lib/Cake/View/errors/missing_helper_class.ctp +++ b/lib/Cake/View/errors/missing_helper_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : + 

 <?php
@@ -33,8 +33,8 @@ class  extends AppHelper {
 ?>

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_helper_file.ctp b/lib/Cake/View/errors/missing_helper_file.ctp index 120cc3193..630123898 100644 --- a/lib/Cake/View/errors/missing_helper_file.ctp +++ b/lib/Cake/View/errors/missing_helper_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
@@ -33,8 +33,8 @@ class  extends AppHelper {
 ?>

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_layout.ctp b/lib/Cake/View/errors/missing_layout.ctp index d822390f6..0f27f32a3 100644 --- a/lib/Cake/View/errors/missing_layout.ctp +++ b/lib/Cake/View/errors/missing_layout.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

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

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_table.ctp b/lib/Cake/View/errors/missing_table.ctp index ac61366f1..d6001e330 100644 --- a/lib/Cake/View/errors/missing_table.ctp +++ b/lib/Cake/View/errors/missing_table.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/errors/missing_view.ctp index 4a986b823..88f0e86d5 100644 --- a/lib/Cake/View/errors/missing_view.ctp +++ b/lib/Cake/View/errors/missing_view.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - ' . Inflector::camelize($this->request->controller) . 'Controller::', '' . $this->request->action . '()'); ?> + : + ' . Inflector::camelize($this->request->controller) . 'Controller::', '' . $this->request->action . '()'); ?>

- : - + : +

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/private_action.ctp b/lib/Cake/View/errors/private_action.ctp index c194ebe58..c3abe7578 100644 --- a/lib/Cake/View/errors/private_action.ctp +++ b/lib/Cake/View/errors/private_action.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

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

- : - + : +

element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/scaffold_error.ctp b/lib/Cake/View/errors/scaffold_error.ctp index d2f9ae1e1..f628705ff 100644 --- a/lib/Cake/View/errors/scaffold_error.ctp +++ b/lib/Cake/View/errors/scaffold_error.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

+

- : - + : +

- : - + : + 

 <?php
diff --git a/lib/Cake/View/layouts/default.ctp b/lib/Cake/View/layouts/default.ctp
index f758b9551..4ee06e476 100644
--- a/lib/Cake/View/layouts/default.ctp
+++ b/lib/Cake/View/layouts/default.ctp
@@ -21,7 +21,7 @@
 
 	Html->charset(); ?>
 	
-		<?php echo __d('cake', 'CakePHP: the rapid development php framework:'); ?>
+		<?php echo __d('cake_developer', 'CakePHP: the rapid development php framework:'); ?>
 		<?php echo $title_for_layout; ?>
 	
 	
 	

 		
 		

 
@@ -46,7 +46,7 @@