From 12a93524bb675e48c0d1ec63775dd91a77a5c357 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Tue, 4 Sep 2012 07:49:53 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-3893 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17156 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/PasswordController.php | 2 +- mails/de/bankwire.html | 2 +- mails/de/bankwire.txt | 2 +- mails/de/order_changed.html | 18 +++++++++--------- mails/de/order_conf.html | 18 +++++++++--------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php index c43532ea2..24d87f631 100644 --- a/controllers/front/PasswordController.php +++ b/controllers/front/PasswordController.php @@ -85,7 +85,7 @@ class PasswordControllerCore extends FrontController if ($customer->update()) { Hook::exec('actionPasswordRenew', array('customer' => $customer, 'password' => $password)); - if (Mail::Send($this->context->language->id, 'password', Mail::l('Your password'), + if (Mail::Send($this->context->language->id, 'password', Mail::l('Your new admin password'), array( '{email}' => $customer->email, '{lastname}' => $customer->lastname, diff --git a/mails/de/bankwire.html b/mails/de/bankwire.html index f51d7d8ef..498857ff5 100644 --- a/mails/de/bankwire.html +++ b/mails/de/bankwire.html @@ -20,7 +20,7 @@   -Ihre Bestellung Nr.{id_order} +Ihre Bestellung Nr.{order_name}   diff --git a/mails/de/bankwire.txt b/mails/de/bankwire.txt index e8e73a491..824f4cb1e 100644 --- a/mails/de/bankwire.txt +++ b/mails/de/bankwire.txt @@ -1,6 +1,6 @@ Hallo {firstname} {lastname}, -Ihre Bestellung Nr.{id_order} Verlauf +Ihre Bestellung Nr.{order_name} Verlauf Ihre Bestellung wurde erfolgreich aufgenommen und wird, sobald die Zahlung eingegangen ist, versendet. diff --git a/mails/de/order_changed.html b/mails/de/order_changed.html index 5f22d193e..61dc4118d 100644 --- a/mails/de/order_changed.html +++ b/mails/de/order_changed.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -44,6 +44,6 @@ -
{shop_name} powered by PrestaShop™
- + + \ No newline at end of file diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html index 3125061f0..e5923b6e0 100644 --- a/mails/de/order_conf.html +++ b/mails/de/order_conf.html @@ -1,10 +1,10 @@ - - - - - Message from {shop_name} - - + + + + + Message from {shop_name} + + @@ -115,6 +115,6 @@ -
{shop_name} powered with PrestaShop™
- + + \ No newline at end of file