dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed #PSTEST-456

Browse Source
This commit is contained in:
bMancone
2012-01-24 17:22:49 +00:00
parent 39fb3fed96
commit 75f104de38
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplate.php
+1 -1
View File
@@ -166,7 +166,7 @@ abstract class HTMLTemplateCore
if (!isset($_LANGPDF) OR !is_array($_LANGPDF))
return str_replace('"', '"', $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;
}
classes/pdf/HTMLTemplateOrderReturn.php
+1 -1
View File
@@ -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);
classes/pdf/HTMLTemplateSupplyOrderForm.php
+2 -1
View File
@@ -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(
controllers/admin/AdminTranslationsController.php
+1 -1
View File
@@ -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)
themes/default/pdf/lang/fr.php
+5
View File
@@ -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';