diff --git a/modules/loyalty/config.xml b/modules/loyalty/config.xml index 5ae4ee2f0..eed08a452 100755 --- a/modules/loyalty/config.xml +++ b/modules/loyalty/config.xml @@ -1,12 +1,12 @@ loyalty - + - + - Cette action effacera tous les points de fidélité et l'historique des points de tous vos clients, êtes vous sûr ? + Are you sure you want to delete all loyalty points and customer history? 1 0 diff --git a/modules/productcomments/config.xml b/modules/productcomments/config.xml index e45f34f8e..c9413f84f 100755 --- a/modules/productcomments/config.xml +++ b/modules/productcomments/config.xml @@ -1,9 +1,9 @@ productcomments - + - + 1 diff --git a/themes/default/js/product.js b/themes/default/js/product.js index b38b63e38..0d93b0ff0 100644 --- a/themes/default/js/product.js +++ b/themes/default/js/product.js @@ -375,8 +375,16 @@ function updateDisplay() productPriceDisplay = ps_round(productPriceDisplay * group_reduction, 2); var ecotaxAmount = !displayPrice ? ps_round(selectedCombination['ecotax'] * (1 + ecotaxTax_rate / 100), 2) : selectedCombination['ecotax']; - productPriceDisplay += ecotaxAmount; - productPriceWithoutReductionDisplay += ecotaxAmount; + + if (ecotaxAmount != default_eco_tax) + productPriceDisplay += ecotaxAmount - default_eco_tax; + else + productPriceDisplay += ecotaxAmount; + + if (ecotaxAmount != default_eco_tax) + productPriceWithoutReductionDisplay += ecotaxAmount - default_eco_tax; + else + productPriceWithoutReductionDisplay += ecotaxAmount; var our_price = ''; if (productPriceDisplay > 0) { diff --git a/translations/fr.gzip b/translations/fr.gzip new file mode 100644 index 000000000..960058ab7 Binary files /dev/null and b/translations/fr.gzip differ