From 03481a019740a5900da4ee4b32b00cbb22f60051 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 16 Mar 2021 04:22:43 +0100 Subject: [PATCH 1/2] Uniformize translation --- htdocs/accountancy/admin/fiscalyear_card.php | 6 +++--- htdocs/adherents/ldap.php | 3 +-- htdocs/adherents/subscription.php | 2 +- htdocs/adherents/type_translation.php | 9 +++------ htdocs/categories/photos.php | 9 +++------ htdocs/compta/bank/various_payment/card.php | 2 +- htdocs/compta/deplacement/card.php | 3 +-- htdocs/compta/facture/card-rec.php | 4 ++-- htdocs/compta/tva/card.php | 2 +- htdocs/expensereport/card.php | 3 +-- htdocs/fourn/card.php | 2 +- htdocs/hrm/establishment/card.php | 5 ++--- htdocs/opensurvey/card.php | 2 +- htdocs/product/admin/dynamic_prices.php | 8 ++++++-- htdocs/product/card.php | 8 +++----- htdocs/product/price.php | 9 +++------ htdocs/product/stock/card.php | 9 +++------ htdocs/product/stock/movement_card.php | 9 +++------ htdocs/societe/price.php | 9 +++------ htdocs/user/group/card.php | 3 +-- htdocs/user/group/ldap.php | 3 +-- 21 files changed, 44 insertions(+), 66 deletions(-) diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index aef52a91236..7fdd7c19e32 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -298,10 +298,10 @@ if ($action == 'create') { print dol_get_fiche_end(); + /* + * Action bar + */ if (!empty($user->rights->accounting->fiscalyear->write)) { - /* - * Barre d'actions - */ print '
'; print ''.$langs->trans('Modify').''; diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 843ca08a5df..89baf2f5ec5 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -131,9 +131,8 @@ print '
'; print dol_get_fiche_end(); /* - * Barre d'actions + * Action bar */ - print '
'; if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') { diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index b48328a17e8..79f1a4da036 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -639,7 +639,7 @@ if ($rowid > 0) { /* - * Action buttons + * Action bar */ // Button to create a new subscription if member no draft neither resiliated diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php index 56dfc05e895..0ce4b2314b4 100644 --- a/htdocs/adherents/type_translation.php +++ b/htdocs/adherents/type_translation.php @@ -175,12 +175,9 @@ print dol_get_fiche_end(); -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - +/* + * Action bar + */ print "\n
\n"; if ($action == '') { diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index c7e574939ff..e30067e8815 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -153,12 +153,9 @@ if ($object->id) { - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ print '
'."\n"; if ($action != 'ajout_photo' && $user->rights->categorie->creer) { diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index d19ccbed908..2b4a68bec90 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -665,7 +665,7 @@ if ($id) { /* - * Action buttons + * Action bar */ print '
'."\n"; diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index 1d294df8cff..3d4693f8c7b 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -463,9 +463,8 @@ if ($action == 'create') { print '
'; /* - * Barre d'actions + * Action bar */ - print '
'; if ($object->statut < Deplacement::STATUS_REFUNDED) { // if not refunded diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 1978a6115b5..c1c0f83cecb 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -1634,8 +1634,8 @@ if ($action == 'create') { print dol_get_fiche_end(); - /** - * Barre d'actions + /* + * Action bar */ print '
'; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index 40261cb7f05..71e511397b6 100755 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -722,7 +722,7 @@ if ($id) { } /* - * Action buttons + * Action bar */ print "
\n"; if ($action != 'edit') { diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 70db8856327..232351b68a9 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2485,9 +2485,8 @@ if ($action == 'create') { } /* - * Barre d'actions + * Action bar */ - print '
'; if ($action != 'create' && $action != 'edit') { diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 3b9a0df399b..6db5ba5cad3 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -808,7 +808,7 @@ if ($object->id > 0) { /* - * Barre d'actions + * Action bar */ print '
'; diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php index 6c336d230f0..a46ebfa28f3 100644 --- a/htdocs/hrm/establishment/card.php +++ b/htdocs/hrm/establishment/card.php @@ -412,9 +412,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print dol_get_fiche_end(); /* - * Barre d'actions - */ - + * Action bar + */ print '
'; print ''.$langs->trans('Modify').''; print ''.$langs->trans('Delete').''; diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index bbd930b013f..5728edb80ff 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -354,7 +354,7 @@ print ''."\n"; /* - * Barre d'actions + * Action bar */ print '
'; diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 7a92d9a651b..fdd42bd34d7 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -189,7 +189,9 @@ if ($action != 'create_updater' && $action != 'edit_updater') { print ''; if (empty($action)) { - //Action Buttons + /* + * Action bar + */ print '
'; print ''.$langs->trans("AddVariable").''; print '
'; @@ -277,7 +279,9 @@ if ($action != 'create_variable' && $action != 'edit_variable') { print ''; if (empty($action)) { - //Action Buttons + /* + * Action bar + */ print '
'; print ''.$langs->trans("AddUpdater").''; print '
'; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index ed0a55ffa2d..957060d32c9 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2261,11 +2261,9 @@ if (empty($reshook)) { // Print form confirm print $formconfirm; -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ +/* + * Action bar + */ if ($action != 'create' && $action != 'edit') { print "\n".'
'."\n"; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2b8561e7d75..015b061119b 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1096,12 +1096,9 @@ print dol_get_fiche_end(); -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - +/* + * Action bar + */ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price' || $action == 'activate_price_by_qty' || $action == 'disable_price_by_qty') { print "\n".'
'."\n"; diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 252cccd90ab..294c31d49ba 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -478,12 +478,9 @@ if ($action == 'create') { print dol_get_fiche_end(); - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ print "
\n"; $parameters = array(); diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php index 5107a558288..7a37c6666ae 100644 --- a/htdocs/product/stock/movement_card.php +++ b/htdocs/product/stock/movement_card.php @@ -664,12 +664,9 @@ if ($resql) { } - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ if ((empty($action) || $action == 'list') && $id > 0) { print "
\n"; diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php index d7d373f721a..cc056896414 100644 --- a/htdocs/societe/price.php +++ b/htdocs/societe/price.php @@ -527,12 +527,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { } else { // View mode - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ print "\n".'
'."\n"; if ($user->rights->produit->creer || $user->rights->service->creer) { diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 599df7aa2ee..6c98bf5923d 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -366,9 +366,8 @@ if ($action == 'create') { /* - * Barre d'actions + * Action bar */ - print '
'; $parameters = array(); diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index 59728f4c982..dcefbf4a413 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -143,9 +143,8 @@ print dol_get_fiche_end(); /* - * Barre d'actions + * Action bar */ - print '
'; if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') { From 6960f0dc25517bcdff18cf387f63c7c46a68f5f3 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Tue, 16 Mar 2021 04:22:55 +0100 Subject: [PATCH 2/2] Uniformize translation --- htdocs/adherents/subscription/card.php | 3 +-- htdocs/categories/traduction.php | 9 +++------ htdocs/comm/action/card.php | 3 +-- htdocs/comm/card.php | 3 +-- htdocs/compta/bank/card.php | 2 +- htdocs/compta/localtax/card.php | 2 +- htdocs/compta/prelevement/line.php | 9 +++------ htdocs/contact/card.php | 4 +++- htdocs/contact/ldap.php | 3 +-- htdocs/contact/perso.php | 4 +++- htdocs/exports/export.php | 7 +++---- htdocs/fichinter/card-rec.php | 4 ++-- htdocs/imports/import.php | 2 +- htdocs/product/stock/movement_list.php | 9 +++------ htdocs/product/traduction.php | 9 +++------ htdocs/salaries/card.php | 5 +++-- htdocs/user/clicktodial.php | 2 +- htdocs/user/ldap.php | 3 +-- 18 files changed, 35 insertions(+), 48 deletions(-) diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 4b2b4861c1c..96a41c33413 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -349,8 +349,7 @@ if ($rowid && $action != 'edit') { print dol_get_fiche_end(); /* - * Barre d'actions - * + * Action bar */ print '
'; diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php index de59aca376d..cd5d7ad8214 100644 --- a/htdocs/categories/traduction.php +++ b/htdocs/categories/traduction.php @@ -224,12 +224,9 @@ print dol_get_fiche_end(); -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - +/* + * Action bar + */ print "\n
\n"; if ($action == '') { diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 066001f6aa7..8feb526cd23 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -2121,9 +2121,8 @@ if ($id > 0) { /* - * Barre d'actions + * Action bar */ - print '
'; $parameters = array(); diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 07ab4f797de..64633bdd04d 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -1334,9 +1334,8 @@ if ($object->id > 0) { /* - * Barre d'actions + * Action bar */ - print '
'; $parameters = array(); diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 74791c14898..73f4bcbe7f4 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -777,7 +777,7 @@ if ($action == 'create') { print dol_get_fiche_end(); /* - * Barre d'actions + * Action bar */ print '
'; diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index ee7dbb5e3f4..d4091a6df90 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -266,7 +266,7 @@ if ($id) { /* - * Action buttons + * Action bar */ print "
\n"; if ($object->rappro == 0) { diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php index 4e55a78314f..68ca3795fe3 100644 --- a/htdocs/compta/prelevement/line.php +++ b/htdocs/compta/prelevement/line.php @@ -225,12 +225,9 @@ if ($id) { print ''; } - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ print "
"; if ($action == '') { diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index e75908adc10..0ee4cb10637 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -1441,7 +1441,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print dol_get_fiche_end(); - // Barre d'actions + /* + * Action bar + */ print '
'; $parameters = array(); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 7f84393c858..6677a7b17d7 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -132,9 +132,8 @@ print dol_get_fiche_end(); /* - * Barre d'actions + * Action bar */ - print '
'; if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') { diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index d313712a6a6..5c7356fae00 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -308,7 +308,9 @@ if ($action == 'edit') { if ($action != 'edit') { - // Barre d'actions + /* + * Action bar + */ if ($user->socid == 0) { print '
'; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index f1099f9692f..dc23a8ab362 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -619,7 +619,7 @@ if ($step == 2 && $datatoexport) { print '
'; /* - * Barre d'action + * Action bar */ print '
'; @@ -793,7 +793,7 @@ if ($step == 3 && $datatoexport) { print '
'; /* - * Barre d'action + * Action bar */ print '
'; // il n'est pas obligatoire de filtrer les champs @@ -974,8 +974,7 @@ if ($step == 4 && $datatoexport) { print '
'; /* - * Barre d'action - * + * Action bar */ print '
'; diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index e87d94fb506..e687169fe50 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -736,8 +736,8 @@ if ($action == 'create') { } print ''; - /** - * Barre d'actions + /* + * Action bar */ print '
'; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index dff1940c042..79b54c59011 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1203,7 +1203,7 @@ if ($step == 4 && $datatoimport) { } /* - * Barre d'action + * Action bar */ print '
'; diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php index 38c49a44f4c..7c2e2df67e5 100644 --- a/htdocs/product/stock/movement_list.php +++ b/htdocs/product/stock/movement_list.php @@ -731,12 +731,9 @@ if ($resql) { } - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ - + /* + * Action bar + */ if ((empty($action) || $action == 'list') && $id > 0) { print "
\n"; diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 67c2dccab71..45b45136410 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -196,12 +196,9 @@ print dol_get_fiche_end(); -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ - +/* + * Action bar + */ print "\n".'
'."\n"; if ($action == '') { diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index d8e7e4d4009..775221caeb2 100755 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -882,8 +882,9 @@ if ($id) { print dol_get_fiche_end(); - // Action buttons - + /* + * Action bar + */ print '
'."\n"; if ($action != 'edit') { // Reopen diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 06db482094d..0a9a65a2852 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -193,7 +193,7 @@ if ($id > 0) { print ''; /* - * Barre d'actions + * Action bar */ print '
'; diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 5fbd29e9af9..e6cee6f6f73 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -148,9 +148,8 @@ print '
'; print dol_get_fiche_end(); /* - * Barre d'actions + * Action bar */ - print '
'; if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {