From 99c59c8c6bbf2c00743a6eaad027cdac7230767c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Feb 2016 23:01:21 +0100 Subject: [PATCH] Missing translation --- htdocs/admin/receiptprinter.php | 38 +++++++++++++++++--------- htdocs/langs/en_US/receiptprinter.lang | 2 ++ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 5beaacc8515..87fce1f6087 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2013-2016 Laurent Destailleur * Copyright (C) 2015 Frederic France * * This program is free software; you can redistribute it and/or modify @@ -242,10 +242,12 @@ if ($mode == 'config' && $user->admin) print ''; print "\n"; $ret = $printer->listprinters(); + $nbofprinters = count($printer->listprinters); + if ($ret > 0) { setEventMessages($printer->error, $printer->errors, 'errors'); } else { - for ($line=0; $line < count($printer->listprinters); $line++) { + for ($line=0; $line < $nbofprinters; $line++) { $var = !$var; print ''; if ($action=='editprinter' && $printer->listprinters[$line]['rowid']==$printerid) { @@ -282,16 +284,21 @@ if ($mode == 'config' && $user->admin) } } - if ($action!='editprinter') { - print ''; - print ''.$langs->trans("Name").''; - print ''.$langs->trans("Type").''; - print ''.$langs->trans("Profile").''; - print ''.$langs->trans("Parameters").''; - print ''; - print ''; - print ''; - print "\n"; + if ($action!='editprinter') + { + if ($nbofprinters > 0) + { + print ''; + print ''.$langs->trans("Name").''; + print ''.$langs->trans("Type").''; + print ''.$langs->trans("Profile").''; + print ''.$langs->trans("Parameters").''; + print ''; + print ''; + print ''; + print "\n"; + } + print ''; print ''; $ret = $printer->selectTypePrinter(); @@ -307,6 +314,7 @@ if ($mode == 'config' && $user->admin) print ''; dol_fiche_end(); + if ($action!='editprinter') { print '
'; } else { @@ -315,7 +323,9 @@ if ($mode == 'config' && $user->admin) print ''; print '

'; + dol_fiche_head(); + print $langs->trans("ReceiptPrinterTypeDesc")."

\n"; print ''."\n"; print ''; @@ -325,7 +335,9 @@ if ($mode == 'config' && $user->admin) //print ''; print '
'.$langs->trans("CONNECTOR_DUMMY").':'.$langs->trans("CONNECTOR_DUMMY_HELP").'
'.$langs->trans("CONNECTOR_JAVA").':'.$langs->trans("CONNECTOR_JAVA_HELP").'
'; dol_fiche_end(); + print '

'; + dol_fiche_head(); print $langs->trans("ReceiptPrinterProfileDesc")."

\n"; print ''."\n"; @@ -423,13 +435,13 @@ if ($mode == 'template' && $user->admin) } // to remove after test +$object=new stdClass(); $object->date_time = '2015-11-02 22:30:25'; $object->id = 1234; $object->customer_firstname = 'John'; $object->customer_lastname = 'Deuf'; $object->vendor_firstname = 'Jim'; $object->vendor_lastname = 'Big'; - $object->barcode = '3700123862396'; //$printer->sendToPrinter($object, 1, 16); //setEventMessages($printer->error, $printer->errors, 'errors'); diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang index 28b63d7de79..7b52f072eaf 100644 --- a/htdocs/langs/en_US/receiptprinter.lang +++ b/htdocs/langs/en_US/receiptprinter.lang @@ -1,8 +1,10 @@ # Dolibarr language file - Source file is en_US - receiptprinter +ReceiptPrinterSetup=Setup of module ReceiptPrinter PrinterAdded=Printer %s added PrinterUpdated=Printer %s updated PrinterDeleted=Printer %s deleted TestSentToPrinter=Test Sent To Printer %s +ReceiptPrinter=Receipt printers ReceiptPrinterDesc=Setup of printers ReceiptPrinterTemplateDesc=Setup of Templates ReceiptPrinterTypeDesc=Description of Receipt Printer's type