diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php index 4961c3e29f29e367d6873813acf0392d53a2e91b..62b61e531bfb5e163f83887c53fb63a81d5a0dda 100644 --- a/htdocs/core/actions_printing.inc.php +++ b/htdocs/core/actions_printing.inc.php @@ -64,7 +64,7 @@ if ($action == 'print_file' and $user->rights->printing->read) { //print '<pre>'.print_r($printer->errors, true).'</pre>'; setEventMessages($printer->error, $printer->errors); - setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null); + setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null); } } catch(Exception $e) diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index 539db0ddee5103f8711d36055e6da4082939fc45..9268b8f89f99a5e48d94c5f63b586fdd0fae6884 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -318,7 +318,7 @@ class printing_printgcp extends PrintingDriver else dol_print_error($this->db); $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype); - $this->errors = 'PRINTGCP: '.mb_convert_encoding($ret['errormessage'], "UTF-8"); + $this->errors = 'PRINTGCP: '.$ret['errormessage']; if ($ret['status']!=1) $error++; return $error; } diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang index 36f4e75f23a08f72b9a6cbe9693c45dd83929de0..cc26879e4f1fb8ba7306d0106bd98095defcd5e6 100644 --- a/htdocs/langs/en_US/printing.lang +++ b/htdocs/langs/en_US/printing.lang @@ -9,6 +9,7 @@ PrintingDriverDesc=Configuration variables for printing driver. ListDrivers=List of drivers PrintTestDesc=List of Printers. FileWasSentToPrinter=File %s was sent to printer +ViaModule=via the module NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s. PleaseSelectaDriverfromList=Please select a driver from list. PleaseConfigureDriverfromList=Please configure the selected driver from list.