lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8405 from grandoc/develop

Browse Source 
New [*use loadLangs for translation files*]
This commit is contained in:
Laurent Destailleur 2018-03-18 12:17:13 +01:00 committed by GitHub
commit e3c0fcc3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -46,11 +46,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
function __construct($db) function __construct($db)
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Translations
$langs->load("bank"); $langs->loadLangs(array("main", "bank", "withdrawals", "companies"));
$langs->load("withdrawals");
$langs->load("companies");
$this->db = $db; $this->db = $db;
$this->name = "sepamandate"; $this->name = "sepamandate";
@ -104,13 +102,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
// 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", "withdrawals", "companies", "projects", "bills"));
$outputlangs->load("companies");
$outputlangs->load("projects");
$outputlangs->load("withdrawals");
$outputlangs->load("bills");
if (! empty($conf->bank->dir_output)) if (! empty($conf->bank->dir_output))
{ {