From 75f104de38ea4cb573151d4ff61627abc470fc46 Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Tue, 24 Jan 2012 17:22:49 +0000
Subject: [PATCH] // Fixed #PSTEST-456

---
 classes/pdf/HTMLTemplate.php                      | 2 +-
 classes/pdf/HTMLTemplateOrderReturn.php           | 2 +-
 classes/pdf/HTMLTemplateSupplyOrderForm.php       | 3 ++-
 controllers/admin/AdminTranslationsController.php | 2 +-
 themes/default/pdf/lang/fr.php                    | 5 +++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classes/pdf/HTMLTemplate.php b/classes/pdf/HTMLTemplate.php
index c0ac5ee11..5a5be9250 100755
--- a/classes/pdf/HTMLTemplate.php
+++ b/classes/pdf/HTMLTemplate.php
@@ -166,7 +166,7 @@ abstract class HTMLTemplateCore
 		if (!isset($_LANGPDF) OR !is_array($_LANGPDF))
 			return str_replace('"', '&quot;', $string);
 		$key = md5(str_replace('\'', '\\\'', $string));
-		$str = (key_exists('PDF_invoice'.$key, $_LANGPDF) ? $_LANGPDF['PDF_invoice'.$key] : $string);
+		$str = (key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);
 
 		return $str;
 	}
diff --git a/classes/pdf/HTMLTemplateOrderReturn.php b/classes/pdf/HTMLTemplateOrderReturn.php
index df34f4f72..f4bfa9138 100755
--- a/classes/pdf/HTMLTemplateOrderReturn.php
+++ b/classes/pdf/HTMLTemplateOrderReturn.php
@@ -41,7 +41,7 @@ class HTMLTemplateOrderReturnCore extends HTMLTemplate
 
 		// header informations
 		$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
-		$this->title = 'Order Return '.sprintf('%06d', $this->order_return->id); // TODO
+		$this->title = HTMLTemplateOrderReturn::l('Order Return '.sprintf('%06d', $this->order_return->id); // TODO
 
 		// footer informations
 		$this->shop = new Shop((int)$this->order->id_shop);
diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php
index 8af419d8c..27715c317 100644
--- a/classes/pdf/HTMLTemplateSupplyOrderForm.php
+++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php
@@ -88,7 +88,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
 	 */
     public function getFilename()
     {
-    	return (HTMLTemplateSupplyOrderForm::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
+    	return (self::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
     }
 
     protected function getTaxOrderSummary()
@@ -122,6 +122,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
 	{
 		$this->address = $this->address_warehouse;
 		$free_text = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded ');
+		$free_text .= ' ';
 		$free_text .= HTMLTemplateSupplyOrderForm::l(' DI: Discount included');
 
 		$this->smarty->assign(array(
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 554a641a7..a408b5b88 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1784,7 +1784,7 @@ class AdminTranslationsControllerCore extends AdminController
 		$count = 0;
 		$prefix_key = 'PDF';
 		$tabs_array = array($prefix_key=>array());
-		$regex = '/self::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U';
+		$regex = '/HTMLTemplate.*::l\(\''._PS_TRANS_PATTERN_.'\'[\)|\,]/U';
 		// need to parse PDF.php in order to find $regex and add this to $tabs_array
 		// this has to be done for the core class, and eventually for the override
 		foreach (glob(_PS_CLASS_DIR_.'pdf/'."*.php") as $filename)
diff --git a/themes/default/pdf/lang/fr.php b/themes/default/pdf/lang/fr.php
index c1034cda7..24b7027ae 100644
--- a/themes/default/pdf/lang/fr.php
+++ b/themes/default/pdf/lang/fr.php
@@ -3,6 +3,11 @@
 global $_LANGPDF;
 $_LANGPDF = array();
 $_LANGPDF['submitTranslationsPdf'] = '1';
+$_LANGPDF['PDF065ab3a28ca4f16f55f103adc7d0226f'] = 'Livraison';
+$_LANGPDF['PDF6c2fbe34c186a6b5725d212ad8cd2432'] = 'Facture';
+$_LANGPDF['PDFf771e4a4df40bf061607fdb8e3f140dc'] = 'Bon de commande';
+$_LANGPDF['PDF3a80d6ec5285dd5d3930db30d04e2b9e'] = 'HR : hors remise';
+$_LANGPDF['PDFa58b1c9575ab07c5be819243c96d9c0e'] = 'RC : remise comprise';
 $_LANGPDF['PDF2f2f0f119a907c6c67a3c6fcde0193ab'] = 'Addresse de Livraison';
 $_LANGPDF['PDF28a59051cd90053f87bacd5f1ffbc0b8'] = 'Adresse de Paiement';
 $_LANGPDF['PDFe2f324b87eac820c81e4d4a1105dcddf'] = 'Adresse de Paiement & Livraison';