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

Moved the language strings which are only used once

Browse Source 
out of the core and into the modules that use them.
This commit is contained in:
Adam
2011-02-04 15:30:31 -05:00
parent c362a1e077
commit 08583dc107
226 changed files with 42289 additions and 45412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/ns_group.cpp
+79 -33
View File
@@ -30,19 +30,19 @@ class CommandNSGroup : public Command
if (Config->NSEmailReg && findrequestnick(u->nick))
{
source.Reply(NICK_REQUESTED);
source.Reply(LanguageString::NICK_REQUESTED);
return MOD_CONT;
}
if (readonly)
{
source.Reply(NICK_GROUP_DISABLED);
source.Reply(_("Sorry, nickname grouping is temporarily disabled."));
return MOD_CONT;
}
if (!ircdproto->IsNickValid(u->nick))
{
source.Reply(NICK_X_FORBIDDEN, u->nick.c_str());
source.Reply(LanguageString::NICK_X_FORBIDDEN, u->nick.c_str());
return MOD_CONT;
}
@@ -50,42 +50,44 @@ class CommandNSGroup : public Command
for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it)
if (!u->HasMode(UMODE_OPER) && u->nick.find_ci(it->first) != Anope::string::npos)
{
source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
NickAlias *target, *na = findnick(u->nick);
if (!(target = findnick(nick)))
source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
source.Reply(LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay)
source.Reply(NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime);
source.Reply(_("Please wait %d seconds before using the GROUP command again."), (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime);
else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED))
{
Log(NickServ) << NickServ << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick;
source.Reply(NICK_X_SUSPENDED, u->nick.c_str());
source.Reply(LanguageString::NICK_X_SUSPENDED, u->nick.c_str());
}
else if (target && target->nc->HasFlag(NI_SUSPENDED))
{
Log(LOG_COMMAND, u, this) << "tried to use GROUP for SUSPENDED nick " << target->nick;
source.Reply(NICK_X_SUSPENDED, target->nick.c_str());
source.Reply(LanguageString::NICK_X_SUSPENDED, target->nick.c_str());
}
else if (target->HasFlag(NS_FORBIDDEN))
source.Reply(NICK_X_FORBIDDEN, nick.c_str());
source.Reply(LanguageString::NICK_X_FORBIDDEN, nick.c_str());
else if (na && target->nc == na->nc)
source.Reply(NICK_GROUP_SAME, target->nick.c_str());
source.Reply(_("You are already a member of the group of \002%s\002."), target->nick.c_str());
else if (na && na->nc != u->Account())
source.Reply(NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
source.Reply(LanguageString::NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
else if (na && Config->NSNoGroupChange)
source.Reply(NICK_GROUP_CHANGE_DISABLED, Config->s_NickServ.c_str());
source.Reply(_("Your nick is already registered; type \002%R%s DROP\002 first."), Config->s_NickServ.c_str());
else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
source.Reply(NICK_GROUP_TOO_MANY, target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
source.Reply(_("There are too many nicks in %s's group; list them and drop some.\n"
"Type \002%R%s HELP GLIST\002 and \002%R%s HELP DROP\002\n"
"for more information."), target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str());
else
{
int res = enc_check_password(pass, target->nc->pass);
if (res == -1)
{
Log(LOG_COMMAND, u, this) << "failed group for " << na->nick << " (invalid password)";
source.Reply(PASSWORD_INCORRECT);
source.Reply(LanguageString::PASSWORD_INCORRECT);
if (bad_password(u))
return MOD_STOP;
}
@@ -103,7 +105,7 @@ class CommandNSGroup : public Command
if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && !u->nick.substr(prefixlen).find_first_not_of("1234567890"))
{
source.Reply(NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
source.Reply(LanguageString::NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
return MOD_CONT;
}
}
@@ -121,7 +123,7 @@ class CommandNSGroup : public Command
u->SetMode(NickServ, UMODE_REGISTERED);
Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")";
source.Reply(NICK_GROUP_JOINED, target->nick.c_str());
source.Reply(_("You are now in the group of \002%s\002."), target->nick.c_str());
u->lastnickreg = Anope::CurTime;
@@ -133,18 +135,47 @@ class CommandNSGroup : public Command
bool OnHelp(CommandSource &source, const Anope::string &subcommand)
{
source.Reply(NICK_HELP_GROUP);
source.Reply(_("Syntax: \002GROUP \037target\037 \037password\037\002\n"
" \n"
"This command makes your nickname join the \037target\037 nickname's \n"
"group. \037password\037 is the password of the target nickname.\n"
" \n"
"Joining a group will allow you to share your configuration,\n"
"memos, and channel privileges with all the nicknames in the\n"
"group, and much more!\n"
" \n"
"A group exists as long as it is useful. This means that even\n"
"if a nick of the group is dropped, you won't lose the\n"
"shared things described above, as long as there is at\n"
"least one nick remaining in the group.\n"
" \n"
"You can use this command even if you have not registered\n"
"your nick yet. If your nick is already registered, you'll\n"
"need to identify yourself before using this command. Type\n"
"\037%R%S HELP IDENTIFY\037 for more information. This\n"
"last may be not possible on your IRC network.\n"
" \n"
"It is recommended to use this command with a non-registered\n"
"nick because it will be registered automatically when \n"
"using this command. You may use it with a registered nick (to \n"
"change your group) only if your network administrators allowed \n"
"it.\n"
" \n"
"You can only be in one group at a time. Group merging is\n"
"not possible.\n"
" \n"
"\037Note\037: all the nicknames of a group have the same password."));
return true;
}
void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
{
SyntaxError(source, "GROUP", NICK_GROUP_SYNTAX);
SyntaxError(source, "GROUP", _("\037target\037 \037password\037"));
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_GROUP);
source.Reply(_(" GROUP Join a group"));
}
};
@@ -162,11 +193,11 @@ class CommandNSUngroup : public Command
NickAlias *na = findnick(!nick.empty() ? nick : u->nick);
if (u->Account()->aliases.size() == 1)
source.Reply(NICK_UNGROUP_ONE_NICK);
source.Reply(_("Your nick is not grouped to anything, you can't ungroup it."));
else if (!na)
source.Reply(NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str());
source.Reply(LanguageString::NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str());
else if (na->nc != u->Account())
source.Reply(NICK_UNGROUP_NOT_IN_GROUP, na->nick.c_str());
source.Reply(_("The nick %s is not in your group."), na->nick.c_str());
else
{
NickCore *oldcore = na->nc;
@@ -188,7 +219,7 @@ class CommandNSUngroup : public Command
na->nc->greet = oldcore->greet;
na->nc->language = oldcore->language;
source.Reply(NICK_UNGROUP_SUCCESSFUL, na->nick.c_str(), oldcore->display.c_str());
source.Reply(_("Nick %s has been ungrouped from %s."), na->nick.c_str(), oldcore->display.c_str());
User *user = finduser(na->nick);
if (user)
@@ -201,13 +232,19 @@ class CommandNSUngroup : public Command
bool OnHelp(CommandSource &source, const Anope::string &subcommand)
{
source.Reply(NICK_HELP_UNGROUP);
source.Reply(_("Syntax: \002UNGROUP \037[nick]\037\002\n"
" \n"
"This command ungroups your nick, or if given, the specificed nick,\n"
"from the group it is in. The ungrouped nick keeps its registration\n"
"time, password, email, greet, language, url, and icq. Everything\n"
"else is reset. You may not ungroup yourself if there is only one\n"
"nick in your group."));
return true;
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_UNGROUP);
source.Reply(_(" UNGROUP Remove a nick from a group"));
}
};
@@ -226,19 +263,19 @@ class CommandNSGList : public Command
const NickCore *nc = u->Account();
if (!nick.empty() && (!nick.equals_ci(u->nick) && !u->Account()->IsServicesOper()))
source.Reply(ACCESS_DENIED, Config->s_NickServ.c_str());
source.Reply(LanguageString::ACCESS_DENIED, Config->s_NickServ.c_str());
else if (!nick.empty() && (!findnick(nick) || !(nc = findnick(nick)->nc)))
source.Reply(nick.empty() ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick.c_str());
source.Reply(nick.empty() ? LanguageString::NICK_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, nick.c_str());
else
{
source.Reply(!nick.empty() ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display.c_str());
source.Reply(!nick.empty() ? _("List of nicknames in the group of \002%s\002:") : _("List of nicknames in your group:"), nc->display.c_str());
for (std::list<NickAlias *>::const_iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end; ++it)
{
NickAlias *na2 = *it;
source.Reply(na2->HasFlag(NS_NO_EXPIRE) ? NICK_GLIST_REPLY_NOEXPIRE : NICK_GLIST_REPLY, na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
source.Reply(na2->HasFlag(NS_NO_EXPIRE) ? _(" %s (does not expire)") : _(" %s (expires in %s)"), na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str());
}
source.Reply(NICK_GLIST_FOOTER, nc->aliases.size());
source.Reply(_("%d nicknames in the group."), nc->aliases.size());
}
return MOD_CONT;
}
@@ -247,16 +284,25 @@ class CommandNSGList : public Command
{
User *u = source.u;
if (u->Account() && u->Account()->IsServicesOper())
source.Reply(NICK_SERVADMIN_HELP_GLIST);
source.Reply(_("Syntax: \002GLIST [\037nickname\037]\002\n"
" \n"
"Without a parameter, lists all nicknames that are in\n"
"your group.\n"
" \n"
"With a parameter, lists all nicknames that are in the\n"
"group of the given nick.\n"
"This use limited to \002Services Operators\002."));
else
source.Reply(NICK_HELP_GLIST);
source.Reply(_("Syntax: \002GLIST\002\n"
" \n"
"Lists all nicks in your group."));
return true;
}
void OnServHelp(CommandSource &source)
{
source.Reply(NICK_HELP_CMD_GLIST);
source.Reply(_(" GLIST Lists all nicknames in your group"));
}
};