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

// Fix translations error

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15672 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-05-24 16:27:16 +00:00
parent 1c980c9fce
commit 598ffaee32
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/smartyfront.config.inc.php
+2 -2
View File
@@ -34,7 +34,7 @@ function smartyTranslate($params, &$smarty)
if (!isset($params['js'])) $params['js'] = 0;
if (!isset($params['pdf'])) $params['pdf'] = false;
if (!isset($params['mod'])) $params['mod'] = false;
if (!isset($params['sprintf'])) $params['sprintf'] = false;
if (!isset($params['sprintf'])) $params['sprintf'] = null;
$string = str_replace('\'', '\\\'', $params['s']);
$filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath());
@@ -61,7 +61,7 @@ function smartyTranslate($params, &$smarty)
if ($msg != $params['s'])
$msg = $params['js'] ? addslashes($msg) : stripslashes($msg);
if ($params['sprintf'])
if (preg_match_all('#(?:%%|%(?:[0-9]+\$)?[+-]?(?:[ 0]|\'.)?-?[0-9]*(?:\.[0-9]+)?[bcdeufFosxX])#', $msg, $matches) && !is_null($params['sprintf']))
{
if (!is_array($params['sprintf']))
$params['sprintf'] = array($params['sprintf']);