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

[-] BO : fix #PSCFV-2513

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15613 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-05-22 12:20:19 +00:00
parent 7d9ca8d486
commit 943e6bfedf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Translate.php
+5 -5
View File
@@ -39,7 +39,7 @@ class TranslateCore
* @param bool $htmlentities
* @return string
*/
public static function getAdminTranslation($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true, $sprintf = false)
public static function getAdminTranslation($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true, $sprintf = null)
{
static $modules_tabs = null;
@@ -75,7 +75,7 @@ class TranslateCore
$str = $htmlentities ? htmlentities($str, ENT_QUOTES, 'utf-8') : $str;
$str = str_replace('"', '"', $str);
if ($sprintf)
if (preg_match_all('#(?:%%|%(?:[0-9]+\$)?[+-]?(?:[ 0]|\'.)?-?[0-9]*(?:\.[0-9]+)?[bcdeufFosxX])#', $str, $matches) && !is_null($sprintf))
{
if (!is_array($sprintf))
$sprintf = array($sprintf);
@@ -121,7 +121,7 @@ class TranslateCore
* @param string $source
* @return string
*/
public static function getModuleTranslation($module, $string, $source, $sprintf = false)
public static function getModuleTranslation($module, $string, $source, $sprintf = null)
{
global $_MODULES, $_MODULE, $_LANGADM;
@@ -190,7 +190,7 @@ class TranslateCore
else
$ret = stripslashes($string);
if ($sprintf)
if (preg_match_all('#(?:%%|%(?:[0-9]+\$)?[+-]?(?:[ 0]|\'.)?-?[0-9]*(?:\.[0-9]+)?[bcdeufFosxX])#', $ret, $matches) && !is_null($sprintf))
{
if (!is_array($sprintf))
$sprintf = array($sprintf);
@@ -231,7 +231,7 @@ class TranslateCore
$key = md5(str_replace('\'', '\\\'', $string));
$str = (key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);
$str = (array_key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);
return $str;
}