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

Translate

Browse Source
This commit is contained in:
Alexandre SPANGARO 2019-09-20 07:02:14 +02:00
parent b3807bbb20
commit 278312f38f
40 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/adherents/card.php
View File

@ -638,7 +638,7 @@ if (empty($reshook))
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -719,7 +719,7 @@ if (empty($reshook))
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -1483,7 +1483,7 @@ else
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;
@ -1544,7 +1544,7 @@ else
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

4
htdocs/adherents/subscription.php
View File

@ -360,7 +360,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
@ -1093,7 +1093,7 @@ if ($rowid > 0)
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

2
htdocs/admin/bank.php
View File

@ -49,7 +49,7 @@ $type = 'bankaccount';
* Actions
*/
//Order display of bank account
// Order display of bank account
if ($action == 'setbankorder') {
if (dolibarr_set_const($db, "BANK_SHOW_ORDER_OPTION", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity) > 0)
{

3
htdocs/admin/chequereceipts.php
View File

@ -91,7 +91,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
}
/*
* view
* View
*/
$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
@ -233,7 +233,6 @@ print '<br>';
/*
* Other options
*
*/
print load_fiche_titre($langs->trans("OtherOptions"), '', '');

2
htdocs/admin/delais.php
View File

@ -222,7 +222,7 @@ if ($action == 'edit')
else
{
/*
* Affichage des parametres
* Show parameters
*/
print '<table class="noborder" width="100%">';

14
htdocs/admin/dict.php
View File

@ -251,7 +251,7 @@ $tabsqlsort[35]="c.label ASC";
$tabsqlsort[36]="r.fk_c_exp_tax_cat ASC, r.range_ik ASC";
$tabsqlsort[37]="r.unit_type ASC, r.scale ASC, r.code ASC";
// Nom des champs en resultat de select pour affichage du dictionnaire
// Field names in select result for dictionary display
$tabfield=array();
$tabfield[1] = "code,libelle,country";
$tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,region,country_code-country"
@ -291,7 +291,7 @@ $tabfield[35]= "label";
$tabfield[36]= "range_ik,fk_c_exp_tax_cat";
$tabfield[37]= "code,label,short_label,unit_type,scale";
// Nom des champs d'edition pour modification d'un enregistrement
// Edit field names for editing a record
$tabfieldvalue=array();
$tabfieldvalue[1] = "code,libelle,country";
$tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region"
@ -331,7 +331,7 @@ $tabfieldvalue[35]= "label";
$tabfieldvalue[36]= "range_ik,fk_c_exp_tax_cat";
$tabfieldvalue[37]= "code,label,short_label,unit_type,scale";
// Nom des champs dans la table pour insertion d'un enregistrement
// Field names in the table for inserting a record
$tabfieldinsert=array();
$tabfieldinsert[1] = "code,libelle,fk_pays";
$tabfieldinsert[2] = "code_departement,nom,fk_region";
@ -1283,8 +1283,8 @@ if ($id)
{
if ($fieldlist[$field] == 'entity') continue;
// Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees
// Determines the name of the field in relation to the possible names
// in data dictionaries
$showfield=1; // By defaut
$align="left";
$cssprefix='';
@ -1850,14 +1850,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
print '</td>';
}
// Le type de l'element (pour les type de contact)
// The type of the element (for contact types)
elseif ($fieldlist[$field] == 'element')
{
print '<td>';
print $form->selectarray('element', $elementList, (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''));
print '</td>';
}
// La source de l'element (pour les type de contact)
// The source of the element (for contact types)
elseif ($fieldlist[$field] == 'source')
{
print '<td>';

2
htdocs/admin/emailcollector_card.php
View File

@ -36,7 +36,7 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
if (!$user->admin) accessforbidden();
if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("admin", "mails", "other"));
// Get parameters

2
htdocs/admin/emailcollector_list.php
View File

@ -34,7 +34,7 @@ dol_include_once('/emailcollector/class/emailcollector.class.php');
if (!$user->admin) accessforbidden();
if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("admin", "other"));
$action = GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...

2
htdocs/admin/expensereport.php
View File

@ -496,7 +496,7 @@ else
}
print '</td></tr>'."\n";
//Use draft Watermark
// Use draft Watermark
print '<tr class="oddeven"><td colspan="2">';
print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';

2
htdocs/core/modules/action/rapport.pdf.php
View File

@ -117,7 +117,7 @@ class CommActionRapport
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
$dir = $conf->agenda->dir_temp."/";

2
htdocs/core/modules/bank/doc/pdf_ban.modules.php
View File

@ -106,7 +106,7 @@ class pdf_ban extends ModeleBankAccountDoc
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->bank->dir_output)

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

@ -109,7 +109,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
if (! empty($conf->bank->dir_output))

6
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@ -49,7 +49,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "bills"));
$this->db = $db;
@ -98,7 +98,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$sav_charset_output=$outputlangs->charset_output;
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
$dir = $_dir . "/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
@ -225,7 +225,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
global $langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("compta", "banks"));
$title = $outputlangs->transnoentities("CheckReceipt");

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

@ -1236,7 +1236,7 @@ class pdf_einstein extends ModelePDFCommandes
// phpcs:enable
global $conf,$langs,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

2
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -217,7 +217,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->contrat->dir_output)

4
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -181,7 +181,7 @@ class pdf_strato extends ModelePDFContract
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
if ($conf->contrat->dir_output)
@ -602,7 +602,7 @@ class pdf_strato extends ModelePDFContract
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "contract", "companies"));
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);

2
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -83,7 +83,7 @@ class html_cerfafr extends ModeleDon
if (! is_object($outputlangs)) $outputlangs=$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
$currency = !empty($currency) ? $currency : $conf->currency;

2
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -227,7 +227,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->expedition->dir_output."/sending")

2
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -165,7 +165,7 @@ class pdf_espadon extends ModelePdfExpedition
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
$nblines = count($object->lines);

2
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -165,7 +165,7 @@ class pdf_merou extends ModelePdfExpedition
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
if ($conf->expedition->dir_output)

2
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -195,7 +195,7 @@ class pdf_rouget extends ModelePdfExpedition
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
$nblines = count($object->lines);

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

@ -217,7 +217,7 @@ class pdf_standard extends ModeleExpenseReport
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
$nblines = count($object->lines);
@ -635,7 +635,7 @@ class pdf_standard extends ModeleExpenseReport
// global $conf, $langs, $hookmanager;
global $user, $langs, $conf, $mysoc, $db, $hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "trips", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

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

@ -243,7 +243,7 @@ class pdf_crabe extends ModelePDFFactures
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
$nblines = count($object->lines);
@ -1351,7 +1351,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
// Retained warranty
if( !empty($object->situation_final) && ( $object->type == Facture::TYPE_SITUATION && (!empty($object->retained_warranty) ) ) )
{
@ -1367,29 +1367,29 @@ class pdf_crabe extends ModelePDFFactures
}
}
}
if($displayWarranty){
$pdf->SetTextColor(40, 40, 40);
$pdf->SetFillColor(255, 255, 255);
$retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty ;
// Billed - retained warranty
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')), $useborder, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($billedWithRetainedWarranty), $useborder, 'R', 1);
// retained warranty
$index++;
$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
$retainedWarrantyToPayOn = $outputlangs->transnoentities("RetainedWarranty") . ' ('.$object->retained_warranty.'%)';
$retainedWarrantyToPayOn.= !empty($object->retained_warranty_date_limit)?' '.$outputlangs->transnoentities("toPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')):'';
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $retainedWarrantyToPayOn, $useborder, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
@ -1591,7 +1591,7 @@ class pdf_crabe extends ModelePDFFactures
{
global $conf, $langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

4
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -173,7 +173,7 @@ class pdf_soleil extends ModelePDFFicheinter
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
if ($conf->ficheinter->dir_output)
@ -562,7 +562,7 @@ class pdf_soleil extends ModelePDFFicheinter
global $conf,$langs;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "interventions"));
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);

2
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -329,7 +329,7 @@ class pdf_standard extends CommonStickerGenerator
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
if (empty($mode) || $mode == 'member')

2
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
View File

@ -260,7 +260,7 @@ class pdf_standardlabel extends CommonStickerGenerator
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$title=$outputlangs->transnoentities('Labels');

2
htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
View File

@ -301,7 +301,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
$title=$outputlangs->transnoentities('Labels');

6
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -119,7 +119,7 @@ class pdf_standard extends ModelePDFProduct
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
@ -169,7 +169,7 @@ class pdf_standard extends ModelePDFProduct
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
$nblines = count($object->lines);
@ -709,7 +709,7 @@ class pdf_standard extends ModelePDFProduct
{
global $conf,$langs,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

2
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -82,7 +82,7 @@ class doc_generic_project_odt extends ModelePDFProjects
{
global $conf, $langs, $mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("companies", "main"));
$this->db = $db;

2
htdocs/core/modules/project/doc/pdf_baleine.modules.php
View File

@ -183,7 +183,7 @@ class pdf_baleine extends ModelePDFProjects
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)

2
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -155,7 +155,7 @@ class pdf_beluga extends ModelePDFProjects
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)

2
htdocs/core/modules/project/doc/pdf_timespent.modules.php
View File

@ -115,7 +115,7 @@ class pdf_timespent extends ModelePDFProjects
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
if ($conf->projet->dir_output)

4
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -224,7 +224,7 @@ class pdf_azur extends ModelePDFPropales
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
$nblines = count($object->lines);
@ -1438,7 +1438,7 @@ class pdf_azur extends ModelePDFPropales
{
global $conf,$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

2
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -94,7 +94,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
{
global $conf,$langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("companies", "errors"));
$form = new Form($this->db);

6
htdocs/core/modules/stock/doc/pdf_standard.modules.php
View File

@ -119,7 +119,7 @@ class pdf_standard extends ModelePDFStock
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
@ -198,7 +198,7 @@ class pdf_standard extends ModelePDFStock
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
$nblines = count($object->lines);
@ -875,7 +875,7 @@ class pdf_standard extends ModelePDFStock
{
global $conf,$langs,$db,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

6
htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
View File

@ -119,7 +119,7 @@ class pdf_stdmovement extends ModelePDFMovement
{
global $conf,$langs,$mysoc;
// Load traductions files requiredby by page
// Load traductions files required by page
$langs->loadLangs(array("main", "companies"));
$this->db = $db;
@ -200,7 +200,7 @@ class pdf_stdmovement extends ModelePDFMovement
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
/**
@ -954,7 +954,7 @@ class pdf_stdmovement extends ModelePDFMovement
{
global $conf,$langs,$db,$hookmanager;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

4
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -215,7 +215,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
// 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';
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
$nblines = count($object->lines);
@ -1278,7 +1278,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
{
global $conf, $langs;
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "supplier_proposal", "companies"));
$default_font_size = pdf_getPDFFontSize($outputlangs);

2
htdocs/core/tpl/card_presend.tpl.php
View File

@ -76,7 +76,7 @@ if ($action == 'presend')
{
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang($newlang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array('commercial','bills','orders','contracts','members','propal','products','supplier_proposal','interventions'));
}

2
htdocs/public/members/new.php
View File

@ -281,7 +281,7 @@ if ($action == 'add')
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;

2
htdocs/public/payment/paymentok.php
View File

@ -516,7 +516,7 @@ if ($ispaymentok)
// Set output language
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
// Load traductions files requiredby by page
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "members"));
// Get email content from template
$arraydefaultmessage=null;