[doc] misc doc translation fr>en
This commit is contained in:
parent
cc64e7745f
commit
6581c7d6c4
|
@ -678,7 +678,7 @@ class m_aws {
|
|||
return false;
|
||||
}
|
||||
if (!preg_match('/^[0-9a-z_-]*$/', $postfix)){
|
||||
$msg->raise('Error', "aws", _("There is some forbidden characters in the login (only A-Z 0-9 _ and - are allowed)"));
|
||||
$msg->raise('Error', "aws", _("There are forbidden characters in the login (only A-Z 0-9 _ and - are allowed)"));
|
||||
return false;
|
||||
}
|
||||
return $login;
|
||||
|
|
|
@ -42,7 +42,7 @@ if (empty($login)) {
|
|||
}
|
||||
|
||||
if(!empty($confirm_del)) {
|
||||
// contrôle si ce compte piwik a encore des sites associés avant d'accepter sa suppression
|
||||
// does this piwik acount still have websites ? can we delete it then ?
|
||||
if ($piwik->user_has_sites()) {
|
||||
$msg->raise("ALERT", "piwik", _("To be able to delete the last user account, you must first remove all the piwik sites"));
|
||||
} else if ($piwik->user_delete($login) ) {
|
||||
|
|
|
@ -4,13 +4,13 @@ require_once("../class/config.php");
|
|||
if (!defined("QUOTASONE")) return;
|
||||
|
||||
// FIXME missing getfield for $mode
|
||||
if (!isset($mode)) { # when included from adm_login, mode is not set
|
||||
if (!isset($mode)) { // when included from adm_login, mode is not set
|
||||
$mode = 0;
|
||||
}
|
||||
// $mode = 4; // Pour Debuguer le mode "graphique" des quotas
|
||||
|
||||
// Si la var $usr existe, c'est qu'on appelle les quotas pour 1 user à partir des quotas généraux de l'admin
|
||||
// Sinon, on récupère l'id du user à récupérer via $mem->user["login"]
|
||||
// If the var $usr exists, it means we call quotas for 1 user from the general admin page.
|
||||
// If not, we get the ID of the user via $mem->user["login"]
|
||||
if (isset($usr) && is_int($usr)) {
|
||||
$id_usr=$usr;
|
||||
$login=$admin->get_login_by_uid($id_usr);
|
||||
|
|
|
@ -675,7 +675,7 @@ class m_dom {
|
|||
* @param boolean $noerase 1 ou 0 pour rendre le domaine inamovible ou non
|
||||
* @param boolean $force 1 ou 0, si 1, n'effectue pas les tests de DNS.
|
||||
* force ne devrait étre utilisé que par le super-admin.
|
||||
$ @return boolean Retourne FALSE si une erreur s'est produite, TRUE sinon.
|
||||
* @return boolean Retourne FALSE si une erreur s'est produite, TRUE sinon.
|
||||
*/
|
||||
function add_domain($domain, $dns, $noerase = false, $force = false, $isslave = false, $slavedom = "") {
|
||||
global $db, $msg, $quota, $L_FQDN, $tld, $cuid, $hooks;
|
||||
|
|
|
@ -221,7 +221,9 @@ class m_piwik {
|
|||
return $infos_user;
|
||||
}
|
||||
|
||||
// Regarde si l'utilisateur a des sites piwik configurés dans AlternC
|
||||
/**
|
||||
* does this user has piwik websites configured in AlternC ?
|
||||
*/
|
||||
function user_has_sites() {
|
||||
global $db, $cuid, $msg;
|
||||
|
||||
|
@ -237,8 +239,9 @@ class m_piwik {
|
|||
return false;
|
||||
}
|
||||
|
||||
// Supprime l'utilisateur Piwik passé en parametre
|
||||
// Ne le supprime pas localement tant que pas supprimé en remote
|
||||
/** Delete a piwik user
|
||||
* don't delete it locally unless it has been remotely deleted.
|
||||
*/
|
||||
function user_delete($piwik_user_login) {
|
||||
global $db, $cuid, $msg;
|
||||
|
||||
|
|
Loading…
Reference in New Issue