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

Merge pull request #8395 from grandoc/new_branch_15_03_2018

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

15
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -182,21 +182,16 @@ class pdf_einstein extends ModelePDFCommandes
* @param int $hideref Do not show ref * @param int $hideref Do not show ref
* @return int 1=OK, 0=KO * @return int 1=OK, 0=KO
*/ */
function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0) function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
{ {
global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes; global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
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", "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);

9
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -64,11 +64,10 @@ class pdf_standard extends ModeleExpenseReport
*/ */
function __construct($db) function __construct($db)
{ {
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 = "";

6
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -80,9 +80,9 @@ class pdf_crabe extends ModelePDFFactures
function __construct($db) function __construct($db)
{ {
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";

11
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -137,14 +137,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
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", "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)
{ {