From 940f886fd3e1303f84d25727fef95fd16da97e72 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 14 Dec 2011 14:01:41 +0000 Subject: [PATCH] // translation && fixed small bugs in AdminProductsController git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11204 b9a71923-0436-4b27-9f14-aed3839534dd --- .../template/helper/list/list_header.tpl | 4 +- .../themes/template/products/associations.tpl | 26 +- .../themes/template/products/combinations.tpl | 4 +- admin-dev/themes/template/products/form.tpl | 2 +- .../themes/template/products/informations.tpl | 22 +- admin-dev/themes/template/products/prices.tpl | 14 +- .../themes/template/products/shipping.tpl | 8 +- classes/helper/HelperList.php | 29 +- controllers/admin/AdminProductsController.php | 5 +- translations/fr/admin.php | 355 ++++++++++-------- 10 files changed, 255 insertions(+), 214 deletions(-) diff --git a/admin-dev/themes/template/helper/list/list_header.tpl b/admin-dev/themes/template/helper/list/list_header.tpl index 0079d85d8..8316cd40b 100644 --- a/admin-dev/themes/template/helper/list/list_header.tpl +++ b/admin-dev/themes/template/helper/list/list_header.tpl @@ -148,6 +148,8 @@
+ {else} +
  {/if} {/foreach} @@ -161,7 +163,7 @@ {/if} {if $has_actions} - {l s='Actions'} + {l s='Actions'}
  {/if} {if !$simple_header} diff --git a/admin-dev/themes/template/products/associations.tpl b/admin-dev/themes/template/products/associations.tpl index 28132ebb4..9e082eca0 100644 --- a/admin-dev/themes/template/products/associations.tpl +++ b/admin-dev/themes/template/products/associations.tpl @@ -61,7 +61,7 @@ {if $feature_shop_active} {* @todo use asso_shop from Helper *} - + {$displayAssoShop} {/if} @@ -71,19 +71,25 @@ -
- {* @todo : donot use 3 foreach, but assign var *} - {foreach from=$accessories item=accessory} - {$accessory.name|htmlentitiesUTF8}{if !empty($accessory.reference)}{$accessory.reference}{/if}
- {/foreach} -
-

{l s='Begin typing the first letters of the product name, then select the product from the drop-down list:'}

- - {l s='Add an accessory'} +

+ {l s='Begin typing the first letters of the product name, then select the product from the drop-down list:'} + +

+ + +
+
+ {* @todo : donot use 3 foreach, but assign var *} + {foreach from=$accessories item=accessory} + {$accessory.name|htmlentitiesUTF8}{if !empty($accessory.reference)}{$accessory.reference}{/if} + + +
+ {/foreach}
diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl index aa1ac4c7f..9e7aed62e 100644 --- a/admin-dev/themes/template/products/combinations.tpl +++ b/admin-dev/themes/template/products/combinations.tpl @@ -156,11 +156,11 @@
- + {if $up_filename} {/if} diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl index 3417e57d5..dcb7cd280 100644 --- a/admin-dev/themes/template/products/form.tpl +++ b/admin-dev/themes/template/products/form.tpl @@ -51,7 +51,7 @@ count = stripHTML(textarea_value).length; rest = max - count; if (rest < 0) - textarea.parent('div').find('span.counter').html('{l s="Maximum"} '+max+' {l s=' characters'} : '+rest+''); + textarea.parent('div').find('span.counter').html('{l s='Maximum'} '+max+' {l s=' characters'} : '+rest+''); else textarea.parent('div').find('span.counter').html(' '); } diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl index 9b854d8e2..c99215924 100644 --- a/admin-dev/themes/template/products/informations.tpl +++ b/admin-dev/themes/template/products/informations.tpl @@ -83,7 +83,7 @@ {* global information *} - + - + - + - + @@ -120,7 +120,7 @@ {* status informations *}
{foreach from=$languages item=language}
@@ -98,20 +98,20 @@
- {l s='Special characters allowed:' }.-_#\  + {l s='Special characters allowed:'}.-_#\ 
{l s='(Europe, Japan)'}
{l s='(US, Canada)'}
- + active}style="display:none"{/if} > - +
active}checked="checked" {/if} />
available_for_order}checked="checked"{/if} />