Permalink
Browse files

Removing the remaining cake domain translations.

3rd time is a charm.
Fixes #2103
  • Loading branch information...
1 parent 7c70b37 commit 25e9aaf6c89a577e685dadb087af89631565bc18 @markstory markstory committed Oct 20, 2011
@@ -20,11 +20,11 @@
<!--nocache-->
<span class="notice">
<?php
- echo __d('cake', 'Your tmp directory is ');
+ echo __('Your tmp directory is ');
if (is_writable(TMP)):
- echo __d('cake', 'writable.');
+ echo __('writable.');
else:
- echo __d('cake', 'NOT writable.');
+ echo __('NOT writable.');
endif;
?>
</span>
@@ -33,12 +33,12 @@
<p>
<span class="notice">
<?php
- echo __d('cake', 'Your cache is ');
+ echo __('Your cache is ');
if (Cache::isInitialized('default')):
- echo __d('cake', 'set up and initialized properly.');
+ echo __('set up and initialized properly.');
$settings = Cache::settings();
echo '<p>' . $settings['engine'];
- echo __d('cake', ' is being used to cache, to change this edit config/core.php ');
+ echo __(' is being used to cache, to change this edit config/core.php ');
echo '</p>';
echo 'Settings: <ul>';
@@ -48,10 +48,10 @@
echo '</ul>';
else:
- echo __d('cake', 'NOT working.');
+ echo __('NOT working.');
echo '<br />';
if (is_writable(TMP)):
- echo __d('cake', 'Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly');
+ echo __('Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly');
endif;
endif;
?>
@@ -60,15 +60,15 @@
<p>
<span class="notice">
<?php
- echo __d('cake', 'Your database configuration file is ');
+ echo __('Your database configuration file is ');
$filePresent = null;
if (file_exists(APP . 'Config'.'database.php')):
- echo __d('cake', 'present.');
+ echo __('present.');
$filePresent = true;
else:
- echo __d('cake', 'NOT present.');
+ echo __('NOT present.');
echo '<br/>';
- echo __d('cake', 'Rename config/database.php.default to config/database.php');
+ echo __('Rename config/database.php.default to config/database.php');
endif;
?>
</span>
@@ -82,60 +82,60 @@ if (!empty($filePresent)):
?>
<p>
<span class="notice">
- <?php echo __d('cake', 'Cake');
+ <?php echo __('Cake');
if ($connected->isConnected()):
- __d('cake', ' is able to ');
+ __(' is able to ');
else:
- __d('cake', ' is NOT able to ');
+ __(' is NOT able to ');
endif;
- __d('cake', 'connect to the database.');
+ __('connect to the database.');
?>
</span>
</p>
<?php endif; ?>
-<h2><?php echo __d('cake', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php echo __d('cake', 'Read the release notes and get the latest version'); ?> </a>
-<h2><?php echo __d('cake', 'Editing this Page'); ?></h2>
+<h2><?php echo __('Release Notes for CakePHP %s.', Configure::version()); ?></h2>
+<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php echo __('Read the release notes and get the latest version'); ?> </a>
+<h2><?php echo __('Editing this Page'); ?></h2>
<p>
-<?php echo __d('cake', 'To change the content of this page, create: /app/View/Pages/home.ctp.'); ?><br />
-<?php echo __d('cake', 'To change its layout, create: /app/View/Layouts/default.ctp.'); ?><br />
-<a href="http://manual.cakephp.org/"><?php echo __d('cake', 'See the views section of the manual for more info.'); ?> </a><br />
-<?php echo __d('cake', 'You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
+<?php echo __('To change the content of this page, create: /app/View/Pages/home.ctp.'); ?><br />
+<?php echo __('To change its layout, create: /app/View/Layouts/default.ctp.'); ?><br />
+<a href="http://manual.cakephp.org/"><?php echo __('See the views section of the manual for more info.'); ?> </a><br />
+<?php echo __('You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
</p>
-<h2><?php echo __d('cake', 'Getting Started'); ?></h2>
+<h2><?php echo __('Getting Started'); ?></h2>
<p>
-<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?php echo __d('cake', 'The 15 min Blog Tutorial'); ?></a><br />
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?php echo __d('cake', 'Cook up Web sites fast with CakePHP'); ?></a><br />
-<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?php echo __d('cake', 'Create an interactive production wiki using PHP'); ?></a>
+<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?php echo __('The 15 min Blog Tutorial'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?php echo __('Cook up Web sites fast with CakePHP'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?php echo __('Create an interactive production wiki using PHP'); ?></a>
</p>
-<h2><?php echo __d('cake', 'More about Cake'); ?></h2>
+<h2><?php echo __('More about Cake'); ?></h2>
<p>
-<?php echo __d('cake', '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 __('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', '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 __('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', 'Cake Software Foundation'); ?> </a>
- <ul><li><?php echo __d('cake', 'Promoting development related to CakePHP'); ?></li></ul></li>
- <li><a href="http://bakery.cakephp.org"><?php echo __d('cake', 'The Bakery'); ?> </a>
- <ul><li><?php echo __d('cake', 'Everything CakePHP'); ?></li></ul></li>
- <li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake', 'Book Store'); ?> </a>
- <ul><li><?php echo __d('cake', 'Recommended Software Books'); ?></li></ul></li>
- <li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake', 'CakeSchwag'); ?> </a>
- <ul><li><?php echo __d('cake', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
- <li><a href="http://www.cakephp.org"><?php echo __d('cake', 'CakePHP'); ?> </a>
- <ul><li><?php echo __d('cake', 'The Rapid Development Framework'); ?></li></ul></li>
- <li><a href="http://manual.cakephp.org"><?php echo __d('cake', 'CakePHP Manual'); ?> </a>
- <ul><li><?php echo __d('cake', 'Your Rapid Development Cookbook'); ?></li></ul></li>
- <li><a href="http://api.cakephp.org"><?php echo __d('cake', 'CakePHP API'); ?> </a>
- <ul><li><?php echo __d('cake', 'Docblock Your Best Friend'); ?></li></ul></li>
- <li><a href="http://www.cakeforge.org"><?php echo __d('cake', 'CakeForge'); ?> </a>
- <ul><li><?php echo __d('cake', 'Open Development for CakePHP'); ?></li></ul></li>
- <li><a href="https://trac.cakephp.org/"><?php echo __d('cake', 'CakePHP Trac'); ?> </a>
- <ul><li><?php echo __d('cake', 'For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
- <li><a href="http://groups-beta.google.com/group/cake-php"><?php echo __d('cake', 'CakePHP Google Group'); ?> </a>
- <ul><li><?php echo __d('cake', 'Community mailing list'); ?></li></ul></li>
+ <li><a href="http://cakefoundation.org/"><?php echo __('Cake Software Foundation'); ?> </a>
+ <ul><li><?php echo __('Promoting development related to CakePHP'); ?></li></ul></li>
+ <li><a href="http://bakery.cakephp.org"><?php echo __('The Bakery'); ?> </a>
+ <ul><li><?php echo __('Everything CakePHP'); ?></li></ul></li>
+ <li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __('Book Store'); ?> </a>
+ <ul><li><?php echo __('Recommended Software Books'); ?></li></ul></li>
+ <li><a href="http://www.cafepress.com/cakefoundation"><?php echo __('CakeSchwag'); ?> </a>
+ <ul><li><?php echo __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+ <li><a href="http://www.cakephp.org"><?php echo __('CakePHP'); ?> </a>
+ <ul><li><?php echo __('The Rapid Development Framework'); ?></li></ul></li>
+ <li><a href="http://manual.cakephp.org"><?php echo __('CakePHP Manual'); ?> </a>
+ <ul><li><?php echo __('Your Rapid Development Cookbook'); ?></li></ul></li>
+ <li><a href="http://api.cakephp.org"><?php echo __('CakePHP API'); ?> </a>
+ <ul><li><?php echo __('Docblock Your Best Friend'); ?></li></ul></li>
+ <li><a href="http://www.cakeforge.org"><?php echo __('CakeForge'); ?> </a>
+ <ul><li><?php echo __('Open Development for CakePHP'); ?></li></ul></li>
+ <li><a href="https://trac.cakephp.org/"><?php echo __('CakePHP Trac'); ?> </a>
+ <ul><li><?php echo __('For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
+ <li><a href="http://groups-beta.google.com/group/cake-php"><?php echo __('CakePHP Google Group'); ?> </a>
+ <ul><li><?php echo __('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', 'Live chat about CakePHP'); ?></li></ul></li>
+ <ul><li><?php echo __('Live chat about CakePHP'); ?></li></ul></li>
</ul>
@@ -18,9 +18,9 @@
?>
<h2><?php echo $name; ?></h2>
<p class="error">
- <strong><?php echo __d('cake', 'Error'); ?>: </strong>
+ <strong><?php echo __d('Error'); ?>: </strong>
<?php printf(
- __d('cake', 'The requested address %s was not found on this server.'),
+ __d('The requested address %s was not found on this server.'),
"<strong>'{$url}'</strong>"
); ?>
</p>
@@ -18,8 +18,8 @@
?>
<h2><?php echo $name; ?></h2>
<p class="error">
- <strong><?php echo __d('cake', 'Error'); ?>: </strong>
- <?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
+ <strong><?php echo __d('Error'); ?>: </strong>
+ <?php echo __d('An Internal Error Has Occurred.'); ?>
</p>
<?php
if (Configure::read('debug') > 0 ):
@@ -84,7 +84,7 @@ public function precision($number, $precision = 3) {
public function toReadableSize($size) {
switch (true) {
case $size < 1024:
- return __dn('%d Byte', '%d Bytes', $size, $size);
+ return __n('%d Byte', '%d Bytes', $size, $size);
case round($size / 1024) < 1024:
return __('%d KB', $this->precision($size / 1024, 0));
case round($size / 1024 / 1024, 2) < 1024:
@@ -80,19 +80,19 @@ public function convertSpecifiers($format, $time = null) {
protected function _translateSpecifier($specifier) {
switch ($specifier[1]) {
case 'a':
- $abday = __dc('abday', 5);
+ $abday = __c('abday', 5);
if (is_array($abday)) {
return $abday[date('w', $this->__time)];
}
break;
case 'A':
- $day = __dc('day', 5);
+ $day = __c('day', 5);
if (is_array($day)) {
return $day[date('w', $this->__time)];
}
break;
case 'c':
- $format = __dc('d_t_fmt', 5);
+ $format = __c('d_t_fmt', 5);
if ($format != 'd_t_fmt') {
return $this->convertSpecifiers($format, $this->__time);
}
@@ -114,13 +114,13 @@ protected function _translateSpecifier($specifier) {
return date('jS', $this->__time);
case 'b':
case 'h':
- $months = __dc('abmon', 5);
+ $months = __c('abmon', 5);
if (is_array($months)) {
return $months[date('n', $this->__time) -1];
}
return '%b';
case 'B':
- $months = __dc('mon', 5);
+ $months = __c('mon', 5);
if (is_array($months)) {
return $months[date('n', $this->__time) -1];
}
@@ -131,14 +131,14 @@ protected function _translateSpecifier($specifier) {
case 'P':
$default = array('am' => 0, 'pm' => 1);
$meridiem = $default[date('a',$this->__time)];
- $format = __dc('am_pm', 5);
+ $format = __c('am_pm', 5);
if (is_array($format)) {
$meridiem = $format[$meridiem];
return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem);
}
break;
case 'r':
- $complete = __dc('t_fmt_ampm', 5);
+ $complete = __c('t_fmt_ampm', 5);
if ($complete != 't_fmt_ampm') {
return str_replace('%p',$this->_translateSpecifier(array('%p', 'p')),$complete);
}
@@ -152,13 +152,13 @@ protected function _translateSpecifier($specifier) {
case 'u':
return ($weekDay = date('w', $this->__time)) ? $weekDay : 7;
case 'x':
- $format = __dc('d_fmt', 5);
+ $format = __c('d_fmt', 5);
if ($format != 'd_fmt') {
return $this->convertSpecifiers($format, $this->__time);
}
break;
case 'X':
- $format = __dc('t_fmt', 5);
+ $format = __c('t_fmt', 5);
if ($format != 't_fmt') {
return $this->convertSpecifiers($format, $this->__time);
}
@@ -613,33 +613,33 @@ public function timeAgoInWords($dateTime, $options = array()) {
} else {
if ($years > 0) {
// years and months and days
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d year', '%d years', $years, $years);
- $relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . __dn('%d month', '%d months', $months, $months) : '';
- $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . __dn('%d week', '%d weeks', $weeks, $weeks) : '';
- $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __dn('%d day', '%d days', $days, $days) : '';
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d year', '%d years', $years, $years);
+ $relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . __n('%d month', '%d months', $months, $months) : '';
+ $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . __n('%d week', '%d weeks', $weeks, $weeks) : '';
+ $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __n('%d day', '%d days', $days, $days) : '';
} elseif (abs($months) > 0) {
// months, weeks and days
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d month', '%d months', $months, $months);
- $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . __dn('%d week', '%d weeks', $weeks, $weeks) : '';
- $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __dn('%d day', '%d days', $days, $days) : '';
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d month', '%d months', $months, $months);
+ $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . __n('%d week', '%d weeks', $weeks, $weeks) : '';
+ $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __n('%d day', '%d days', $days, $days) : '';
} elseif (abs($weeks) > 0) {
// weeks and days
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d week', '%d weeks', $weeks, $weeks);
- $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __dn('%d day', '%d days', $days, $days) : '';
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d week', '%d weeks', $weeks, $weeks);
+ $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . __n('%d day', '%d days', $days, $days) : '';
} elseif (abs($days) > 0) {
// days and hours
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d day', '%d days', $days, $days);
- $relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . __dn('%d hour', '%d hours', $hours, $hours) : '';
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d day', '%d days', $days, $days);
+ $relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . __n('%d hour', '%d hours', $hours, $hours) : '';
} elseif (abs($hours) > 0) {
// hours and minutes
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d hour', '%d hours', $hours, $hours);
- $relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . __dn('%d minute', '%d minutes', $minutes, $minutes) : '';
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d hour', '%d hours', $hours, $hours);
+ $relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . __n('%d minute', '%d minutes', $minutes, $minutes) : '';
} elseif (abs($minutes) > 0) {
// minutes only
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d minute', '%d minutes', $minutes, $minutes);
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d minute', '%d minutes', $minutes, $minutes);
} else {
// seconds only
- $relativeDate .= ($relativeDate ? ', ' : '') . __dn('%d second', '%d seconds', $seconds, $seconds);
+ $relativeDate .= ($relativeDate ? ', ' : '') . __n('%d second', '%d seconds', $seconds, $seconds);
}
if (!$backwards) {
@@ -20,32 +20,32 @@
<?php
echo $this->Form->create();
echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
- echo $this->Form->end(__d('cake', 'Submit'));
+ echo $this->Form->end(__('Submit'));
?>
</div>
<div class="actions">
- <h3><?php echo __d('cake', 'Actions'); ?></h3>
+ <h3><?php echo __('Actions'); ?></h3>
<ul>
<?php if ($this->request->action != 'add'): ?>
<li><?php echo $this->Form->postLink(
- __d('cake', 'Delete'),
+ __('Delete'),
array('action' => 'delete', $this->Form->value($modelClass . '.' . $primaryKey)),
null,
- __d('cake', 'Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
+ __('Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
?></li>
<?php endif;?>
- <li><?php echo $this->Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index'));?></li>
+ <li><?php echo $this->Html->link(__('List') . ' ' . $pluralHumanName, array('action' => 'index'));?></li>
<?php
$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<li>" . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
- echo "\t\t<li>" . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
+ echo "\t\t<li>" . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
+ echo "\t\t<li>" . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
$done[] = $_details['controller'];
}
}
}
?>
</ul>
-</div>
+</div>
Oops, something went wrong.

0 comments on commit 25e9aaf

Please sign in to comment.