From 3def11d5c91e4487e2ef86e857d0bd1cefc4ccd2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 10 May 2019 19:32:46 +0200 Subject: [PATCH] Standardize translation --- htdocs/comm/propal/list.php | 4 ++-- htdocs/commande/list.php | 5 ++--- htdocs/contrat/list.php | 4 ++-- htdocs/expensereport/list.php | 4 ++-- htdocs/fichinter/list.php | 4 ++-- htdocs/fourn/commande/list.php | 4 ++-- htdocs/fourn/facture/list.php | 4 ++-- htdocs/fourn/product/list.php | 4 ++-- .../modulebuilder/template/myobject_list.php | 6 ++++-- htdocs/product/list.php | 6 +++--- htdocs/projet/list.php | 6 +++--- htdocs/supplier_proposal/list.php | 4 ++-- htdocs/user/perms.php | 20 ++++++++----------- 13 files changed, 36 insertions(+), 39 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index e996bf29907..b02f788f040 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -429,9 +429,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + 'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->propal->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if ($user->rights->propal->cloturer) $arrayofmassactions['closed']=$langs->trans("Close"); diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 4ff7fe364bd..ad3fd777a5c 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -430,11 +430,10 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), 'cancelorders'=>$langs->trans("Cancel"), - + 'presend'=>$langs->trans("SendByMail"), ); if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer"); if ($user->rights->commande->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index 410973bb5b7..935c990e1bf 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -365,9 +365,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + 'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 465b054569b..7dd91443417 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -340,9 +340,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + 'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->expensereport->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 10eace0fe57..b893f6e6511 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -305,9 +305,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - //'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->ficheinter->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index a9a2963c78d..e4b71768456 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -620,9 +620,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + 'presend'=>$langs->trans("SendByMail"), ); //if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer"); if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 608759e1531..2415167f8ae 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -454,9 +454,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( 'validate'=>$langs->trans("Validate"), - 'generate_doc'=>$langs->trans("Generate"), - //'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), //'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); //if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer"); if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php index 2aafa512aff..218379ce7b8 100644 --- a/htdocs/fourn/product/list.php +++ b/htdocs/fourn/product/list.php @@ -117,9 +117,9 @@ if ($fourn_id) $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - 'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + 'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php index 4d6e1387ed7..e8efedcf075 100644 --- a/htdocs/modulebuilder/template/myobject_list.php +++ b/htdocs/modulebuilder/template/myobject_list.php @@ -335,8 +335,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // List of mass actions available $arrayofmassactions = array( - //'presend'=>$langs->trans("SendByMail"), - //'builddoc'=>$langs->trans("PDFMerge"), + //'validate'=>$langs->trans("Validate"), + //'generate_doc'=>$langs->trans("ReGeneratePDF"), + //'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 16d141d3e23..fed4ac64c43 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -437,9 +437,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - //'presend'=>$langs->trans("SendByMail"), - //'builddoc'=>$langs->trans("PDFMerge"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), + //'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->produit->supprimer) $arrayofmassactions['predelete']="".$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index c58ac17f980..bf3fddf3bc5 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -436,9 +436,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), -// 'presend'=>$langs->trans("SendByMail"), -// 'builddoc'=>$langs->trans("PDFMerge"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), + //'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer"); if ($user->rights->projet->creer) $arrayofmassactions['close']=$langs->trans("Close"); diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 63c2a004982..d8e47dcb040 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -377,9 +377,9 @@ if ($resql) // List of mass actions available $arrayofmassactions = array( - 'generate_doc'=>$langs->trans("Generate"), - //'presend'=>$langs->trans("SendByMail"), + 'generate_doc'=>$langs->trans("ReGeneratePDF"), 'builddoc'=>$langs->trans("PDFMerge"), + //'presend'=>$langs->trans("SendByMail"), ); if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete"); if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array(); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index e1551310a43..992de6850db 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -272,7 +272,7 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad { print ''; print ''.$langs->trans("All").""; - print '/'; + print ' / '; print ''.$langs->trans("None").""; print ''; } @@ -316,27 +316,23 @@ if ($result) // Show break line print ''; - print ''.img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName(); - print ''; + print ''; + print img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName(); + print ''; + print ''; if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) { if ($caneditperms) { print ''; print 'module.'">'.$langs->trans("All").""; - print '/'; + print ' / '; print 'module.'">'.$langs->trans("None").""; print ''; } + print ''; } - else - { - if ($caneditperms) - { - print ''; - } - } - print ' '; + print ''; print ''."\n"; }