Merge pull request #377 from lunika/mail

Mail

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',

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',

templates/email/default/order_confirmation.html

@@ -62,8 +62,8 @@
 
         <table width="100%" border="0" cellpadding="0" cellspacing="0" style="font-size:13px;line-height:2em">
             <tr style="color:#999;font-size:11px">
-                <td style="color:#999;border-bottom:1px solid #000">What You Purchased</td>
+                <td style="color:#999;border-bottom:1px solid #000">{intl l="What You Purchased"}</td>
-                <td align="right" style="color:#999;border-bottom:1px solid #000">Price in {$orderCurrencyIsoCode}</td>
+                <td align="right" style="color:#999;border-bottom:1px solid #000">{intl l="Price in"} {$orderCurrencyIsoCode}</td>
             </tr>
             {loop type="order_product" name="order-products" order=$ID}
             {if $WAS_IN_PROMO == 1}
@@ -112,10 +112,11 @@
     {config key="store_name"}<br>
     {config key="store_address1"}<br />
     {config key="store_zipcode"}, {config key="store_city"}<br />
+    {if {config key="store_country"}}
         {loop type="country" name="store_country" id={config key="store_country"}}
             {$TITLE}
         {/loop}
-
+    {/if}
     <br />
     <br />
     {intl l="Thanks"}<br />

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',

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}<br />
                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                {$ZIPCODE} {$COUNTRY}<br/>
+                {$ZIPCODE} {$CITY}<br/>
                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                 {/loop}
             </p>
@@ -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}<br />
                 {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                {$ZIPCODE} {$COUNTRY}<br/>
+                {$ZIPCODE} {$CITY}<br/>
                 {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                 {/loop}
             </p>

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}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                    {$ZIPCODE} {$COUNTRY}<br/>
+                    {$ZIPCODE} {$CITY}<br/>
                     {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                     {/loop}
                 </p>
@@ -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}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
-                    {$ZIPCODE} {$COUNTRY}<br/>
+                    {$ZIPCODE} {$CITY}<br/>
                     {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
                     {/loop}
                 </p>