dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fixes to AdminController:translate() performance

Browse Source
This commit is contained in:
tDidierjean
2011-11-23 15:00:19 +00:00
parent ffdf614327
commit 0ee626f3ed
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -9
View File
@@ -1523,8 +1523,9 @@ class AdminControllerCore extends Controller
{ {
// every admin translations should use this method // every admin translations should use this method
// @todo remove global keyword in translations files and use static // @todo remove global keyword in translations files and use static
global $_LANGADM, $_ERRORS, $_FIELDS; global $_LANGADM;
if (!is_array($_LANGADM) || !is_array($_ERRORS) || !is_array($_FIELDS))
if (!is_array($_LANGADM))
{ {
$iso = Context::getContext()->language->iso_code; $iso = Context::getContext()->language->iso_code;
include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php'); include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
@@ -1540,18 +1541,12 @@ class AdminControllerCore extends Controller
$class = str_replace('_', '', $class); $class = str_replace('_', '', $class);
// if the class is extended by a module, use modules/[module_name]/xx.php lang file // if the class is extended by a module, use modules/[module_name]/xx.php lang file
//$currentClass = get_class($this);
if (false && Module::getModuleNameFromClass($class)) if (false && Module::getModuleNameFromClass($class))
{ {
$string = str_replace('\'', '\\\'', $string); $string = str_replace('\'', '\\\'', $string);
return Module::findTranslation(Module::$classInModule[$class], $string, $class); return Module::findTranslation(Module::$classInModule[$class], $string, $class);
} }
global $_LANGADM;
if (is_array($_LANGADM))
$_LANGADM = array_change_key_case($_LANGADM);
else
$_LANGADM = array();
$key = md5(str_replace('\'', '\\\'', $string)); $key = md5(str_replace('\'', '\\\'', $string));
// retrocomp : // retrocomp :
@@ -1564,7 +1559,6 @@ class AdminControllerCore extends Controller
else else
// note in 1.5, some translations has moved from AdminXX to helper/*.tpl // note in 1.5, some translations has moved from AdminXX to helper/*.tpl
$str = $string; $str = $string;
$str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str; $str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str;
return str_replace('"', '"', ($addslashes ? addslashes($str) : stripslashes($str))); return str_replace('"', '"', ($addslashes ? addslashes($str) : stripslashes($str)));
} }