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

Moving I18n related classes to the new folder schema

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-04 13:45:07 -04:30
parent f3eb2159eb
commit 6b40c9c854
8 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/validation.php
View file

@ -18,7 +18,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Multibyte', 'Core'); App::uses('Multibyte', 'I18n');
/** /**
* Offers different validation methods. * Offers different validation methods.

2
lib/Cake/Controller/Component/EmailComponent.php
View file

@ -17,7 +17,7 @@
* @since CakePHP(tm) v 1.2.0.3467 * @since CakePHP(tm) v 1.2.0.3467
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Multibyte', 'Core'); App::uses('Multibyte', 'I18n');
/** /**
* EmailComponent * EmailComponent

0
cake/libs/i18n.php → lib/Cake/I18n/I18n.php
View file

0
cake/libs/l10n.php → lib/Cake/I18n/L10n.php
View file

0
cake/libs/multibyte.php → lib/Cake/I18n/Multibyte.php
View file

2
lib/Cake/View/Helper/JsHelper.php
View file

@ -19,7 +19,7 @@
*/ */
App::uses('AppHelper', 'View/Helper'); App::uses('AppHelper', 'View/Helper');
App::uses('Multibyte', 'Core'); App::uses('Multibyte', 'I18n');
/** /**
* Javascript Generator helper class for easy use of JavaScript. * Javascript Generator helper class for easy use of JavaScript.

2
lib/Cake/View/Helper/TextHelper.php
View file

@ -26,7 +26,7 @@
*/ */
App::uses('AppHelper', 'View/Helper'); App::uses('AppHelper', 'View/Helper');
App::uses('HtmlHelper', 'Helper'); App::uses('HtmlHelper', 'Helper');
App::uses('Multibyte', 'Utility'); App::uses('Multibyte', 'I18n');
/** /**
* Text helper library. * Text helper library.

28
lib/Cake/basics.php
View file

@ -469,9 +469,7 @@ if (!function_exists('sortByKey')) {
if (!$singular) { if (!$singular) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($singular); return I18n::translate($singular);
} }
@ -489,9 +487,7 @@ if (!function_exists('sortByKey')) {
if (!$singular) { if (!$singular) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($singular, $plural, null, 6, $count); return I18n::translate($singular, $plural, null, 6, $count);
} }
@ -507,9 +503,7 @@ if (!function_exists('sortByKey')) {
if (!$msg) { if (!$msg) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($msg, null, $domain); return I18n::translate($msg, null, $domain);
} }
@ -529,9 +523,7 @@ if (!function_exists('sortByKey')) {
if (!$singular) { if (!$singular) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($singular, $plural, $domain, 6, $count); return I18n::translate($singular, $plural, $domain, 6, $count);
} }
@ -562,9 +554,7 @@ if (!function_exists('sortByKey')) {
if (!$msg) { if (!$msg) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($msg, null, $domain, $category); return I18n::translate($msg, null, $domain, $category);
} }
@ -599,9 +589,7 @@ if (!function_exists('sortByKey')) {
if (!$singular) { if (!$singular) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($singular, $plural, $domain, $category, $count); return I18n::translate($singular, $plural, $domain, $category, $count);
} }
@ -628,9 +616,7 @@ if (!function_exists('sortByKey')) {
if (!$msg) { if (!$msg) {
return; return;
} }
if (!class_exists('I18n')) { App::uses('I18n', 'I18n');
App::import('Core', 'i18n');
}
return I18n::translate($msg, null, null, $category); return I18n::translate($msg, null, null, $category);
} }