Changed the language system to use gettext

1 files changed, 37 insertions, 37 deletions

diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp
index 7054ed479..067633964 100644
--- a/modules/core/bs_bot.cpp
+++ b/modules/core/bs_bot.cpp
@@ -26,60 +26,60 @@ class CommandBSBot : public Command
 
 		if (findbot(nick))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick.c_str());
+			u->SendMessage(BotServ, BOT_BOT_ALREADY_EXISTS, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nick.length() > Config->NickLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		if (user.length() > Config->UserLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_LONG_IDENT, Config->UserLen);
+			u->SendMessage(BotServ, BOT_LONG_IDENT, Config->UserLen);
 			return MOD_CONT;
 		}
 
 		if (host.length() > Config->HostLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_LONG_HOST, Config->HostLen);
+			u->SendMessage(BotServ, BOT_LONG_HOST, Config->HostLen);
 			return MOD_CONT;
 		}
 
 		/* Check the nick is valid re RFC 2812 */
 		if (isdigit(nick[0]) || nick[0] == '-')
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i)
 			if (!isvalidnick(nick[i]))
 			{
-				notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+				u->SendMessage(BotServ, BOT_BAD_NICK);
 				return MOD_CONT;
 			}
 
 		/* check for hardcored ircd forbidden nicks */
 		if (!ircdproto->IsNickValid(nick))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		/* Check the host is valid re RFC 2812 */
 		if (!isValidHost(host, 3))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_HOST);
+			u->SendMessage(BotServ, BOT_BAD_HOST);
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i)
 			if (!isalnum(user[i]))
 			{
-				notice_lang(Config->s_BotServ, u, BOT_BAD_IDENT, Config->UserLen);
+				u->SendMessage(BotServ, BOT_BAD_IDENT, Config->UserLen);
 				return MOD_CONT;
 			}
 
@@ -89,20 +89,20 @@ class CommandBSBot : public Command
 		*/
 		if (findnick(nick))
 		{
-			notice_lang(Config->s_BotServ, u, NICK_ALREADY_REGISTERED, nick.c_str());
+			u->SendMessage(BotServ, NICK_ALREADY_REGISTERED, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!(bi = new BotInfo(nick, user, host, real)))
 		{
 			// XXX this cant happen?
-			notice_lang(Config->s_BotServ, u, BOT_BOT_CREATION_FAILED);
+			u->SendMessage(BotServ, BOT_BOT_CREATION_FAILED);
 			return MOD_CONT;
 		}
 
 		Log(LOG_ADMIN, u, this) << "ADD " << bi->GetMask() << " " << bi->realname;
 
-		notice_lang(Config->s_BotServ, u, BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
+		u->SendMessage(BotServ, BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
 
 		FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi));
 		return MOD_CONT;
@@ -125,37 +125,37 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(oldnick)))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str());
+			u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(oldnick, false))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str());
+			u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nick.length() > Config->NickLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		if (!user.empty() && user.length() > Config->UserLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_LONG_IDENT, Config->UserLen);
+			u->SendMessage(BotServ, BOT_LONG_IDENT, Config->UserLen);
 			return MOD_CONT;
 		}
 
 		if (!host.empty() && host.length() > Config->HostLen)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_LONG_HOST, Config->HostLen);
+			u->SendMessage(BotServ, BOT_LONG_HOST, Config->HostLen);
 			return MOD_CONT;
 		}
 
 		if (!oldnick.equals_ci(nick) && nickIsServices(nick, false))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str());
+			u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str());
 			return MOD_CONT;
 		}
 
@@ -166,34 +166,34 @@ class CommandBSBot : public Command
 		*/
 		if (nick.equals_cs(bi->nick) && (!user.empty() ? user.equals_cs(bi->GetIdent()) : 1) && (!host.empty() ? host.equals_cs(bi->host) : 1) && (!real.empty() ? real.equals_cs(bi->realname) : 1))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BOT_ANY_CHANGES);
+			u->SendMessage(BotServ, BOT_BOT_ANY_CHANGES);
 			return MOD_CONT;
 		}
 
 		/* Check the nick is valid re RFC 2812 */
 		if (isdigit(nick[0]) || nick[0] == '-')
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i)
 			if (!isvalidnick(nick[i]))
 			{
-				notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+				u->SendMessage(BotServ, BOT_BAD_NICK);
 				return MOD_CONT;
 			}
 
 		/* check for hardcored ircd forbidden nicks */
 		if (!ircdproto->IsNickValid(nick))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_NICK);
+			u->SendMessage(BotServ, BOT_BAD_NICK);
 			return MOD_CONT;
 		}
 
 		if (!host.empty() && !isValidHost(host, 3))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BAD_HOST);
+			u->SendMessage(BotServ, BOT_BAD_HOST);
 			return MOD_CONT;
 		}
 
@@ -201,13 +201,13 @@ class CommandBSBot : public Command
 			for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i)
 				if (!isalnum(user[i]))
 				{
-					notice_lang(Config->s_BotServ, u, BOT_BAD_IDENT, Config->UserLen);
+					u->SendMessage(BotServ, BOT_BAD_IDENT, Config->UserLen);
 					return MOD_CONT;
 				}
 
 		if (!nick.equals_ci(bi->nick) && findbot(nick))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick.c_str());
+			u->SendMessage(BotServ, BOT_BOT_ALREADY_EXISTS, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -219,7 +219,7 @@ class CommandBSBot : public Command
 			*/
 			if (findnick(nick))
 			{
-				notice_lang(Config->s_BotServ, u, NICK_ALREADY_REGISTERED, nick.c_str());
+				u->SendMessage(BotServ, NICK_ALREADY_REGISTERED, nick.c_str());
 				return MOD_CONT;
 			}
 
@@ -262,7 +262,7 @@ class CommandBSBot : public Command
 			bi->RejoinAll();
 		}
 
-		notice_lang(Config->s_BotServ, u, BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
+		u->SendMessage(BotServ, BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
 		Log(LOG_ADMIN, u, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname;
 
 		FOREACH_MOD(I_OnBotChange, OnBotChange(bi));
@@ -282,13 +282,13 @@ class CommandBSBot : public Command
 
 		if (!(bi = findbot(nick)))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str());
+			u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
 		if (nickIsServices(nick, false))
 		{
-			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str());
+			u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -301,7 +301,7 @@ class CommandBSBot : public Command
 		Log(LOG_ADMIN, u, this) << "DEL " << bi->nick;
 
 		delete bi;
-		notice_lang(Config->s_BotServ, u, BOT_BOT_DELETED, nick.c_str());
+		u->SendMessage(BotServ, BOT_BOT_DELETED, nick.c_str());
 		return MOD_CONT;
 	}
  public:
@@ -316,7 +316,7 @@ class CommandBSBot : public Command
 
 		if (readonly)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_BOT_READONLY);
+			u->SendMessage(BotServ, BOT_BOT_READONLY);
 			return MOD_CONT;
 		}
 
@@ -325,7 +325,7 @@ class CommandBSBot : public Command
 			// ADD nick user host real - 5
 			if (!u->Account()->HasCommand("botserv/bot/add"))
 			{
-				notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
+				u->SendMessage(BotServ, ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -348,7 +348,7 @@ class CommandBSBot : public Command
 			// but only oldn and newn are required
 			if (!u->Account()->HasCommand("botserv/bot/change"))
 			{
-				notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
+				u->SendMessage(BotServ, ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -365,7 +365,7 @@ class CommandBSBot : public Command
 			// DEL nick
 			if (!u->Account()->HasCommand("botserv/bot/del"))
 			{
-				notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
+				u->SendMessage(BotServ, ACCESS_DENIED);
 				return MOD_CONT;
 			}
 
@@ -385,18 +385,18 @@ class CommandBSBot : public Command
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_BOT);
+		u->SendMessage(BotServ, BOT_SERVADMIN_HELP_BOT);
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		syntax_error(Config->s_BotServ, u, "BOT", BOT_BOT_SYNTAX);
+		SyntaxError(BotServ, u, "BOT", BOT_BOT_SYNTAX);
 	}
 
 	void OnServHelp(User *u)
 	{
-		notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_BOT);
+		u->SendMessage(BotServ, BOT_HELP_CMD_BOT);
 	}
 };