diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 35642c0babb..2fc34f8790a 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -165,7 +165,7 @@ if ($result) print ''.img_object('',$picto).' '.$objMod->getName(); print ' '; - $perm_libelle=(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle); + $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle)); print ''.$perm_libelle. ''; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4a497e0ea15..2004496524e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -512,9 +512,11 @@ Permission241=Read categories Permission242=Create/modify categories Permission243=Delete categories Permission244=See the contents of the hidden categories -Permission251=Read other users +Permission251=Read other users and groups +PermissionAdvanced251=Read other users Permission252=Read permissions of other users -Permission253=Create/modify other users and permissions +Permission253=Create/modify other users, groups and permisssions +PermissionAdvanced253=Create/modify other users and permissions Permission254=Modify other users password Permission255=Delete or disable other users Permission256=Read its own permissions diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d5401c56c13..56b02513279 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -514,9 +514,11 @@ Permission241= Lire les catégories Permission242= Créer/modifier les catégories Permission243= Supprimer les catégories Permission244= Voir le contenu des catégories cachées -Permission251= Consulter les autres utilisateurs +Permission251= Consulter les autres utilisateurs, les groupes et leurs permissions +PermissionAdvanced251= Consulter les autres utilisateurs Permission252= Consulter les permissions des autres utilisateurs -Permission253= Créer/modifier les autres utilisateurs et leurs permissions +Permission253= Créer/modifier les autres utilisateurs, les groupes et leurs permissions +PermissionAdvanced253= Créer/modifier les autres utilisateurs et leurs permissions Permission254= Modifier le mot de passe des autres utilisateurs Permission255= Supprimer ou désactiver les autres utilisateurs Permission256= Consulter ses propres permissions diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index a3faae416cb..2a0d183a28a 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -271,7 +271,7 @@ if ($_GET["id"]) print ' '; } - $perm_libelle=(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle); + $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle)); print ''.$perm_libelle. ''; print ''; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index d6cbf72995f..3fcb950170c 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -345,7 +345,7 @@ if ($result) print ' '; } - $perm_libelle=(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle); + $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle)); print ''.$perm_libelle. ''; print '';