adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing extra param in internacionalization.

Browse source
This commit is contained in:
Juan Basso 2011-01-19 00:17:24 -02:00
parent 6181db0ff2
commit 09fbaaaab4
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/webroot/test.php
View file

@ -79,7 +79,7 @@ if (isset($corePath[0])) {
} }
if (Configure::read('debug') < 1) { if (Configure::read('debug') < 1) {
die(__('Debug setting does not allow access to this url.', true)); die(__('Debug setting does not allow access to this url.'));
} }
require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';

2
cake/console/templates/skel/webroot/test.php
View file

@ -79,7 +79,7 @@ if (isset($corePath[0])) {
} }
if (Configure::read('debug') < 1) { if (Configure::read('debug') < 1) {
die(__('Debug setting does not allow access to this url.', true)); die(__('Debug setting does not allow access to this url.'));
} }
require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';

4
cake/libs/validation.php
View file

@ -247,7 +247,7 @@ class Validation {
} }
break; break;
default: default:
self::$errors[] = __('You must define the $operator parameter for Validation::comparison()', true); self::$errors[] = __('You must define the $operator parameter for Validation::comparison()');
break; break;
} }
return false; return false;
@ -266,7 +266,7 @@ class Validation {
extract(self::_defaults($check)); extract(self::_defaults($check));
} }
if ($regex === null) { if ($regex === null) {
self::$errors[] = __('You must define a regular expression for Validation::custom()', true); self::$errors[] = __('You must define a regular expression for Validation::custom()');
return false; return false;
} }
return self::_check($check, $regex); return self::_check($check, $regex);

2
cake/libs/view/errors/error500.ctp
View file

@ -18,7 +18,7 @@
?> ?>
<h2><?php echo $name; ?></h2> <h2><?php echo $name; ?></h2>
<p class="error"> <p class="error">
<strong><?php echo __('Error', true); ?>: </strong> <strong><?php echo __('Error'); ?>: </strong>
<?php echo __('An Internal Error Has Occurred.'); ?> <?php echo __('An Internal Error Has Occurred.'); ?>
</p> </p>
<?php <?php

2
cake/libs/view/layouts/default.ctp
View file

@ -35,7 +35,7 @@
<body> <body>
<div id="container"> <div id="container">
<div id="header"> <div id="header">
<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1> <h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
</div> </div>
<div id="content"> <div id="content">

4
cake/libs/view/pages/home.ctp
View file

@ -120,7 +120,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
<p> <p>
<?php <?php
echo $this->Html->link( echo $this->Html->link(
sprintf('<strong>%s</strong> %s', __('New', true), __('CakePHP 1.3 Docs', true)), sprintf('<strong>%s</strong> %s', __('New'), __('CakePHP 1.3 Docs')),
'http://book.cakephp.org/view/875/x1-3-Collection', 'http://book.cakephp.org/view/875/x1-3-Collection',
array('target' => '_blank', 'escape' => false) array('target' => '_blank', 'escape' => false)
); );
@ -129,7 +129,7 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
<p> <p>
<?php <?php
echo $this->Html->link( echo $this->Html->link(
__('The 15 min Blog Tutorial', true), __('The 15 min Blog Tutorial'),
'http://book.cakephp.org/view/1528/Blog', 'http://book.cakephp.org/view/1528/Blog',
array('target' => '_blank', 'escape' => false) array('target' => '_blank', 'escape' => false)
); );

6
cake/libs/view/scaffolds/view.ctp
View file

@ -140,9 +140,9 @@ $otherSingularVar = Inflector::variable($_alias);
} }
echo "\t\t\t<td class=\"actions\">\n"; echo "\t\t\t<td class=\"actions\">\n";
echo "\t\t\t\t" . $this->Html->link(__('View', true), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n"; echo "\t\t\t\t" . $this->Html->link(__('View'), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
echo "\t\t\t\t" . $this->Html->link(__('Edit', true), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n"; echo "\t\t\t\t" . $this->Html->link(__('Edit'), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
echo "\t\t\t\t" . $this->Html->link(__('Delete', true), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n"; echo "\t\t\t\t" . $this->Html->link(__('Delete'), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
echo "\t\t\t</td>\n"; echo "\t\t\t</td>\n";
echo "\t\t</tr>\n"; echo "\t\t</tr>\n";
endforeach; endforeach;

4
cake/tests/test_app/views/layouts/default.ctp
View file

@ -32,7 +32,7 @@ $this->loadHelper('Html');
<body> <body>
<div id="container"> <div id="container">
<div id="header"> <div id="header">
<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org');?></h1> <h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org');?></h1>
</div> </div>
<div id="content"> <div id="content">
@ -41,7 +41,7 @@ $this->loadHelper('Html');
</div> </div>
<div id="footer"> <div id="footer">
<?php echo $this->Html->link( <?php echo $this->Html->link(
$this->Html->image('cake.power.gif', array('alt'=> __("CakePHP: the rapid development php framework", true), 'border'=>"0")), $this->Html->image('cake.power.gif', array('alt'=> __("CakePHP: the rapid development php framework"), 'border'=>"0")),
'http://www.cakephp.org/', 'http://www.cakephp.org/',
array('target'=>'_blank'), null, false array('target'=>'_blank'), null, false
); );