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

// perf

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14591 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-04-11 16:03:57 +00:00
parent 73175f1191
commit ff98873fb5
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Translate.php
+6 -6
View File
@@ -162,17 +162,17 @@ class TranslateCore
if (version_compare(_PS_VERSION_, '1.3.0.0') <= 0)
$_MODULES = array_change_key_case($_MODULES);
$currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.$key;
$defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.$key;
$currentKey = strtolower('<{'.$name.'}'._THEME_NAME_.'>'.$source.'_'.$key);
$defaultKey = strtolower('<{'.$name.'}prestashop>'.$source.'_'.$key);
if (isset($_MODULES[$currentKey]))
$ret = stripslashes($_MODULES[$currentKey]);
elseif (isset($_MODULES[Tools::strtolower($currentKey)]))
$ret = stripslashes($_MODULES[Tools::strtolower($currentKey)]);
elseif (isset($_MODULES[$currentKey]))
$ret = stripslashes($_MODULES[$currentKey]);
elseif (isset($_MODULES[$defaultKey]))
$ret = stripslashes($_MODULES[$defaultKey]);
elseif (isset($_MODULES[$defaultKey]))
$ret = stripslashes($_MODULES[$defaultKey]);
elseif (isset($_MODULES[Tools::strtolower($defaultKey)]))
$ret = stripslashes($_MODULES[Tools::strtolower($defaultKey)]);
// if translation was not found in module, look for it in AdminController or Helpers
elseif (!empty($_LANGADM))
$ret = Translate::getGenericAdminTranslation($string, $key, $_LANGADM);
config/smartyadmin.config.inc.php
+2 -1
View File
@@ -42,7 +42,7 @@ function smartyTranslate($params, &$smarty)
// If the template is part of a module
if (!empty($params['mod']))
return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
return Translate::getModuleTranslation($params['mod'], $params['s'], basename($filename, '.tpl'));
// If the tpl is at the root of the template folder
if (dirname($filename) == '.')
@@ -67,3 +67,4 @@ function smartyTranslate($params, &$smarty)
return Translate::getAdminTranslation($params['s'], $class, $addslashes, $htmlentities, $sprintf);
}
config/smartyfront.config.inc.php
+3 -2
View File
@@ -38,14 +38,15 @@ function smartyTranslate($params, &$smarty)
$string = str_replace('\'', '\\\'', $params['s']);
$filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath());
$key = Tools::substr(basename($filename), 0, -4).'_'.md5($string);
$basename = basename($filename, '.tpl');
$key = $basename.'_'.md5($string);
if (isset($smarty->source) && (strpos($smarty->source->filepath, DIRECTORY_SEPARATOR.'override'.DIRECTORY_SEPARATOR) !== false))
$key = 'override_'.$key;
$lang_array = $_LANG;
if ($params['mod'])
return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
return Translate::getModuleTranslation($params['mod'], $params['s'], $basename);
else if ($params['pdf'])
return Translate::getPdfTranslation($params['s']);