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

// Refacto of lang functions (all code moved in Translate class)

Browse Source
This commit is contained in:
rMalie
2012-02-13 15:20:25 +00:00
parent 93c481cacb
commit ac7d4de35b
9 changed files with 210 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/smartyfront.config.inc.php
+4 -36
View File
@@ -29,7 +29,8 @@ $smarty->setTemplateDir(_PS_THEME_DIR_.'tpl');
function smartyTranslate($params, &$smarty)
{
global $_LANG, $_MODULES, $cookie, $_MODULE, $_LANGPDF;
global $_LANG;
if (!isset($params['js'])) $params['js'] = 0;
if (!isset($params['pdf'])) $params['pdf'] = false;
if (!isset($params['mod'])) $params['mod'] = false;
@@ -39,42 +40,9 @@ function smartyTranslate($params, &$smarty)
$key = Tools::substr(basename($filename), 0, -4).'_'.md5($string);
$lang_array = $_LANG;
if ($params['mod'])
{
$iso = Language::getIsoById($cookie->id_lang);
if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$params['mod'].'/'.$iso.'.php'))
{
$translationsFile = _PS_THEME_DIR_.'modules/'.$params['mod'].'/'.$iso.'.php';
$key = '<{'.$params['mod'].'}'._THEME_NAME_.'>'.$key;
}
else
{
// @retrocompatibility with translations files in module root
if (Tools::file_exists_cache(_PS_MODULE_DIR_.$params['mod'].'/translations'))
$translationsFile = _PS_MODULE_DIR_.$params['mod'].'/translations/'.$iso.'.php';
else
$translationsFile = _PS_MODULE_DIR_.$params['mod'].'/'.$iso.'.php';
$key = '<{'.$params['mod'].'}prestashop>'.$key;
}
if (!is_array($_MODULES))
$_MODULES = array();
if (@include_once($translationsFile))
if(is_array($_MODULE))
$_MODULES = array_merge($_MODULES, $_MODULE);
$lang_array = $_MODULES;
}
return Translate::getModuleTranslation($params['mod'], $params['s'], Tools::substr(basename($filename), 0, -4));
else if ($params['pdf'])
{
$iso = Language::getIsoById($cookie->id_lang);
$translationsFile = _PS_THEME_DIR_.'pdf/lang/'.$iso.'.php';
if (Tools::file_exists_cache($translationsFile))
@include_once($translationsFile);
$key = 'PDF'.md5($string);
$lang_array = $_LANGPDF;
}
return Translate::getPdfTranslation($params['s']);
if (is_array($lang_array) && key_exists($key, $lang_array))
$msg = $lang_array[$key];