pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-05 11:03:12 +02:00
Code Activity

Changed the language system to use gettext

Browse Source
This commit is contained in:
Adam
2010-09-26 02:33:01 -04:00
parent 05e6815d91
commit d646d455e2
239 changed files with 168730 additions and 90259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/ns_register.cpp
+37 -37
View File
@@ -26,7 +26,7 @@ class CommandNSConfirm : public Command
{
// XXX
//Alog() << Config->s_NickServ << ": makenick(" << u->nick << ") failed";
notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_FAILED);
u->SendMessage(NickServ, NICK_REGISTRATION_FAILED);
return MOD_CONT;
}
@@ -60,23 +60,23 @@ class CommandNSConfirm : public Command
u->Login(na->nc);
Log(LOG_COMMAND, u, this) << "to register " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
if (Config->NSAddAccessOnReg)
notice_lang(Config->s_NickServ, u, NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str());
u->SendMessage(NickServ, NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str());
else
notice_lang(Config->s_NickServ, u, NICK_REGISTERED_NO_MASK, u->nick.c_str());
u->SendMessage(NickServ, NICK_REGISTERED_NO_MASK, u->nick.c_str());
delete nr;
ircdproto->SendAccountLogin(u, u->Account());
ircdproto->SetAutoIdentificationToken(u);
if (enc_decrypt(na->nc->pass, tmp_pass) == 1)
notice_lang(Config->s_NickServ, u, NICK_PASSWORD_IS, tmp_pass.c_str());
u->SendMessage(NickServ, NICK_PASSWORD_IS, tmp_pass.c_str());
u->lastnickreg = Anope::CurTime;
}
else
{
Log(LOG_COMMAND, u, this) << "to confirm " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")";
notice_lang(Config->s_NickServ, u, NICK_FORCE_REG, nr->nick.c_str());
u->SendMessage(NickServ, NICK_FORCE_REG, nr->nick.c_str());
User *user = finduser(nr->nick);
/* Delrequest must be called before validate_user */
delete nr;
@@ -116,21 +116,21 @@ class CommandNSConfirm : public Command
return MOD_CONT;
}
}
notice_lang(Config->s_NickServ, u, NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str());
u->SendMessage(NickServ, NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str());
return MOD_CONT;
}
if (!nr->passcode.equals_cs(passcode))
{
notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID);
u->SendMessage(NickServ, NICK_CONFIRM_INVALID);
return MOD_CONT;
}
}
if (!nr)
{
notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_FAILED);
u->SendMessage(NickServ, NICK_REGISTRATION_FAILED);
return MOD_CONT;
}
@@ -151,20 +151,20 @@ class CommandNSConfirm : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config->s_NickServ, u, NICK_HELP_CONFIRM);
u->SendMessage(NickServ, NICK_HELP_CONFIRM);
if (u->Account() && u->Account()->HasPriv("nickserv/confirm"))
notice_help(Config->s_NickServ, u, NICK_HELP_CONFIRM_OPER);
u->SendMessage(NickServ, NICK_HELP_CONFIRM_OPER);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID);
u->SendMessage(NickServ, NICK_CONFIRM_INVALID);
}
void OnServHelp(User *u)
{
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_CONFIRM);
u->SendMessage(NickServ, NICK_HELP_CMD_CONFIRM);
}
};
@@ -197,19 +197,19 @@ class CommandNSRegister : public CommandNSConfirm
if (readonly)
{
notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_DISABLED);
u->SendMessage(NickServ, NICK_REGISTRATION_DISABLED);
return MOD_CONT;
}
if (!is_oper(u) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay)
{
notice_lang(Config->s_NickServ, u, NICK_REG_DELAY, Config->NickRegDelay);
u->SendMessage(NickServ, NICK_REG_DELAY, Config->NickRegDelay);
return MOD_CONT;
}
if ((anr = findrequestnick(u->nick)))
{
notice_lang(Config->s_NickServ, u, NICK_REQUESTED);
u->SendMessage(NickServ, NICK_REQUESTED);
return MOD_CONT;
}
@@ -220,13 +220,13 @@ class CommandNSRegister : public CommandNSConfirm
*/
if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && !u->nick.substr(prefixlen).find_first_not_of("1234567890"))
{
notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
if (!ircdproto->IsNickValid(u->nick))
{
notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, u->nick.c_str());
u->SendMessage(NickServ, NICK_X_FORBIDDEN, u->nick.c_str());
return MOD_CONT;
}
@@ -237,7 +237,7 @@ class CommandNSRegister : public CommandNSConfirm
if (u->nick.find_ci(nick) != Anope::string::npos && !is_oper(u))
{
notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
}
@@ -245,7 +245,7 @@ class CommandNSRegister : public CommandNSConfirm
if (Config->NSForceEmail && email.empty())
this->OnSyntaxError(u, "");
else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
u->SendMessage(NickServ, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime);
else if ((na = findnick(u->nick)))
{
/* i.e. there's already such a nick regged */
@@ -253,17 +253,17 @@ class CommandNSRegister : public CommandNSConfirm
{
// XXX
//Alog() << Config->s_NickServ << ": " << u->GetIdent() << "@" << u->host << " tried to register FORBIDden nick " << u->nick;
notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
}
else
notice_lang(Config->s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick.c_str());
u->SendMessage(NickServ, NICK_ALREADY_REGISTERED, u->nick.c_str());
}
else if (pass.equals_ci(u->nick) || (Config->StrictPasswords && pass.length() < 5))
notice_lang(Config->s_NickServ, u, MORE_OBSCURE_PASSWORD);
u->SendMessage(NickServ, MORE_OBSCURE_PASSWORD);
else if (pass.length() > Config->PassLen)
notice_lang(Config->s_NickServ, u, PASSWORD_TOO_LONG);
u->SendMessage(NickServ, PASSWORD_TOO_LONG);
else if (!email.empty() && !MailValidate(email))
notice_lang(Config->s_NickServ, u, MAIL_X_INVALID, email.c_str());
u->SendMessage(NickServ, MAIL_X_INVALID, email.c_str());
else
{
for (idx = 0; idx < 9; ++idx)
@@ -279,13 +279,13 @@ class CommandNSRegister : public CommandNSConfirm
{
if (SendRegmail(u, nr))
{
notice_lang(Config->s_NickServ, u, NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str());
u->SendMessage(NickServ, NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str());
Log(LOG_COMMAND, u, this) << "send registration verification code to " << nr->email;
}
else
{
Log(LOG_COMMAND, u, this) << "unable to send registration verification mail";
notice_lang(Config->s_NickServ, u, NICK_REG_UNABLE);
u->SendMessage(NickServ, NICK_REG_UNABLE);
delete nr;
return MOD_CONT;
}
@@ -302,21 +302,21 @@ class CommandNSRegister : public CommandNSConfirm
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config->s_NickServ, u, NICK_HELP_REGISTER);
u->SendMessage(NickServ, NICK_HELP_REGISTER);
return true;
}
void OnSyntaxError(User *u, const Anope::string &subcommand)
{
if (Config->NSForceEmail)
syntax_error(Config->s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL);
SyntaxError(NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL);
else
syntax_error(Config->s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX);
SyntaxError(NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX);
}
void OnServHelp(User *u)
{
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_REGISTER);
u->SendMessage(NickServ, NICK_HELP_CMD_REGISTER);
}
};
@@ -337,13 +337,13 @@ class CommandNSResend : public Command
{
if (Anope::CurTime < nr->lastmail + Config->NSResendDelay)
{
notice_lang(Config->s_NickServ, u, MAIL_LATER);
u->SendMessage(NickServ, MAIL_LATER);
return MOD_CONT;
}
if (!SendRegmail(u, nr))
{
nr->lastmail = Anope::CurTime;
notice_lang(Config->s_NickServ, u, NICK_REG_RESENT, nr->email.c_str());
u->SendMessage(NickServ, NICK_REG_RESENT, nr->email.c_str());
Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick;
}
else
@@ -358,13 +358,13 @@ class CommandNSResend : public Command
bool OnHelp(User *u, const Anope::string &subcommand)
{
notice_help(Config->s_NickServ, u, NICK_HELP_RESEND);
u->SendMessage(NickServ, NICK_HELP_RESEND);
return true;
}
void OnServHelp(User *u)
{
notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RESEND);
u->SendMessage(NickServ, NICK_HELP_CMD_RESEND);
}
};
@@ -390,10 +390,10 @@ static bool SendRegmail(User *u, NickRequest *nr)
{
char subject[BUFSIZE], message[BUFSIZE];
snprintf(subject, sizeof(subject), getstring(NICK_REG_MAIL_SUBJECT), nr->nick.c_str());
snprintf(message, sizeof(message), getstring(NICK_REG_MAIL), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
snprintf(subject, sizeof(subject), GetString(NICK_REG_MAIL_SUBJECT).c_str(), nr->nick.c_str());
snprintf(message, sizeof(message), GetString(NICK_REG_MAIL).c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str());
return Mail(u, nr, Config->s_NickServ, subject, message);
return Mail(u, nr, NickServ, subject, message);
}
MODULE_INIT(NSRegister)