From 3ddf7259a20046072a5cb23ebc82b07b1be762b8 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 14 May 2012 14:38:07 +0000 Subject: [PATCH] [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() --- .../attribute_generator/content.tpl | 2 +- .../controllers/carts/helpers/view/view.tpl | 2 +- .../customers/helpers/view/view.tpl | 8 +- .../controllers/groups/helpers/form/form.tpl | 2 +- .../controllers/groups/helpers/view/view.tpl | 4 +- .../controllers/import/helpers/form/form.tpl | 2 +- .../template/controllers/login/content.tpl | 2 +- .../controllers/not_found/content.tpl | 2 +- .../controllers/orders/_customized_data.tpl | 2 +- .../controllers/orders/_documents.tpl | 2 +- .../controllers/orders/helpers/view/view.tpl | 2 +- .../referrers/helpers/form/form.tpl | 3 +- .../controllers/return/helpers/form/form.tpl | 2 +- .../helpers/view/translation_errors.tpl | 2 +- .../helpers/view/translation_form.tpl | 2 +- .../helpers/view/translation_mails.tpl | 2 +- .../helpers/view/translation_modules.tpl | 2 +- .../themes/default/template/layout-ajax.tpl | 6 +- admin-dev/themes/default/template/layout.tpl | 4 +- classes/AdminTab.php | 2 +- controllers/admin/AdminAccessController.php | 2 +- .../admin/AdminAttachmentsController.php | 15 +- controllers/admin/AdminCarriersController.php | 2 +- controllers/admin/AdminImportController.php | 2 +- controllers/admin/AdminMetaController.php | 3 +- controllers/admin/AdminOrdersController.php | 2 +- .../admin/AdminPerformanceController.php | 2 +- controllers/admin/AdminProductsController.php | 14 +- .../admin/AdminRequestSqlController.php | 79 +++--- controllers/admin/AdminReturnController.php | 2 +- controllers/admin/AdminScenesController.php | 10 +- controllers/admin/AdminStoresController.php | 2 +- controllers/admin/AdminTabsController.php | 2 +- .../admin/AdminTaxRulesGroupController.php | 2 +- modules/bankwire/translations/es.php | 1 - modules/bankwire/translations/fr.php | 1 - modules/blockbestsellers/translations/es.php | 1 - modules/blockbestsellers/translations/fr.php | 1 - modules/blockcart/translations/es.php | 1 - modules/blockcart/translations/fr.php | 1 - modules/blockcategories/translations/es.php | 1 - modules/blockcategories/translations/fr.php | 1 - modules/blockcms/translations/es.php | 30 +-- modules/blocklayered/es.php | 2 +- modules/blocklink/translations/es.php | 3 - modules/blocknewproducts/translations/es.php | 1 - modules/blocknewproducts/translations/fr.php | 1 - modules/blocknewsletter/translations/fr.php | 1 - modules/blockspecials/translations/es.php | 1 - modules/blockspecials/translations/fr.php | 1 - modules/blocktags/translations/es.php | 1 - modules/blocktags/translations/fr.php | 1 - modules/blockuserinfo/translations/es.php | 8 +- modules/blockviewed/translations/es.php | 1 - modules/blockviewed/translations/fr.php | 1 - modules/blockwishlist/translations/es.php | 1 - modules/blockwishlist/translations/fr.php | 1 - modules/carriercompare/translations/es.php | 1 - modules/cheque/translations/es.php | 1 - modules/cheque/translations/fr.php | 1 - modules/editorial/translations/es.php | 12 +- modules/editorial/translations/fr.php | 12 +- modules/loyalty/translations/es.php | 2 +- modules/loyalty/translations/fr.php | 2 +- .../loyalty/views/templates/front/loyalty.tpl | 2 +- modules/productcomments/translations/es.php | 1 - modules/productcomments/translations/fr.php | 1 - modules/sendtoafriend/translations/es.php | 1 - modules/shopimporter/translations/es.php | 6 - modules/shopimporter/translations/fr.php | 6 - modules/statsbestproducts/translations/es.php | 1 - modules/statscheckup/translations/es.php | 1 - modules/statsproduct/translations/es.php | 2 +- modules/statsstock/translations/es.php | 5 - translations/es/admin.php | 231 ++++-------------- translations/es/errors.php | 10 + translations/fr/admin.php | 122 ++++----- translations/fr/errors.php | 11 + 78 files changed, 246 insertions(+), 441 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl index 8a2be937c..26b69a2ac 100644 --- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl +++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl @@ -65,7 +65,7 @@ {if $generate}
- {$combinations_size} {l s='product(s) successfully created.'} + {l s='%d product(s) successfully created.' sprintf=$combinations_size}
{/if} diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl index b119a0774..c0bcebaf7 100755 --- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl @@ -51,7 +51,7 @@

{l s='Order information'}

{if $order->id} - {l s='Order #'}{$order->id|string_format:"%06d"} + {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}

{l s='Made on:'} {dateFormat date=$order->date_add}



{else} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 667fd577e..02f5d7deb 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -144,7 +144,7 @@
 
{else} - {$customer->firstname} {$customer->lastname} {l s='has never contacted you'} + {l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} {/if} {* display hook specified to this page : AdminCustomers *} @@ -262,7 +262,7 @@
 
{/if} {else} - {$customer->firstname} {$customer->lastname} {l s='has not placed any orders yet'} + {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} {/if} {if $products AND count($products)} @@ -334,7 +334,7 @@ {/foreach} {else} - {$customer->firstname} {$customer->lastname} {l s='has not registered any addresses yet'} + {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} {/if}
 
@@ -362,7 +362,7 @@ {/foreach} {else} - {$customer->firstname} {$customer->lastname} {l s='has no discount vouchers'}. + {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. {/if}
 
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl index 8e8c9910e..d5102de0a 100644 --- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl @@ -171,7 +171,7 @@ {foreach $input['values'] key=key item=category } {$category.path} - {l s='Discount:'} {$category.reduction}{l s='%'} + {l s='Discount: %d%' sprintf=$category.reduction} diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl index bfc31fa81..a0f783c68 100755 --- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl @@ -31,7 +31,7 @@