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

[-] BO : translations errors : fix regex

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15068 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre committed 2012-05-04 09:20:34 +00:00
1 parent f25d090958
commit 4cd51b9b9e
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminTranslationsController.php
+1 -3
View File
@@ -806,15 +806,13 @@ class AdminTranslationsControllerCore extends AdminController
case 'errors': case 'errors':
// Parsing file for all errors syntax // Parsing file for all errors syntax
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U'; $regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, ?(true|false))?\)/U';
break; break;
case 'modules': case 'modules':
// Parsing modules file // Parsing modules file
if ($type_file == 'php') if ($type_file == 'php')
$regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U'; $regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U';
else if ($type_file == 'displayError')
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, (true|false))?\)/U';
else else
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U'; $regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U';
break; break;