Merge pull request #12105 from grandoc/new_branch_12_10_2019

more internationalization
This commit is contained in:
Laurent Destailleur 2019-10-14 20:37:50 +02:00 committed by GitHub
commit 5c4edad0d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -47,23 +47,23 @@ abstract class ModeleAction extends CommonDocGenerator
global $conf; global $conf;
$type='action'; $type='action';
$liste=array(); $list=array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste=getListOfModels($db, $type, $maxfilenamelength); $list=getListOfModels($db, $type, $maxfilenamelength);
return $liste; return $list;
} }
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
/** /**
* Create an product document on disk using template defined into PRODUCT_ADDON_PDF * Create a product document on disk using template defined into PRODUCT_ADDON_PDF
* *
* @param DoliDB $db objet base de donnee * @param DoliDB $db data base object
* @param Object $object Object fichinter * @param Object $object Object fichinter
* @param string $modele force le modele a utiliser ('' par defaut) * @param string $modele forces the model to use ('' by default)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs lang object to use for translation
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref
@ -79,7 +79,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
$srctemplatepath=''; $srctemplatepath='';
// Positionne modele sur le nom du modele de fichinter a utiliser // Position modele on the name of fichinter model to use
if (! dol_strlen($modele)) if (! dol_strlen($modele))
{ {
if (! empty($conf->global->ACTION_EVENT_ADDON_PDF)) if (! empty($conf->global->ACTION_EVENT_ADDON_PDF))