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

[-] BO : #PSCFV-2660 : Fix bug in regex for parse translations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15799 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-06-04 07:41:01 +00:00
parent c0806524fe
commit dd8abfe708
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/header.tpl
+13 -13
View File
@@ -51,20 +51,20 @@
{/if}
{* Notifications vars *}
var autorefresh_notifications = '{$autorefresh_notifications}';
var new_order_msg = '{l s='A new order has been made on your shop.' slashes=1 }';
var order_number_msg = '{l s='Order number : ' slashes=1 }';
var total_msg = '{l s='Total : ' slashes=1 }';
var from_msg = '{l s='From : ' slashes=1 }';
var see_order_msg = '{l s='Click here to see that order' slashes=1 }';
var new_order_msg = '{l s='A new order has been made on your shop.' slashes=1}';
var order_number_msg = '{l s='Order number: ' slashes=1}';
var total_msg = '{l s='Total: ' slashes=1}';
var from_msg = '{l s='From: ' slashes=1}';
var see_order_msg = '{l s='Click here to see that order' slashes=1}';
var new_customer_msg = '{l s='A new customer registered on your shop.' slashes=1}';
var customer_name_msg = '{l s='Customer name : ' slashes=1 }';
var see_customer_msg = '{l s='Click here to see that customer' slashes=1 }';
var new_msg = '{l s='A new message posted on your shop.' slashes=1 }';
var excerpt_msg = '{l s='Excerpt : ' slashes=1 }';
var see_msg = '{l s='Click here to see that message' slashes=1 }';
var token_admin_orders = '{getAdminToken tab='AdminOrders' slashes=1 }';
var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1 }';
var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1 }';
var customer_name_msg = '{l s='Customer name: ' slashes=1}';
var see_customer_msg = '{l s='Click here to see that customer' slashes=1}';
var new_msg = '{l s='A new message posted on your shop.' slashes=1}';
var excerpt_msg = '{l s='Excerpt: ' slashes=1}';
var see_msg = '{l s='Click here to see that message' slashes=1}';
var token_admin_orders = '{getAdminToken tab='AdminOrders' slashes=1}';
var token_admin_customers = '{getAdminToken tab='AdminCustomers' slashes=1}';
var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads' slashes=1}';
var currentIndex = '{$currentIndex}';
</script>
{/if}
controllers/admin/AdminTranslationsController.php
+5 -5
View File
@@ -837,7 +837,7 @@ class AdminTranslationsControllerCore extends AdminController
{
case 'front':
// Parsing file in Front office
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( js=1)?\}/U';
$regex = '/\{l\s*s=\''._PS_TRANS_PATTERN_.'\'(\s*sprintf=.*)?(\s*js=1)?\s*\}/U';
break;
case 'back':
@@ -847,12 +847,12 @@ class AdminTranslationsControllerCore extends AdminController
else if ($type_file == 'specific')
$regex = '/translate\(\''._PS_TRANS_PATTERN_.'\'\)/U';
else
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( js=1)?( slashes=1)?\}/U';
$regex = '/\{l\s*s\s*=\''._PS_TRANS_PATTERN_.'\'(\s*sprintf=.*)?(\s*js=1)?(\s*slashes=1)?\s*\}/U';
break;
case 'errors':
// Parsing file for all errors syntax
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(, ?(true|false))?\)/U';
$regex = '/Tools::displayError\(\''._PS_TRANS_PATTERN_.'\'(,\s*(true|false))?\)/U';
break;
case 'modules':
@@ -860,7 +860,7 @@ class AdminTranslationsControllerCore extends AdminController
if ($type_file == 'php')
$regex = '/->l\(\''._PS_TRANS_PATTERN_.'\'(, ?\'(.+)\')?(, ?(.+))?\)/U';
else
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( mod=\'.+\')?( js=1)?\}/U';
$regex = '/\{l\s*s=\''._PS_TRANS_PATTERN_.'\'(\s*sprintf=.*)?(\s*mod=\'.+\')?(\s*js=1)?\s*\}/U';
break;
case 'pdf':
@@ -868,7 +868,7 @@ class AdminTranslationsControllerCore extends AdminController
if ($type_file == 'php')
$regex = '/HTMLTemplate.*::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U';
else
$regex = '/\{l s=\''._PS_TRANS_PATTERN_.'\'( sprintf=.*)?( js=1)?( pdf=\'true\')?\}/U';
$regex = '/\{l\s*s=\''._PS_TRANS_PATTERN_.'\'(\s*sprintf=.*)?(\s*js=1)?(\s*pdf=\'true\')?\s*\}/U';
break;
}
translations/fr/admin.php
+1 -1
View File
@@ -1733,6 +1733,7 @@ $_LANGADM['AdminMeta14caa3d50da16368a8f30b53a5b72aa4'] = 'Rediriger automatiquem
$_LANGADM['AdminMeta193cfc9be3b995831c6af2fea6650e60'] = 'Page';
$_LANGADM['AdminMeta1ce8c30b7ac35494b290332e37c9e7b4'] = 'Le multi-boutique est activé. Si vous souhaitez changer l\'URL d\'une de vos boutiques, veuillez vous rendre dans l\'onglet \"Advanced Parameters\" -> \"Multi-boutique\".';
$_LANGADM['AdminMeta1dec4f55522b828fe5dacf8478021a9e'] = 'URL simplifiée :';
$_LANGADM['AdminMeta2b8d5d29082dcd15416bfda7936daabd'] = 'La réécriture d\'URL (mod_rewrite) n\'est pas détecté active sur votre serveur. Si vous voulez utiliser les URL simplifiées, veuillez activer ce module Apache.';
$_LANGADM['AdminMeta2f00a8ca42b86bfcb39cdd34665a1386'] = 'Exemple : \"contacts\" pour http://maboutique.com/shop/contacts redirigera vers http://maboutique.com/shop/contact-form.php';
$_LANGADM['AdminMeta33de75d34ebe209ac0536cfef2d44206'] = 'Titre de la page :';
$_LANGADM['AdminMeta33fe26e0d07af85617f326ca09fb5085'] = 'Pour ajouter un tag, cliquez dans le champ, écrire quelque chose, puis appuyez sur \"Entrée\"';
@@ -1761,7 +1762,6 @@ $_LANGADM['AdminMeta9ca94e67feafa7c087ed70257d54ce53'] = 'Mots-clés : %s';
$_LANGADM['AdminMetaa6bb76858f8b4b61c050ad7a7ac57e06'] = 'Méta description :';
$_LANGADM['AdminMetaaa75f9d383049a51a3fc7254fffd81fc'] = 'Route vers les catégories avec le paramètre selected_filter pour le module navigation à facette';
$_LANGADM['AdminMetaacaa02ab1d800ce9a0b3df2e4ab8909a'] = 'Désactiver l\'option Apache MultiViews';
$_LANGADM['AdminMeta2b8d5d29082dcd15416bfda7936daabd'] = 'La réécriture d\'URL (mod_rewrite) n\'est pas détecté active sur votre serveur. Si vous voulez utiliser les URL simplifiées, veuillez activer ce module Apache.';
$_LANGADM['AdminMetab718adec73e04ce3ec720dd11a06a308'] = 'ID';
$_LANGADM['AdminMetab78a3223503896721cca1303f776159b'] = 'Titre';
$_LANGADM['AdminMetab7e4848d64e66565d360a42e54fd1b3b'] = 'Une courte description';