Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Replacing "echo sprintf" by "printf" where possible. Fixes #209.

Signed-off-by: Mark Story <mark@mark-story.com>
  • Loading branch information...
commit 0ac99eddb52327b38d1a6aa7fcf33148e663ce80 1 parent 668a791
@jrbasso jrbasso authored markstory committed
Showing with 59 additions and 59 deletions.
  1. +2 −2 cake/console/templates/default/views/home.ctp
  2. +1 −1  cake/libs/view/errors/error404.ctp
  3. +1 −1  cake/libs/view/errors/error500.ctp
  4. +7 −7 cake/libs/view/errors/missing_action.ctp
  5. +3 −3 cake/libs/view/errors/missing_behavior_class.ctp
  6. +3 −3 cake/libs/view/errors/missing_behavior_file.ctp
  7. +3 −3 cake/libs/view/errors/missing_component_class.ctp
  8. +2 −2 cake/libs/view/errors/missing_component_file.ctp
  9. +3 −3 cake/libs/view/errors/missing_connection.ctp
  10. +3 −3 cake/libs/view/errors/missing_controller.ctp
  11. +3 −3 cake/libs/view/errors/missing_helper_class.ctp
  12. +3 −3 cake/libs/view/errors/missing_helper_file.ctp
  13. +3 −3 cake/libs/view/errors/missing_layout.ctp
  14. +3 −3 cake/libs/view/errors/missing_model.ctp
  15. +2 −2 cake/libs/view/errors/missing_scaffolddb.ctp
  16. +2 −2 cake/libs/view/errors/missing_table.ctp
  17. +3 −3 cake/libs/view/errors/missing_view.ctp
  18. +3 −3 cake/libs/view/errors/private_action.ctp
  19. +1 −1  cake/libs/view/errors/scaffold_error.ctp
  20. +2 −2 cake/libs/view/pages/home.ctp
  21. +3 −3 cake/libs/view/scaffolds/view.ctp
  22. +2 −2 cake/tests/test_app/views/pages/home.ctp
  23. +1 −1  cake/tests/test_app/views/posts/test_nocache_tags.ctp
View
4 cake/console/templates/default/views/home.ctp
@@ -24,7 +24,7 @@ endif;
\$settings = Cache::settings();
if (!empty(\$settings)):
echo '<span class=\"notice success\">';
- echo sprintf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. \$settings['engine'] . 'Engine</em>');
+ printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. \$settings['engine'] . 'Engine</em>');
echo '</span>';
else:
echo '<span class=\"notice\">';
@@ -75,7 +75,7 @@ $output .= "<?php endif;?>\n";
$output .= "<h3><?php __('Editing this Page') ?></h3>\n";
$output .= "<p>\n";
$output .= "<?php\n";
-$output .= "\techo sprintf(__('To change the content of this page, edit: %s\n";
+$output .= "\tprintf(__('To change the content of this page, edit: %s\n";
$output .= "\t\tTo change its layout, edit: %s\n";
$output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\n";
$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
View
2  cake/libs/view/errors/error404.ctp
@@ -20,5 +20,5 @@
<h2><?php echo $name; ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The requested address %s was not found on this server.', true), "<strong>'{$message}'</strong>")?>
+ <?php printf(__('The requested address %s was not found on this server.', true), "<strong>'{$message}'</strong>"); ?>
</p>
View
2  cake/libs/view/errors/error500.ctp
@@ -20,5 +20,5 @@
<h2><?php echo $name; ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('An Internal Error Has Occurred.', true), "<strong>'{$message}'</strong>")?>
+ <?php printf(__('An Internal Error Has Occurred.', true), "<strong>'{$message}'</strong>"); ?>
</p>
View
14 cake/libs/view/errors/missing_action.ctp
@@ -17,14 +17,14 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
-<h2><?php echo sprintf(__('Missing Method in %s', true), $controller);?></h2>
+<h2><?php printf(__('Missing Method in %s', true), $controller); ?></h2>
<p class="error">
- <strong><?php __('Error') ?>: </strong>
- <?php echo sprintf(__('The action %1$s is not defined in controller %2$s', true), '<em>' . $action . '</em>', '<em>' . $controller . '</em>');?>
+ <strong><?php __('Error'); ?>: </strong>
+ <?php printf(__('The action %1$s is not defined in controller %2$s', true), '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
</p>
<p class="error">
- <strong><?php __('Error') ?>: </strong>
- <?php echo sprintf(__('Create %1$s%2$s in file: %3$s.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php');?>
+ <strong><?php __('Error'); ?>: </strong>
+ <?php printf(__('Create %1$s%2$s in file: %3$s.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
</p>
<pre>
&lt;?php
@@ -41,6 +41,6 @@ class <?php echo $controller;?> extends AppController {
?&gt;
</pre>
<p class="notice">
- <strong><?php __('Notice') ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp');?>
+ <strong><?php __('Notice'); ?>: </strong>
+ <?php printf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_behavior_class.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Behavior Class'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The behavior class <em>%s</em> can not be found or does not exist.', true), $behaviorClass);?>
+ <?php printf(__('The behavior class <em>%s</em> can not be found or does not exist.', true), $behaviorClass); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file);?>
+ <?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $behaviorClass;?> extends ModelBehavior {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_behavior_file.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Behavior File'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The Behavior file %s can not be found or does not exist.', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file);?>
+ <?php printf(__('The Behavior file %s can not be found or does not exist.', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file);?>
+ <?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $behaviorClass;?> extends ModelBehavior {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_component_class.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Component Class'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Component class %1$s in %2$s was not found.', true), '<em>' . $component . 'Component</em>', '<em>' . $controller . 'Controller</em>');?>
+ <?php printf(__('Component class %1$s in %2$s was not found.', true), '<em>' . $component . 'Component</em>', '<em>' . $controller . 'Controller</em>'); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file);?>
+ <?php printf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $component;?>Component extends Object {<br />
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
</p>
View
4 cake/libs/view/errors/missing_component_file.ctp
@@ -24,7 +24,7 @@
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file);?>
+ <?php printf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $component;?>Component extends Object {<br />
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_connection.ctp
@@ -20,13 +20,13 @@
<h2><?php __('Missing Database Connection'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('%s requires a database connection', true), $model);?>
+ <?php printf(__('%s requires a database connection', true), $model); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Confirm you have created the file : %s.', true), APP_DIR . DS . 'config' . DS . 'database.php');?>
+ <?php printf(__('Confirm you have created the file : %s.', true), APP_DIR . DS . 'config' . DS . 'database.php'); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__));?>
+ <?php printf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
</p>
View
6 cake/libs/view/errors/missing_controller.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Controller'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('%s could not be found.', true), '<em>' . $controller . '</em>');?>
+ <?php printf(__('%s could not be found.', true), '<em>' . $controller . '</em>'); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class %s below in file: %s', true), '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php');?>
+ <?php printf(__('Create the class %s below in file: %s', true), '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
</p>
<pre>
&lt;?php
@@ -36,5 +36,5 @@ class <?php echo $controller;?> extends AppController {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_helper_class.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Helper Class'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The helper class <em>%s</em> can not be found or does not exist.', true), $helperClass);?>
+ <?php printf(__('The helper class <em>%s</em> can not be found or does not exist.', true), $helperClass); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file);?>
+ <?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $helperClass;?> extends AppHelper {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_helper_file.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Helper File'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The helper file %s can not be found or does not exist.', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file);?>
+ <?php printf(__('The helper file %s can not be found or does not exist.', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file);?>
+ <?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
</p>
<pre>
&lt;?php
@@ -35,5 +35,5 @@ class <?php echo $helperClass;?> extends AppHelper {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_layout.ctp
@@ -20,13 +20,13 @@
<h2><?php __('Missing Layout'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The layout file %s can not be found or does not exist.', true), '<em>' . $file . '</em>');?>
+ <?php printf(__('The layout file %s can not be found or does not exist.', true), '<em>' . $file . '</em>'); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Confirm you have created the file: %s', true), '<em>' . $file . '</em>');?>
+ <?php printf(__('Confirm you have created the file: %s', true), '<em>' . $file . '</em>'); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_model.ctp
@@ -20,11 +20,11 @@
<h2><?php __('Missing Model'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('<em>%s</em> could not be found.', true), $model);?>
+ <?php printf(__('<em>%s</em> could not be found.', true), $model); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Create the class %s in file: %s', true), '<em>' . $model . '</em>', APP_DIR . DS . 'models' . DS . Inflector::underscore($model) . '.php');?>
+ <?php printf(__('Create the class %s in file: %s', true), '<em>' . $model . '</em>', APP_DIR . DS . 'models' . DS . Inflector::underscore($model) . '.php'); ?>
</p>
<pre>
&lt;?php
@@ -37,5 +37,5 @@ class <?php echo $model;?> extends AppModel {
</pre>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_model.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_model.ctp'); ?>
</p>
View
4 cake/libs/view/errors/missing_scaffolddb.ctp
@@ -24,9 +24,9 @@
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Confirm you have created the file: %s', true), APP_DIR . DS . 'config' . DS . 'database.php');?>
+ <?php printf(__('Confirm you have created the file: %s', true), APP_DIR . DS . 'config' . DS . 'database.php'); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
</p>
View
4 cake/libs/view/errors/missing_table.ctp
@@ -20,9 +20,9 @@
<h2><?php __('Missing Database Table'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Database table %1$s for model %2$s was not found.', true), '<em>' . $table . '</em>', '<em>' . $model . '</em>');?>
+ <?php printf(__('Database table %1$s for model %2$s was not found.', true), '<em>' . $table . '</em>', '<em>' . $model . '</em>'); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
</p>
View
6 cake/libs/view/errors/missing_view.ctp
@@ -20,13 +20,13 @@
<h2><?php __('Missing View'); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('The view for %1$s%2$s was not found.', true), '<em>' . $controller . 'Controller::</em>', '<em>' . $action . '()</em>');?>
+ <?php printf(__('The view for %1$s%2$s was not found.', true), '<em>' . $controller . 'Controller::</em>', '<em>' . $action . '()</em>'); ?>
</p>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('Confirm you have created the file: %s', true), $file);?>
+ <?php printf(__('Confirm you have created the file: %s', true), $file); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
</p>
View
6 cake/libs/view/errors/private_action.ctp
@@ -17,12 +17,12 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
?>
-<h2><?php echo sprintf(__('Private Method in %s', true), $controller);?></h2>
+<h2><?php printf(__('Private Method in %s', true), $controller); ?></h2>
<p class="error">
<strong><?php __('Error'); ?>: </strong>
- <?php echo sprintf(__('%s%s cannot be accessed directly.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>');?>
+ <?php printf(__('%s%s cannot be accessed directly.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
</p>
View
2  cake/libs/view/errors/scaffold_error.ctp
@@ -24,7 +24,7 @@
</p>
<p class="notice">
<strong><?php __('Notice'); ?>: </strong>
- <?php echo sprintf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp');?>
+ <?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
</p>
<pre>
&lt;?php
View
4 cake/libs/view/pages/home.ctp
@@ -20,7 +20,7 @@ if (Configure::read() == 0):
$this->cakeError('error404');
endif;
?>
-<h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
+<h2><?php printf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
<?php
echo $this->Html->link(__('Read the changelog', true), 'http://code.cakephp.org/wiki/changelog/1_3_0-alpha');
@@ -46,7 +46,7 @@ endif;
$settings = Cache::settings();
if (!empty($settings)):
echo '<span class="notice success">';
- echo sprintf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
+ printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
echo '</span>';
else:
echo '<span class="notice">';
View
6 cake/libs/view/scaffolds/view.ctp
@@ -18,7 +18,7 @@
*/
?>
<div class="<?php echo $pluralVar;?> view">
-<h2><?php echo sprintf(__("View %s", true), $singularHumanName);?></h2>
+<h2><?php printf(__("View %s", true), $singularHumanName); ?></h2>
<dl>
<?php
$i = 0;
@@ -72,7 +72,7 @@ foreach ($scaffoldFields as $_field) {
if (!empty($associations['hasOne'])) :
foreach ($associations['hasOne'] as $_alias => $_details): ?>
<div class="related">
- <h3><?php echo sprintf(__("Related %s", true), Inflector::humanize($_details['controller']));?></h3>
+ <h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
<?php if (!empty(${$singularVar}[$_alias])):?>
<dl>
<?php
@@ -111,7 +111,7 @@ foreach ($relations as $_alias => $_details):
$otherSingularVar = Inflector::variable($_alias);
?>
<div class="related">
- <h3><?php echo sprintf(__("Related %s", true), Inflector::humanize($_details['controller']));?></h3>
+ <h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
<?php if (!empty(${$singularVar}[$_alias])):?>
<table cellpadding="0" cellspacing="0">
<tr>
View
4 cake/tests/test_app/views/pages/home.ctp
@@ -23,7 +23,7 @@ endif;
$settings = Cache::settings();
if (!empty($settings)):
echo '<span class="notice success">';
- echo sprintf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
+ printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
echo '</span>';
else:
echo '<span class="notice">';
@@ -74,7 +74,7 @@ if (!empty($filePresent)):
<h3><?php __('Editing this Page') ?></h3>
<p>
<?php
- echo sprintf(__('To change the content of this page, edit: %s
+ printf(__('To change the content of this page, edit: %s
To change its layout, edit: %s
You can also add some CSS styles for your pages at: %s', true),
APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');
View
2  cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -96,7 +96,7 @@ if (!empty($filePresent)):
</span>
</p>
<?php endif; ?>
-<h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
+<h2><?php printf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php __('Read the release notes and get the latest version'); ?> </a>
<h2><?php __('Editing this Page'); ?></h2>
<p>
Please sign in to comment.
Something went wrong with that request. Please try again.