diff --git a/templates/email/default/I18n/en_US.php b/templates/email/default/I18n/en_US.php index 36e03c8cd..8e5c207ac 100644 --- a/templates/email/default/I18n/en_US.php +++ b/templates/email/default/I18n/en_US.php @@ -18,6 +18,7 @@ return array( 'Our mailing address is:' => 'Our mailing address is:', 'Paid With:' => 'Paid With:', 'Password' => 'Password', + 'Price in' => 'Price in', 'Purchase Date:' => 'Purchase Date:', 'Shipping:' => 'Shipping:', 'Support' => 'Support', @@ -26,8 +27,9 @@ return array( 'Thelia V2' => 'Thelia V2', 'Total' => 'Total', 'View it in your browser' => 'View it in your browser', + 'What You Purchased' => 'What You Purchased', 'You can change your password in your user account by opening the "Change my password" link under your personal information' => 'You can change your password in your user account by opening the "Change my password" link under your personal information', - 'You have requested a new password for your Thelia V2 account' => 'You have requested a new password for your Thelia V2 account', + 'You have requested a new password for your account' => 'You have requested a new password for your account', 'Your new password is' => 'Your new password is', 'Your order confirmation Nº %ref' => 'Your order confirmation Nº %ref', 'Your password for %store' => 'Your password for %store', diff --git a/templates/email/default/I18n/fr_FR.php b/templates/email/default/I18n/fr_FR.php index 7ef4e04d5..9e24f4495 100644 --- a/templates/email/default/I18n/fr_FR.php +++ b/templates/email/default/I18n/fr_FR.php @@ -18,6 +18,7 @@ return array( 'Our mailing address is:' => 'Adresse postale', 'Paid With:' => 'Payé par : ', 'Password' => 'Mot de passe', + 'Price in' => 'Prix en', 'Purchase Date:' => 'Date d\'achat : ', 'Shipping:' => 'Frais de livraison', 'Support' => 'SAV', @@ -26,6 +27,7 @@ return array( 'Thelia V2' => 'Thelia V2', 'Total' => 'Total', 'View it in your browser' => 'Voir dans le navigateur', + 'What You Purchased' => 'Ce que vous avez acheté', 'You can change your password in your user account by opening the "Change my password" link under your personal information' => 'Vous pouvez changer votre mot de passe dans votre espace client', 'You have requested a new password for your account' => 'Vous avez demandé un nouveau mot de passe', 'Your new password is' => 'Votre nouveau mot de passe est', diff --git a/templates/email/default/order_confirmation.html b/templates/email/default/order_confirmation.html index 8a8e26860..4901870fb 100644 --- a/templates/email/default/order_confirmation.html +++ b/templates/email/default/order_confirmation.html @@ -62,8 +62,8 @@ - - + + {loop type="order_product" name="order-products" order=$ID} {if $WAS_IN_PROMO == 1} @@ -112,10 +112,11 @@ {config key="store_name"}
{config key="store_address1"}
{config key="store_zipcode"}, {config key="store_city"}
- {loop type="country" name="store_country" id={config key="store_country"}} - {$TITLE} - {/loop} - + {if {config key="store_country"}} + {loop type="country" name="store_country" id={config key="store_country"}} + {$TITLE} + {/loop} + {/if}

{intl l="Thanks"}
diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php index faa75085e..fdfc48491 100755 --- a/templates/pdf/default/I18n/fr_FR.php +++ b/templates/pdf/default/I18n/fr_FR.php @@ -14,7 +14,7 @@ return array( 'Ref' => 'Ref', 'THANK YOU' => 'MERCI', 'Tax' => 'Taxes', - 'Taxed total' => 'Montant total des taxes', + 'Taxed total' => 'Total TTC', 'Total' => 'Total', 'Total with tax' => 'Total TTC', 'Total without tax' => 'Total HT', diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html index 8ff2f6ae2..3cad6a9b5 100644 --- a/templates/pdf/default/delivery.html +++ b/templates/pdf/default/delivery.html @@ -135,7 +135,7 @@ {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
+ {$ZIPCODE} {$CITY}
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {/loop}

@@ -146,7 +146,7 @@ {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
+ {$ZIPCODE} {$CITY}
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {/loop}

diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html index 6117a04b8..e6def76e1 100644 --- a/templates/pdf/default/invoice.html +++ b/templates/pdf/default/invoice.html @@ -108,7 +108,7 @@ {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
+ {$ZIPCODE} {$CITY}
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {/loop}

@@ -119,7 +119,7 @@ {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
+ {$ZIPCODE} {$CITY}
{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} {/loop}

What You PurchasedPrice in {$orderCurrencyIsoCode}{intl l="What You Purchased"}{intl l="Price in"} {$orderCurrencyIsoCode}