mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-05 11:02:40 +00:00
fixes #6492, removing use of define LC_MESSAGES due to inconsistency on different operating systems
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8223 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
bc5de16b6c
commit
508f0651a4
3 changed files with 17 additions and 24 deletions
|
@ -34,13 +34,6 @@
|
|||
define('WEEK', 7 * DAY);
|
||||
define('MONTH', 30 * DAY);
|
||||
define('YEAR', 365 * DAY);
|
||||
/**
|
||||
* Add constant for LC_MESSAGES because it is not defined on windows
|
||||
*/
|
||||
if (!defined('LC_MESSAGES')) {
|
||||
define('LC_MESSAGES', 6);
|
||||
}
|
||||
|
||||
/**
|
||||
* Patch for PHP < 5.0
|
||||
*/
|
||||
|
@ -631,9 +624,9 @@ if (!function_exists('file_put_contents')) {
|
|||
}
|
||||
|
||||
if ($return === false) {
|
||||
echo I18n::translate($singular, $plural, null, LC_MESSAGES, $count);
|
||||
echo I18n::translate($singular, $plural, null, 6, $count);
|
||||
} else {
|
||||
return I18n::translate($singular, $plural, null, LC_MESSAGES, $count);
|
||||
return I18n::translate($singular, $plural, null, 6, $count);
|
||||
}
|
||||
}
|
||||
/**
|
||||
|
@ -679,9 +672,9 @@ if (!function_exists('file_put_contents')) {
|
|||
}
|
||||
|
||||
if ($return === false) {
|
||||
echo I18n::translate($singular, $plural, $domain, LC_MESSAGES, $count);
|
||||
echo I18n::translate($singular, $plural, $domain, 6, $count);
|
||||
} else {
|
||||
return I18n::translate($singular, $plural, $domain, LC_MESSAGES, $count);
|
||||
return I18n::translate($singular, $plural, $domain, 6, $count);
|
||||
}
|
||||
}
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue