Changed the language system to use gettext

1 files changed, 37 insertions, 37 deletions

diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index 990dba800..7f9acc5ed 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -30,7 +30,7 @@ class CommandBSSet : public Command
 
 		if (readonly)
 		{
-			notice_lang(Config->s_BotServ, u, BOT_SET_DISABLED);
+			u->SendMessage(BotServ, BOT_SET_DISABLED);
 			return MOD_CONT;
 		}
 
@@ -40,28 +40,28 @@ class CommandBSSet : public Command
 
 			if (!(bi = findbot(chan)))
 			{
-				notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, chan.c_str());
+				u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, chan.c_str());
 				return MOD_CONT;
 			}
 
 			if (value.equals_ci("ON"))
 			{
 				bi->SetFlag(BI_PRIVATE);
-				notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick.c_str());
+				u->SendMessage(BotServ, BOT_SET_PRIVATE_ON, bi->nick.c_str());
 			}
 			else if (value.equals_ci("OFF"))
 			{
 				bi->UnsetFlag(BI_PRIVATE);
-				notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick.c_str());
+				u->SendMessage(BotServ, BOT_SET_PRIVATE_OFF, bi->nick.c_str());
 			}
 			else
-				syntax_error(Config->s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
+				SyntaxError(BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX);
 			return MOD_CONT;
 		}
 		else if (!(ci = cs_findchan(chan)))
-			notice_lang(Config->s_BotServ, u, CHAN_X_NOT_REGISTERED, chan.c_str());
+			u->SendMessage(BotServ, CHAN_X_NOT_REGISTERED, chan.c_str());
 		else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
-			notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
+			u->SendMessage(BotServ, ACCESS_DENIED);
 		else
 		{
 			bool override = !check_access(u, ci, CA_SET);
@@ -72,60 +72,60 @@ class CommandBSSet : public Command
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_DONTKICKOPS);
-					notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_DONTKICKOPS_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_DONTKICKOPS);
-					notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
+					SyntaxError(BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX);
 			}
 			else if (option.equals_ci("DONTKICKVOICES"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_DONTKICKVOICES);
-					notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_DONTKICKVOICES);
-					notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
+					SyntaxError(BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX);
 			}
 			else if (option.equals_ci("FANTASY"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_FANTASY);
-					notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_FANTASY_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_FANTASY);
-					notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_FANTASY_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
+					SyntaxError(BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX);
 			}
 			else if (option.equals_ci("GREET"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_GREET);
-					notice_lang(Config->s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_GREET_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_GREET);
-					notice_lang(Config->s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_GREET_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX);
+					SyntaxError(BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX);
 			}
 			else if (u->Account()->HasCommand("botserv/set/nobot") && option.equals_ci("NOBOT"))
 			{
@@ -134,33 +134,33 @@ class CommandBSSet : public Command
 					ci->botflags.SetFlag(BS_NOBOT);
 					if (ci->bi)
 						ci->bi->UnAssign(u, ci);
-					notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_NOBOT_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_NOBOT);
-					notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_NOBOT_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
+					SyntaxError(BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX);
 			}
 			else if (option.equals_ci("SYMBIOSIS"))
 			{
 				if (value.equals_ci("ON"))
 				{
 					ci->botflags.SetFlag(BS_SYMBIOSIS);
-					notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_SYMBIOSIS_ON, ci->name.c_str());
 				}
 				else if (value.equals_ci("OFF"))
 				{
 					ci->botflags.UnsetFlag(BS_SYMBIOSIS);
-					notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
+					u->SendMessage(BotServ, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str());
 				}
 				else
-					syntax_error(Config->s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
+					SyntaxError(BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX);
 			}
 			else
-				notice_help(Config->s_BotServ, u, BOT_SET_UNKNOWN, option.c_str());
+				u->SendMessage(BotServ, BOT_SET_UNKNOWN, option.c_str());
 		}
 		return MOD_CONT;
 	}
@@ -169,24 +169,24 @@ class CommandBSSet : public Command
 	{
 		if (subcommand.empty())
 		{
-			notice_help(Config->s_BotServ, u, BOT_HELP_SET);
+			u->SendMessage(BotServ, BOT_HELP_SET);
 			if (u->Account() && u->Account()->IsServicesOper())
-				notice_help(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET);
+				u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET);
 		}
 		else if (subcommand.equals_ci("DONTKICKOPS"))
-			notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKOPS);
+			u->SendMessage(BotServ, BOT_HELP_SET_DONTKICKOPS);
 		else if (subcommand.equals_ci("DONTKICKVOICES"))
-			notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES);
+			u->SendMessage(BotServ, BOT_HELP_SET_DONTKICKVOICES);
 		else if (subcommand.equals_ci("FANTASY"))
-			notice_help(Config->s_BotServ, u, BOT_HELP_SET_FANTASY);
+			u->SendMessage(BotServ, BOT_HELP_SET_FANTASY);
 		else if (subcommand.equals_ci("GREET"))
-			notice_help(Config->s_BotServ, u, BOT_HELP_SET_GREET);
+			u->SendMessage(BotServ, BOT_HELP_SET_GREET);
 		else if (subcommand.equals_ci("SYMBIOSIS"))
-			notice_lang(Config->s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str());
+			u->SendMessage(BotServ, BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str());
 		else if (subcommand.equals_ci("NOBOT"))
-			notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT);
+			u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET_NOBOT);
 		else if (subcommand.equals_ci("PRIVATE"))
-			notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE);
+			u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET_PRIVATE);
 		else
 			return false;
 
@@ -195,12 +195,12 @@ class CommandBSSet : public Command
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		syntax_error(Config->s_BotServ, u, "SET", BOT_SET_SYNTAX);
+		SyntaxError(BotServ, u, "SET", BOT_SET_SYNTAX);
 	}
 
 	void OnServHelp(User *u)
 	{
-		notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_SET);
+		u->SendMessage(BotServ, BOT_HELP_CMD_SET);
 	}
 };