New [*use loadLangs for translation files*]

This commit is contained in:
Philippe GRAND 2018-03-15 17:14:11 +01:00
parent c83b0bd53c
commit e8df916770
4 changed files with 15 additions and 26 deletions

View File

@ -190,13 +190,8 @@ class pdf_einstein extends ModelePDFCommandes
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
$outputlangs->load("main"); // Translations
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("orders");
$outputlangs->load("deliveries");
$nblignes = count($object->lines); $nblignes = count($object->lines);

View File

@ -66,9 +66,8 @@ class pdf_standard extends ModeleExpenseReport
{ {
global $conf, $langs, $mysoc; global $conf, $langs, $mysoc;
$langs->load("main"); // Translations
$langs->load("trips"); $langs->loadLangs(array("main", "trips", "projects"));
$langs->load("projects");
$this->db = $db; $this->db = $db;
$this->name = ""; $this->name = "";

View File

@ -81,8 +81,8 @@ class pdf_crabe extends ModelePDFFactures
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Translations
$langs->load("bills"); $langs->loadLangs(array("main", "bills"));
$this->db = $db; $this->db = $db;
$this->name = "crabe"; $this->name = "crabe";

View File

@ -138,13 +138,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
$outputlangs->load("main"); // Translations
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "sendings", "deliveries"));
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("deliveries");
$outputlangs->load("sendings");
if ($conf->expedition->dir_output) if ($conf->expedition->dir_output)
{ {