From 16d860b3f7156fd87779c50144c37a973e9560b6 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Mon, 8 Dec 2014 22:17:28 +0100 Subject: [PATCH] Lang Correction --- htdocs/core/class/html.formfile.class.php | 6 +++--- htdocs/core/modules/printing/printgcp.modules.php | 2 ++ htdocs/core/modules/printing/printipp.modules.php | 2 ++ htdocs/langs/en_US/main.lang | 1 + htdocs/printing/admin/printing.php | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 5081af493d5..c67a3196b33 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -614,9 +614,9 @@ class FormFile if ($printer) { //$out.= ''; - $out.= ' '.img_picto($langs->trans("Print"),'printer.png').''; + $out.= ' '.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').''; } if ($morepicto) { diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index de414b9d18b..ab0ed428a69 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -1,5 +1,7 @@ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php index 7f789b859eb..013d9922e10 100644 --- a/htdocs/core/modules/printing/printipp.modules.php +++ b/htdocs/core/modules/printing/printipp.modules.php @@ -1,5 +1,7 @@ + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index cbc4deb40d7..4b27d7b285d 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -683,6 +683,7 @@ XMoreLines=%s line(s) hidden PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh +PrintFile=Print File %s # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index f12c235dc2c..9db8a55af82 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -123,6 +123,7 @@ if ($mode == 'setup' && $user->admin) if (! empty($driver)) { require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php'; $classname = 'printing_'.$driver; + $langs->load($driver); $printer = new $classname($db); //print '
'.print_r($printer, true).'
'; $i=0; @@ -211,6 +212,7 @@ if ($mode == 'test' && $user->admin) if (! empty($driver)) { require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php'; $classname = 'printing_'.$driver; + $langs->load($driver); $printer = new $classname($db); //print '
'.print_r($printer, true).'
'; print $printer->listAvailablePrinters();