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

Replaced the few language strings we use with #defines to prevent accidentally translating them if we shouldnt

Browse Source
This commit is contained in:
Adam
2011-02-26 17:54:03 -05:00
parent 28d17a40ce
commit f234a2bfab
107 changed files with 619 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/botserv.cpp
+2 -2
View File
@@ -519,7 +519,7 @@ void bot_raw_ban(User *requester, ChannelInfo *ci, User *u, const Anope::string
if (ModeManager::FindUserModeByName(UMODE_PROTECTED) && u->IsProtected() && requester != u)
{
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), LanguageString::ACCESS_DENIED).c_str());
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), _(ACCESS_DENIED)).c_str());
return;
}
@@ -561,7 +561,7 @@ void bot_raw_kick(User *requester, ChannelInfo *ci, User *u, const Anope::string
if (ModeManager::FindUserModeByName(UMODE_PROTECTED) && u->IsProtected() && requester != u)
{
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), LanguageString::ACCESS_DENIED).c_str());
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", GetString(requester->Account(), _(ACCESS_DENIED)).c_str());
return;
}
src/commands.cpp
+9 -7
View File
@@ -65,7 +65,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
// Command requires registered users only
if (!c->HasFlag(CFLAG_ALLOW_UNREGISTERED) && !u->IsIdentified())
{
u->SendMessage(bi, _(LanguageString::NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
u->SendMessage(bi, _(_(NICK_IDENTIFY_REQUIRED)), Config->s_NickServ.c_str());
Log(LOG_COMMAND, "denied", bi) << "Access denied for unregistered user " << u->GetMask() << " with command " << command;
PopLanguage();
return;
@@ -102,14 +102,14 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
{
if (ci->HasFlag(CI_FORBIDDEN) && !c->HasFlag(CFLAG_ALLOW_FORBIDDEN))
{
u->SendMessage(bi, _(LanguageString::CHAN_X_FORBIDDEN), ci->name.c_str());
u->SendMessage(bi, _(_(CHAN_X_FORBIDDEN)), ci->name.c_str());
Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command << " because of FORBIDDEN channel " << ci->name;
PopLanguage();
return;
}
else if (ci->HasFlag(CI_SUSPENDED) && !c->HasFlag(CFLAG_ALLOW_SUSPENDED))
{
u->SendMessage(bi, _(LanguageString::CHAN_X_FORBIDDEN), ci->name.c_str());
u->SendMessage(bi, _(_(CHAN_X_FORBIDDEN)), ci->name.c_str());
Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command << " because of SUSPENDED channel " << ci->name;
PopLanguage();
return;
@@ -117,7 +117,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
}
else if (!c->HasFlag(CFLAG_ALLOW_UNREGISTEREDCHANNEL))
{
u->SendMessage(bi, _(LanguageString::CHAN_X_NOT_REGISTERED), params[0].c_str());
u->SendMessage(bi, _(_(CHAN_X_NOT_REGISTERED)), params[0].c_str());
PopLanguage();
return;
}
@@ -125,7 +125,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
/* A user not giving a channel name for a param that should be a channel */
else
{
u->SendMessage(bi, LanguageString::CHAN_X_INVALID, params[0].c_str());
u->SendMessage(bi, _(CHAN_X_INVALID), params[0].c_str());
PopLanguage();
return;
}
@@ -158,7 +158,7 @@ void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope:
// If the command requires a permission, and they aren't registered or don't have the required perm, DENIED
if (!c->permission.empty() && !u->Account()->HasCommand(c->permission))
{
u->SendMessage(bi, LanguageString::ACCESS_DENIED);
u->SendMessage(bi, _(ACCESS_DENIED));
Log(LOG_COMMAND, "denied", bi) << "Access denied for user " << u->GetMask() << " with command " << command;
source.DoReply();
PopLanguage();
@@ -205,7 +205,7 @@ void mod_help_cmd(BotInfo *bi, User *u, ChannelInfo *ci, const Anope::string &cm
source.Reply( _("No help available for \002%s\002."), cmd.c_str());
else
{
u->SendMessage(bi, " ");
source.Reply(" ");
/* Inform the user what permission is required to use the command */
if (!c->permission.empty())
@@ -221,4 +221,6 @@ void mod_help_cmd(BotInfo *bi, User *u, ChannelInfo *ci, const Anope::string &cm
else
source.Reply(_("You can use this command."));
}
source.DoReply();
}
src/language.cpp
+1 -1
View File
@@ -115,6 +115,6 @@ const char *anope_gettext(const char *string)
void SyntaxError(CommandSource &source, const Anope::string &command, const Anope::string &message)
{
source.Reply(_("Syntax: \002%s\002"), message.c_str());
source.Reply(_(LanguageString::MORE_INFO), source.owner->nick.c_str(), command.c_str());
source.Reply(_(_(MORE_INFO)), source.owner->nick.c_str(), command.c_str());
}
src/memoserv.cpp
+8 -8
View File
@@ -170,11 +170,11 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
int is_servoper = u && u->Account() && u->Account()->IsServicesOper();
if (readonly)
u->SendMessage(MemoServ, LanguageString::MEMO_SEND_DISABLED);
u->SendMessage(MemoServ, _(MEMO_SEND_DISABLED));
else if (text.empty())
{
if (!z)
SyntaxError(source, "SEND", LanguageString::MEMO_SEND_SYNTAX);
SyntaxError(source, "SEND", _(MEMO_SEND_SYNTAX));
if (z == 3)
SyntaxError(source, "RSEND", _("{\037nick\037 | \037channel\037} \037memo-text\037")); // XXX?
@@ -182,16 +182,16 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
else if (!u->IsIdentified() && !u->IsRecognized())
{
if (!z || z == 3)
source.Reply(LanguageString::NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str());
source.Reply(_(NICK_IDENTIFY_REQUIRED), Config->s_NickServ.c_str());
}
else if (!(mi = getmemoinfo(name, ischan, isforbid)))
{
if (!z || z == 3)
{
if (isforbid)
source.Reply(ischan ? LanguageString::CHAN_X_FORBIDDEN : LanguageString::NICK_X_FORBIDDEN, name.c_str());
source.Reply(ischan ? _(CHAN_X_FORBIDDEN) : _(NICK_X_FORBIDDEN), name.c_str());
else
source.Reply(ischan ? LanguageString::CHAN_X_NOT_REGISTERED : LanguageString::NICK_X_NOT_REGISTERED, name.c_str());
source.Reply(ischan ? _(CHAN_X_NOT_REGISTERED) : _(NICK_X_NOT_REGISTERED), name.c_str());
}
}
else if (z != 2 && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime)
@@ -248,13 +248,13 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
NickAlias *na = *it;
User *user = finduser(na->nick);
if (user && user->IsIdentified())
user->SendMessage(MemoServ, LanguageString::MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
user->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
}
}
else
{
if ((u = finduser(name)) && u->IsIdentified() && nc->HasFlag(NI_MEMO_RECEIVE))
u->SendMessage(MemoServ, LanguageString::MEMO_NEW_MEMO_ARRIVED, sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
u->SendMessage(MemoServ, _(MEMO_NEW_MEMO_ARRIVED), sender.c_str(), Config->s_MemoServ.c_str(), mi->memos.size());
} /* if (flags & MEMO_RECEIVE) */
}
/* if (MSNotifyAll) */
@@ -277,7 +277,7 @@ void memo_send(CommandSource &source, const Anope::string &name, const Anope::st
if (check_access(cu->user, c->ci, CA_MEMO))
{
if (cu->user->Account() && cu->user->Account()->HasFlag(NI_MEMO_RECEIVE))
cu->user->SendMessage(MemoServ, LanguageString::MEMO_NEW_X_MEMO_ARRIVED, c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
cu->user->SendMessage(MemoServ, _(MEMO_NEW_X_MEMO_ARRIVED), c->ci->name.c_str(), Config->s_MemoServ.c_str(), c->ci->name.c_str(), mi->memos.size());
}
}
} /* MSNotifyAll */
src/misc.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ Anope::string do_strftime(const time_t &t)
Anope::string expire_left(NickCore *nc, time_t expires)
{
if (!expires)
return GetString(nc, LanguageString::NO_EXPIRE);
return GetString(nc, _(NO_EXPIRE));
else if (expires <= Anope::CurTime)
return GetString(nc, _("expires at next database update"));
else
src/nickserv.cpp
+5 -5
View File
@@ -172,7 +172,7 @@ int validate_user(User *u)
NickRequest *nr = findrequestnick(u->nick);
if (nr)
{
u->SendMessage(NickServ, LanguageString::NICK_IS_PREREG);
u->SendMessage(NickServ, _(NICK_IS_PREREG));
return 0;
}
@@ -189,7 +189,7 @@ int validate_user(User *u)
if (na->nc->HasFlag(NI_SUSPENDED))
{
u->SendMessage(NickServ, LanguageString::NICK_X_SUSPENDED, u->nick.c_str());
u->SendMessage(NickServ, _(NICK_X_SUSPENDED), u->nick.c_str());
u->Collide(na);
return 0;
}
@@ -209,16 +209,16 @@ int validate_user(User *u)
if (u->IsRecognized() || !na->nc->HasFlag(NI_KILL_IMMED))
{
if (na->nc->HasFlag(NI_SECURE))
u->SendMessage(NickServ, LanguageString::NICK_IS_SECURE, Config->s_NickServ.c_str());
u->SendMessage(NickServ, _(NICK_IS_SECURE), Config->s_NickServ.c_str());
else
u->SendMessage(NickServ, LanguageString::NICK_IS_REGISTERED, Config->s_NickServ.c_str());
u->SendMessage(NickServ, _(NICK_IS_REGISTERED), Config->s_NickServ.c_str());
}
if (na->nc->HasFlag(NI_KILLPROTECT) && !u->IsRecognized())
{
if (na->nc->HasFlag(NI_KILL_IMMED))
{
u->SendMessage(NickServ, LanguageString::FORCENICKCHANGE_NOW);
u->SendMessage(NickServ, _(FORCENICKCHANGE_NOW));
u->Collide(na);
}
else if (na->nc->HasFlag(NI_KILL_QUICK))
src/operserv.cpp
+5 -5
View File
@@ -488,14 +488,14 @@ XLine *SGLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
if (mask.find('@') == Anope::string::npos)
{
if (bi && u)
u->SendMessage(bi, LanguageString::BAD_USERHOST_MASK);
u->SendMessage(bi, _(BAD_USERHOST_MASK));
return NULL;
}
if (mask.find_first_not_of("~@.*?") == Anope::string::npos)
{
if (bi && u)
u->SendMessage(bi, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
u->SendMessage(bi, _(USERHOST_MASK_TOO_WIDE), mask.c_str());
return NULL;
}
@@ -563,7 +563,7 @@ XLine *SNLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
if (!mask.empty() && mask.find_first_not_of("*?") == Anope::string::npos)
{
if (bi && u)
u->SendMessage(bi, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
u->SendMessage(bi, _(USERHOST_MASK_TOO_WIDE), mask.c_str());
return NULL;
}
@@ -666,7 +666,7 @@ XLine *SQLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
if (mask.find_first_not_of("*") == Anope::string::npos)
{
if (bi && u)
u->SendMessage(OperServ, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
u->SendMessage(OperServ, _(USERHOST_MASK_TOO_WIDE), mask.c_str());
return NULL;
}
@@ -798,7 +798,7 @@ XLine *SZLineManager::Add(BotInfo *bi, User *u, const Anope::string &mask, time_
if (mask.find_first_not_of("*?") == Anope::string::npos)
{
u->SendMessage(OperServ, LanguageString::USERHOST_MASK_TOO_WIDE, mask.c_str());
u->SendMessage(OperServ, _(USERHOST_MASK_TOO_WIDE), mask.c_str());
return NULL;
}
src/protocol.cpp
+2 -2
View File
@@ -436,7 +436,7 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
else if (bi == ChanServ)
{
if (!u->HasMode(UMODE_OPER) && Config->CSOpersOnly)
u->SendMessage(ChanServ, LanguageString::ACCESS_DENIED);
u->SendMessage(ChanServ, _(ACCESS_DENIED));
else
mod_run_cmd(bi, u, NULL, message);
}
@@ -451,7 +451,7 @@ bool IRCdMessage::OnPrivmsg(const Anope::string &source, const std::vector<Anope
{
if (!u->HasMode(UMODE_OPER) && Config->OSOpersOnly)
{
u->SendMessage(OperServ, LanguageString::ACCESS_DENIED);
u->SendMessage(OperServ, _(ACCESS_DENIED));
if (Config->WallBadOS)
ircdproto->SendGlobops(OperServ, "Denied access to %s from %s!%s@%s (non-oper)", Config->s_OperServ.c_str(), u->nick.c_str(), u->GetIdent().c_str(), u->host.c_str());
}
src/regchannel.cpp
+1 -1
View File
@@ -793,7 +793,7 @@ bool ChannelInfo::CheckKick(User *user)
if (!do_kick && check_access(user, this, CA_NOJOIN))
{
get_idealban(this, user, mask);
reason = GetString(user->Account(), LanguageString::CHAN_NOT_ALLOWED_TO_JOIN);
reason = GetString(user->Account(), _(CHAN_NOT_ALLOWED_TO_JOIN));
do_kick = true;
}