diff --git a/setup/insert.sql b/setup/insert.sql
index 2baa971ad..5e0b7b81d 100644
--- a/setup/insert.sql
+++ b/setup/insert.sql
@@ -1330,13 +1330,13 @@ INSERT INTO resource_i18n (`id`, `locale`, `title`) VALUES
(26, 'en_US', 'Back-office home page'),
(26, 'fr_FR', 'Page d''acceuil de l''administration');
-INSERT INTO `message` (`id`, `name`, `secured`, `created_at`, `updated_at`, `version`, `version_created_at`, `version_created_by`) VALUES
-(1, 'order_confirmation', NULL, NOW(), NOW(), 2, NOW(), NULL),
-(2, 'lost_password', NULL, NOW(), NOW(), 2, NOW(), NULL);
+
+INSERT INTO `message` (`id`, `name`, `secured`, `text_layout_file_name`, `text_template_file_name`, `html_layout_file_name`, `html_template_file_name`, `created_at`, `updated_at`) VALUES
+(1, 'order_confirmation', NULL, NULL, NULL, NULL, 'order_confirmation.html', NOW(), NOW()),
+(2, 'lost_password', NULL, NULL, NULL, NULL, 'password.html', NOW(), NOW());
INSERT INTO `message_i18n` (`id`, `locale`, `title`, `subject`, `text_message`, `html_message`) VALUES
-(1, 'en_US', 'order confirmation', 'Commande : Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $CODE}\r\n {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n \\r\\n\r\n Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n Quantité : {$QUANTITY}\\r\\n\r\n Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC : {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC : {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale: {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $SYMBOL}\r\n {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n\r\n\r\n
\r\n \r\n courriel de confirmation de commande de {config key="url_site"} \r\n {literal}\r\n \r\n {/literal}\r\n\r\n\r\n\r\n
{config key="store_name"}
\r\n Confirmation de commande
\r\n N° {$REF} du {format_date date=$INVOICE_DATE output="date"}
\r\n \r\n
\r\n \r\n \r\n | Référence | \r\n Désignation | \r\n P.U. € | \r\n Qté | \r\n
\r\n {loop type="order_product" name="order-products" order=$ID}\r\n {if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n {else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n {/if}\r\n \r\n | {$REF} | \r\n {$TITLE}\r\n {ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE} \r\n {/loop}\r\n {/ifloop}\r\n | \r\n {$orderCurrency} {$realTaxedPrice} | \r\n {$QUANTITY} | \r\n
\r\n {/loop}\r\n \r\n \r\n | | \r\n
\r\n \r\n | Montant total avant remise € | \r\n {$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE} | \r\n
\r\n \r\n | Port € | \r\n {$orderCurrency} {$POSTAGE} | \r\n
\r\n \r\n | Montant total de la commande € | \r\n {$orderCurrency} {$TOTAL_TAXED_AMOUNT} | \r\n
\r\n \r\n
\r\n
\r\n
LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}
\r\n {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n
N° de client : {$customer_ref}
\r\n
Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}
\r\n
N° et rue :\r\n {$ADDRESS1}
\r\n
Complément : {$ADDRESS2}\r\n {$ADDRESS3}
\r\n
Code postal : {$ZIPCODE}
\r\n
Ville : {$CITY}
\r\n
Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
\r\n
\r\n {/loop}\r\n
\r\n
FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}
\r\n {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n
N° de client : {$customer_ref}
\r\n
Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}
\r\n
N° et rue :\r\n {$ADDRESS1}
\r\n
Complément : {$ADDRESS2}\r\n {$ADDRESS3}
\r\n
Code postal : {$ZIPCODE}
\r\n
Ville : {$CITY}
\r\n
Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
\r\n
\r\n {/loop}\r\n
Le suivi de votre commande est disponible dans la rubrique mon compte sur {config key="url_site"}
\r\n
\r\n\r\n\r\n{/loop}'),
-(1, 'fr_FR', 'Confirmation de commande', 'Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $CODE}\r\n {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n \\r\\n\r\n Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n Quantité : {$QUANTITY}\\r\\n\r\n Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC : {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC : {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale: {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $SYMBOL}\r\n {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n\r\n\r\n\r\n \r\n courriel de confirmation de commande de {config key="url_site"} \r\n {literal}\r\n \r\n {/literal}\r\n\r\n\r\n\r\n
{config key="store_name"}
\r\n Confirmation de commande
\r\n N° {$REF} du {format_date date=$INVOICE_DATE output="date"}
\r\n \r\n
\r\n \r\n \r\n | Référence | \r\n Désignation | \r\n P.U. € | \r\n Qté | \r\n
\r\n {loop type="order_product" name="order-products" order=$ID}\r\n {if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n {else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n {/if}\r\n \r\n | {$REF} | \r\n {$TITLE}\r\n {ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE} \r\n {/loop}\r\n {/ifloop}\r\n | \r\n {$orderCurrency} {$realTaxedPrice} | \r\n {$QUANTITY} | \r\n
\r\n {/loop}\r\n \r\n \r\n | | \r\n
\r\n \r\n | Montant total avant remise € | \r\n {$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE} | \r\n
\r\n \r\n | Port € | \r\n {$orderCurrency} {$POSTAGE} | \r\n
\r\n \r\n | Montant total de la commande € | \r\n {$orderCurrency} {$TOTAL_TAXED_AMOUNT} | \r\n
\r\n \r\n
\r\n
\r\n
LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}
\r\n {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n
N° de client : {$customer_ref}
\r\n
Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}
\r\n
N° et rue :\r\n {$ADDRESS1}
\r\n
Complément : {$ADDRESS2}\r\n {$ADDRESS3}
\r\n
Code postal : {$ZIPCODE}
\r\n
Ville : {$CITY}
\r\n
Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
\r\n
\r\n {/loop}\r\n
\r\n
FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}
\r\n {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n
N° de client : {$customer_ref}
\r\n
Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}
\r\n
N° et rue :\r\n {$ADDRESS1}
\r\n
Complément : {$ADDRESS2}\r\n {$ADDRESS3}
\r\n
Code postal : {$ZIPCODE}
\r\n
Ville : {$CITY}
\r\n
Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}
\r\n
\r\n {/loop}\r\n
Le suivi de votre commande est disponible dans la rubrique mon compte sur {config key="url_site"}
\r\n
\r\n\r\n\r\n{/loop}'),
-(2, 'en_US', 'Your new password', 'Your new password', 'Your new passord is : {$password}', '\r\n\r\n\r\n\r\nchanging password email for {config key="urlsite"} \r\n{literal}\r\n\r\n{/literal}\r\n\r\n\r\n\r\n
\r\n
{config key="store_name"}
\r\nChangement de mot de passe
\r\n You have lost your password
\r\nYour new password is {$password}.
\r\n\r\n
\r\nVous pouvez à présent vous connecter sur {config key="urlsite"}.
Please, change this password after your first connection
\r\n\r\n'),
-(2, 'fr_FR', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe est : {$password}', '\r\n\r\n\r\n\r\ncourriel de confirmation de changement de mot de passe de {config key="urlsite"} \r\n{literal}\r\n\r\n{/literal}\r\n\r\n\r\n\r\n
\r\n
{config key="store_name"}
\r\nChangement de mot de passe
\r\n Vous avez perdu votre mot de passe.
\r\nVotre nouveau mot de passe est {$password}.
\r\n\r\n
\r\nVous pouvez à présent vous connecter sur {config key="urlsite"}.
N''oubliez pas de modifier votre mot de passe.
\r\n\r\n');
-
+(1, 'en_US', 'order confirmation', 'Order : {$order_ref}', '{assign var="order_id" value=1}\\r\\n\\r\\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\\r\\n {loop name="currency.order" type="currency" id=$CURRENCY}\\r\\n {assign "orderCurrency" $CODE}\\r\\n {/loop}\\r\\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\\r\\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\\\r\\\\n\\r\\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\\\r\\\\n\\r\\n{$ZIPCODE} {$CITY}\\\\r\\\\n\\r\\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\\\r\\\\n\\r\\n{/loop}\\r\\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\\\r\\\\n\\\\r\\\\n\\r\\nLes articles commandés:\\\\r\\\\n\\r\\n{loop type="order_product" name="order-products" order=$ID}\\r\\n{if $WAS_IN_PROMO == 1}\\r\\n {assign "realPrice" $PROMO_PRICE}\\r\\n {assign "realTax" $PROMO_PRICE_TAX}\\r\\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\\r\\n{else}\\r\\n {assign "realPrice" $PRICE}\\r\\n {assign "realTax" $PRICE_TAX}\\r\\n {assign "realTaxedPrice" $TAXED_PRICE}\\r\\n{/if}\\r\\n \\\\r\\\\n\\r\\n Article : {$TITLE}\\r\\n{ifloop rel="combinations"}\\r\\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\\r\\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\\\r\\\\n\\r\\n{/loop}\\r\\n{/ifloop}\\\\r\\\\n\\r\\n Quantité : {$QUANTITY}\\\\r\\\\n\\r\\n Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\\\r\\\\n\\r\\n{/loop}\\r\\n\\\\r\\\\n-----------------------------------------\\\\r\\\\n\\r\\nMontant total TTC : {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\\\r\\\\n\\r\\nFrais de port TTC : {$POSTAGE} {$orderCurrency} \\\\r\\\\n\\r\\nSomme totale: {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\\\r\\\\n\\r\\n==================================\\\\r\\\\n\\\\r\\\\n\\r\\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\\r\\n{/loop}', NULL),
+(1, 'fr_FR', 'Confirmation de commande', 'Commande : {$order_ref}', '{assign var="order_id" value=1}\\r\\n\\r\\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\\r\\n {loop name="currency.order" type="currency" id=$CURRENCY}\\r\\n {assign "orderCurrency" $CODE}\\r\\n {/loop}\\r\\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\\r\\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\\\r\\\\n\\r\\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\\\r\\\\n\\r\\n{$ZIPCODE} {$CITY}\\\\r\\\\n\\r\\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\\\r\\\\n\\r\\n{/loop}\\r\\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\\\r\\\\n\\\\r\\\\n\\r\\nLes articles commandés:\\\\r\\\\n\\r\\n{loop type="order_product" name="order-products" order=$ID}\\r\\n{if $WAS_IN_PROMO == 1}\\r\\n {assign "realPrice" $PROMO_PRICE}\\r\\n {assign "realTax" $PROMO_PRICE_TAX}\\r\\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\\r\\n{else}\\r\\n {assign "realPrice" $PRICE}\\r\\n {assign "realTax" $PRICE_TAX}\\r\\n {assign "realTaxedPrice" $TAXED_PRICE}\\r\\n{/if}\\r\\n \\\\r\\\\n\\r\\n Article : {$TITLE}\\r\\n{ifloop rel="combinations"}\\r\\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\\r\\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\\\r\\\\n\\r\\n{/loop}\\r\\n{/ifloop}\\\\r\\\\n\\r\\n Quantité : {$QUANTITY}\\\\r\\\\n\\r\\n Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\\\r\\\\n\\r\\n{/loop}\\r\\n\\\\r\\\\n-----------------------------------------\\\\r\\\\n\\r\\nMontant total TTC : {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\\\r\\\\n\\r\\nFrais de port TTC : {$POSTAGE} {$orderCurrency} \\\\r\\\\n\\r\\nSomme totale: {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\\\r\\\\n\\r\\n==================================\\\\r\\\\n\\\\r\\\\n\\r\\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\\r\\n{/loop}', NULL),
+(2, 'en_US', 'Your new password', 'Your new password', 'Your new passord is : {$password}', NULL),
+(2, 'fr_FR', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe est : {$password}', NULL);
diff --git a/templates/email/default/I18n/en_US.php b/templates/email/default/I18n/en_US.php
index 6926889c9..36e03c8cd 100644
--- a/templates/email/default/I18n/en_US.php
+++ b/templates/email/default/I18n/en_US.php
@@ -9,12 +9,15 @@ return array(
'Email not displaying correctly?' => 'Email not displaying correctly?',
'For any questions, or concerns, feel free to contact %mail.' => 'For any questions, or concerns, feel free to contact %mail.',
'Here are the details of your purchase:' => 'Here are the details of your purchase:',
+ 'Hi there' => 'Hi there',
+ 'Kind regards' => 'Kind regards',
'Order Number:' => 'Order Number:',
'Order Total' => 'Order Total',
'Order Total:' => 'Order Total:',
'Our contact us at:' => 'Our contact us at:',
'Our mailing address is:' => 'Our mailing address is:',
'Paid With:' => 'Paid With:',
+ 'Password' => 'Password',
'Purchase Date:' => 'Purchase Date:',
'Shipping:' => 'Shipping:',
'Support' => 'Support',
@@ -23,5 +26,9 @@ return array(
'Thelia V2' => 'Thelia V2',
'Total' => 'Total',
'View it in your browser' => 'View it in your browser',
+ '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',
+ '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/es_ES.php b/templates/email/default/I18n/es_ES.php
index 115f84691..df9b7a9bf 100644
--- a/templates/email/default/I18n/es_ES.php
+++ b/templates/email/default/I18n/es_ES.php
@@ -8,11 +8,14 @@ return array(
'Delivery method:' => 'entraga con : ',
'Email not displaying correctly?' => 'No puedes ver correctamente el mail ?',
'Here are the details of your purchase:' => 'Detalles del encarga',
+ 'Hi there' => 'Holà',
+ 'Kind regards' => 'Gracias',
'Order Number:' => 'Entraga numero',
'Order Total' => 'Total de la entraga',
'Order Total:' => 'Total de la entraga',
'Our mailing address is:' => 'Nuestra dirección',
'Paid With:' => 'pagado con : ',
+ 'Password' => 'contraseña',
'Shipping:' => 'envio',
'Support' => 'Support',
'Thank you for your order!' => 'Graciàs por su encarga',
@@ -20,5 +23,8 @@ return array(
'Thelia V2' => 'Thelia V2',
'Total' => 'Total',
'View it in your browser' => 'Ver en el navegador ',
+ 'You can change your password in your user account by opening the "Change my password" link under your personal information' => 'Puedes cambiar tu contraseña en tu cuenta',
+ 'Your new password is' => 'la nueva contraseña es',
'Your order confirmation Nº %ref' => 'Numero de encarga : %ref',
+ 'Your password for %store' => 'contraseña por %store',
);
diff --git a/templates/email/default/I18n/fr_FR.php b/templates/email/default/I18n/fr_FR.php
index f7ef82b3e..7ef4e04d5 100644
--- a/templates/email/default/I18n/fr_FR.php
+++ b/templates/email/default/I18n/fr_FR.php
@@ -9,12 +9,15 @@ return array(
'Email not displaying correctly?' => 'Le mail ne s\'affiche pas correctement ?',
'For any questions, or concerns, feel free to contact %mail.' => 'Pour toutes questions contactez nous par mail : %mail.',
'Here are the details of your purchase:' => 'Voici les détails de votre commande',
+ 'Hi there' => 'Bonjour',
+ 'Kind regards' => 'Cordialement',
'Order Number:' => 'Commande N° : ',
'Order Total' => 'Total de la commande',
'Order Total:' => 'Total de la commande : ',
'Our contact us at:' => 'Contactez nous au',
'Our mailing address is:' => 'Adresse postale',
'Paid With:' => 'Payé par : ',
+ 'Password' => 'Mot de passe',
'Purchase Date:' => 'Date d\'achat : ',
'Shipping:' => 'Frais de livraison',
'Support' => 'SAV',
@@ -23,5 +26,9 @@ return array(
'Thelia V2' => 'Thelia V2',
'Total' => 'Total',
'View it in your browser' => 'Voir dans le navigateur',
+ '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',
'Your order confirmation Nº %ref' => 'Confirmation de commande N° %ref',
+ 'Your password for %store' => 'Votre mot de passe pour %store',
);
diff --git a/templates/email/default/password.html b/templates/email/default/password.html
new file mode 100644
index 000000000..88e4c2247
--- /dev/null
+++ b/templates/email/default/password.html
@@ -0,0 +1,20 @@
+{extends file="email-layout.tpl"}
+
+{* Open in browser *}
+{block name="browser"}{/block}
+
+{* Subject *}
+{block name="email-subject"}{intl l="Your password for %store" store={config key="store_name"}}{/block}
+
+{* Title *}
+{block name="email-title"}{intl l="Password"}{/block}
+
+{* Content *}
+{block name="email-content"}
+ {intl l="Hi there"},
+ {intl l="You have requested a new password for your account"}.
+ {intl l="Your new password is"} : {$password}
+ {intl l='You can change your password in your user account by opening the "Change my password" link under your personal information'}.
+ {intl l='Kind regards'},
+ - {config key="store_name"}
+{/block}