[-] BO : fix #PSCFV-3893

draison · Sep 4, 2012 · 32490e3 · 32490e3
1 parent 79e6381
commit 32490e3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/controllers/front/PasswordController.php b/controllers/front/PasswordController.php
@@ -85,7 +85,7 @@ public function postProcess()
 					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
@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Ihre Bestellung Nr.{id_order}</td>
+<td style="background-color: #db3484; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Ihre Bestellung Nr.{order_name}</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

diff --git 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
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
-</head>
-<body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Message from {shop_name}</title>
+</head>
+<body>
 <table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
@@ -44,6 +44,6 @@
 <td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
-</table>
-</body>
+</table>
+</body>
 </html>
diff --git a/mails/de/order_conf.html b/mails/de/order_conf.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Message from {shop_name}</title>
-</head>
-<body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Message from {shop_name}</title>
+</head>
+<body>
 	<table style="font-family: Verdana,sans-serif; font-size: 11px; color: #374953; width: 550px;">
 <tbody>
 <tr>
@@ -115,6 +115,6 @@
 <td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: #db3484; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered with <a style="text-decoration: none; color: #374953;" href="http://www.prestashop.com/">PrestaShop&trade;</a></td>
 </tr>
 </tbody>
-</table>
-</body>
+</table>
+</body>
 </html>