From 91f238a2cdc8dc446c5c0ef1bb1ed89ea18356f7 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Wed, 23 Nov 2011 21:33:13 +0000 Subject: [PATCH] // Fix incorrect translation strings in tpl --- admin-dev/themes/template/access/form.tpl | 2 +- .../template/accounting_export/common_form.tpl | 4 ++-- .../template/attachments/list_action_delete.tpl | 3 ++- admin-dev/themes/template/groups/form.tpl | 12 ++++++------ admin-dev/themes/template/import/form.tpl | 2 +- admin-dev/themes/template/products/quantities.tpl | 8 ++++---- admin-dev/themes/template/supply_orders/form.tpl | 2 +- modules/sendtoafriend/sendtoafriend-extra.tpl | 3 ++- modules/tntcarrier/tpl/shippingNumber.tpl | 2 +- themes/prestashop/order-carrier.tpl | 6 +++--- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/admin-dev/themes/template/access/form.tpl b/admin-dev/themes/template/access/form.tpl index 26bc551bc..2cd8b54d0 100644 --- a/admin-dev/themes/template/access/form.tpl +++ b/admin-dev/themes/template/access/form.tpl @@ -382,7 +382,7 @@
 
{else} - {l s="Administrator permissions can't be modified."} + {l s='Administrator permissions can\'t be modified.'} {/if} diff --git a/admin-dev/themes/template/accounting_export/common_form.tpl b/admin-dev/themes/template/accounting_export/common_form.tpl index 28324e4ee..25cab2def 100644 --- a/admin-dev/themes/template/accounting_export/common_form.tpl +++ b/admin-dev/themes/template/accounting_export/common_form.tpl @@ -41,11 +41,11 @@
- {l s="The date has not the right format"} + {l s='The date has not the right format'}
- {l s="The date has not the right format"} + {l s='The date has not the right format'}
diff --git a/admin-dev/themes/template/attachments/list_action_delete.tpl b/admin-dev/themes/template/attachments/list_action_delete.tpl index 22aa1348f..76d283cbc 100644 --- a/admin-dev/themes/template/attachments/list_action_delete.tpl +++ b/admin-dev/themes/template/attachments/list_action_delete.tpl @@ -26,8 +26,9 @@ diff --git a/admin-dev/themes/template/groups/form.tpl b/admin-dev/themes/template/groups/form.tpl index 93c8958a7..26164315e 100644 --- a/admin-dev/themes/template/groups/form.tpl +++ b/admin-dev/themes/template/groups/form.tpl @@ -72,13 +72,13 @@ { $(elt).addClass('unselect_all').removeClass('select_all'); $('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').removeAttr('checked'); - $(elt).html('{l s="Select all"}'); + $(elt).html('{l s='Select all'}'); } else { $(elt).addClass('select_all').removeClass('unselect_all'); $('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').attr('checked', 'checked'); - $(elt).html('{l s="Unselect all"}'); + $(elt).html('{l s='Unselect all'}'); } } @@ -258,12 +258,12 @@ - - + + - - + + diff --git a/admin-dev/themes/template/import/form.tpl b/admin-dev/themes/template/import/form.tpl index 7c1ac1c71..71a57eb4e 100644 --- a/admin-dev/themes/template/import/form.tpl +++ b/admin-dev/themes/template/import/form.tpl @@ -60,7 +60,7 @@ $('#preview_import').submit(function() { if ($('#truncate').get(0).checked) { - if (confirm('{l s="Are you sure you want to delete"}' + ' ' + $('#entity > option:selected').text().toLowerCase() + '{l s="?"}')) + if (confirm('{l s='Are you sure you want to delete'}' + ' ' + $('#entity > option:selected').text().toLowerCase() + '{l s='?'}')) { this.submit(); } diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl index c8a3b4c60..36c6b0e86 100644 --- a/admin-dev/themes/template/products/quantities.tpl +++ b/admin-dev/themes/template/products/quantities.tpl @@ -123,7 +123,7 @@ data.ajax = 1; data.controller = "AdminProducts"; data.action = "productQuantity"; - showAjaxMsg('{l s="Saving data..."}'); + showAjaxMsg('{l s='Saving data...'}'); $.ajax({ type: "POST", url: "ajax-tab.php", @@ -134,14 +134,14 @@ { if (msg.error) { - showAjaxError('{l s="Error durring saving data"}'); + showAjaxError('{l s='Error durring saving data'}'); return; } - showAjaxSuccess('{l s="Data saved"}'); + showAjaxSuccess('{l s='Data saved'}'); }, error: function(msg) { - showAjaxError('{l s="Error durring saving data"}'); + showAjaxError('{l s='Error durring saving data'}'); } }); }; diff --git a/admin-dev/themes/template/supply_orders/form.tpl b/admin-dev/themes/template/supply_orders/form.tpl index 47ad3e100..c63733fe2 100644 --- a/admin-dev/themes/template/supply_orders/form.tpl +++ b/admin-dev/themes/template/supply_orders/form.tpl @@ -150,7 +150,7 @@ '%'+ '%'+ ''+ - '{l s='+ + '{l s='Remove this product from the order'}'+ '' ); diff --git a/modules/sendtoafriend/sendtoafriend-extra.tpl b/modules/sendtoafriend/sendtoafriend-extra.tpl index bb67d131e..c0dc5565b 100644 --- a/modules/sendtoafriend/sendtoafriend-extra.tpl +++ b/modules/sendtoafriend/sendtoafriend-extra.tpl @@ -58,7 +58,8 @@ $('document').ready(function(){ else { $('#send_friend_form_error').show(); - $('#send_friend_form_error').text('{/literal}{l s="You did not fill required fields" mod=sendtoafriend}{literal}'); + var error_text = {/literal}{l s='You did not fill required fields' mod=sendtoafriend}{literal} + $('#send_friend_form_error').text(error_text); } }); }); diff --git a/modules/tntcarrier/tpl/shippingNumber.tpl b/modules/tntcarrier/tpl/shippingNumber.tpl index 01ed53d5e..2ebd485a8 100644 --- a/modules/tntcarrier/tpl/shippingNumber.tpl +++ b/modules/tntcarrier/tpl/shippingNumber.tpl @@ -37,7 +37,7 @@ {/if} {/foreach} - {$var.lang_sticker} : {l s="PDF File"}
+ {$var.lang_sticker} : {l s='PDF File'}
{$var.lang_expedition} : {$var.date}
{$var.place} {/if} \ No newline at end of file diff --git a/themes/prestashop/order-carrier.tpl b/themes/prestashop/order-carrier.tpl index c9b234b2c..7689e93c3 100644 --- a/themes/prestashop/order-carrier.tpl +++ b/themes/prestashop/order-carrier.tpl @@ -140,13 +140,13 @@ {if $option.is_best_grade} {if $option.is_best_price} -
{l s="The best price and grade"}
+
{l s='The best price and grade'}
{else} -
{l s="The faster"}
+
{l s='The faster'}
{/if} {else} {if $option.is_best_price} -
{l s="The best price"}
+
{l s='The best price'}
{/if} {/if}