Moving I18n related classes to the new folder schema

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

View file

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

View file

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

View file

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

View file

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

View file

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