Changed the language system to use gettext

8 files changed, 212 insertions, 990 deletions

diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp
index 09ab3b481..e8ccde22b 100644
--- a/modules/extra/cs_appendtopic.cpp
+++ b/modules/extra/cs_appendtopic.cpp
@@ -41,14 +41,6 @@
 /* DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING         */
 /* ---------------------------------------------------------------------- */
 
-enum
-{
-	LNG_CHAN_HELP,
-	LNG_CHAN_HELP_APPENDTOPIC,
-	LNG_APPENDTOPIC_SYNTAX,
-	LNG_NUM_STRINGS
-};
-
 static Module *me;
 
 class CommandCSAppendTopic : public Command
@@ -66,9 +58,9 @@ class CommandCSAppendTopic : public Command
 		Channel *c = ci ? ci->c : NULL;
 
 		if (!c)
-			notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str());
+			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!check_access(u, ci, CA_TOPIC))
-			notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
+			u->SendMessage(ChanServ, ACCESS_DENIED);
 		else
 		{
 			Anope::string topic;
@@ -94,21 +86,23 @@ class CommandCSAppendTopic : public Command
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
+		me->SendMessage(ChanServ, u, _("Syntax: APPENDTOPIC channel text"));
 		u->SendMessage(Config->s_ChanServ, " ");
-		me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC);
+		me->SendMessage(ChanServ, u, _("This command allows users to append text to a currently set\n"
+			"channel topic. When TOPICLOCK is on, the topic is updated and\n"
+			"the new, updated topic is locked."));
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
+		me->SendMessage(ChanServ, u, _("Syntax: APPENDTOPIC channel text"));
 	}
 
 	void OnServHelp(User *u)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP);
+		me->SendMessage(ChanServ, u, _("   APPENDTOPIC Add text to a channels topic"));
 	}
 };
 
@@ -125,86 +119,6 @@ class CSAppendTopic : public Module
 		this->SetType(SUPPORTED);
 
 		this->AddCommand(ChanServ, &commandcsappendtopic);
-
-		/* English (US) */
-		const char *langtable_en_us[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Add text to a channels topic",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"This command allows users to append text to a currently set\n"
-			"channel topic. When TOPICLOCK is on, the topic is updated and\n"
-			"the new, updated topic is locked.",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Syntax: APPENDTOPIC channel text\n"
-		};
-
-		/* Dutch (NL) */
-		const char *langtable_nl[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"Dit command stelt gebruikers in staat om text toe te voegen\n"
-			"achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n"
-			"staat, zal het onderwerp worden bijgewerkt en zal het nieuwe,\n"
-			"bijgewerkte topic worden geforceerd.",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Gebruik: APPENDTOPIC kanaal tekst\n"
-		};
-
-		/* German (DE) */
-		const char *langtable_de[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Fьgt einen Text zu einem Channel-Topic hinzu.",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n"
-			"hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n"
-			"und das neue, aktualisierte Topic wird gesperrt.",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Syntax: APPENDTOPIC Channel Text\n"
-		};
-
-		/* Portuguese (PT) */
-		const char *langtable_pt[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Adiciona texto ao tуpico de um canal",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"Este comando permite aos usuбrios anexar texto a um tуpico de canal\n"
-			"jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n"
-			"o novo tуpico й travado.",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Sintaxe: APPENDTOPIC canal texto\n"
-		};
-
-		/* Russian (RU) */
-		const char *langtable_ru[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Добавляет текст к топику канала",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"Данная команда позволяет добавить текст к топику, который установлен на указанном\n"
-			"канале. Если активирован режим TOPICLOCK, топик будет обновлен и заблокирован.\n"
-			"Примечание: текст будет ДОБАВЛЕН к топику, то есть старый топик удален НЕ БУДЕТ.\n",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Синтаксис: APPENDTOPIC #канал текст\n"
-		};
-
-		/* Italian (IT) */
-		const char *langtable_it[] = {
-			/* LNG_CHAN_HELP */
-			"   APPENDTOPIC Aggiunge del testo al topic di un canale",
-			/* LNG_CHAN_HELP_APPENDTOPIC */
-			"Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n"
-			"giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo topic\n"
-			"viene bloccato.",
-			/* LNG_APPENDTOPIC_SYNTAX */
-			"Sintassi: APPENDTOPIC canale testo\n"
-		};
-
-		this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us);
-		this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl);
-		this->InsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de);
-		this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt);
-		this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru);
-		this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
 	}
 };
 
diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp
index 5541aa5ca..2d65422c6 100644
--- a/modules/extra/cs_enforce.cpp
+++ b/modules/extra/cs_enforce.cpp
@@ -15,19 +15,6 @@
 
 #include "module.h"
 
-#define AUTHOR "Anope"
-
-enum
-{
-	LNG_CHAN_HELP,
-	LNG_ENFORCE_SYNTAX,
-	LNG_CHAN_HELP_ENFORCE,
-	LNG_CHAN_HELP_ENFORCE_R_ENABLED,
-	LNG_CHAN_HELP_ENFORCE_R_DISABLED,
-	LNG_CHAN_RESPONSE,
-	LNG_NUM_STRINGS
-};
-
 static Module *me;
 
 class CommandCSEnforce : public Command
@@ -87,7 +74,6 @@ class CommandCSEnforce : public Command
 		ChannelInfo *ci;
 		int16 old_nojoin_level;
 		Anope::string mask;
-		const char *reason;
 
 		if (!(ci = c->ci))
 			return;
@@ -103,9 +89,9 @@ class CommandCSEnforce : public Command
 			if (check_access(uc->user, ci, CA_NOJOIN))
 			{
 				get_idealban(ci, uc->user, mask);
-				reason = getstring(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
+				Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
 				c->SetMode(NULL, CMODE_BAN, mask);
-				c->Kick(NULL, uc->user, "%s", reason);
+				c->Kick(NULL, uc->user, "%s", reason.c_str());
 			}
 		}
 
@@ -127,7 +113,7 @@ class CommandCSEnforce : public Command
 			if (!uc->user->IsIdentified())
 			{
 				get_idealban(ci, uc->user, mask);
-				Anope::string reason = getstring(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
+				Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN);
 				if (!c->HasMode(CMODE_REGISTERED))
 					c->SetMode(NULL, CMODE_BAN, mask);
 				c->Kick(NULL, uc->user, "%s", reason.c_str());
@@ -150,35 +136,35 @@ class CommandCSEnforce : public Command
 			ci = c->ci;
 
 		if (!c)
-			notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str());
+			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!check_access(u, ci, CA_AKICK))
-			notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
+			u->SendMessage(ChanServ, ACCESS_DENIED);
 		else
 		{
 			if (what.empty() || what.equals_ci("SET"))
 			{
 				this->DoSet(c);
-				me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET");
+				me->SendMessage(ChanServ, u, _("Enforced %s"), !what.empty() ? what.c_str() : "SET");
 			}
 			else if (what.equals_ci("MODES"))
 			{
 				this->DoModes(c);
-				me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str());
 			}
 			else if (what.equals_ci("SECUREOPS"))
 			{
 				this->DoSecureOps(c);
-				me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str());
 			}
 			else if (what.equals_ci("RESTRICTED"))
 			{
 				this->DoRestricted(c);
-				me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str());
 			}
 			else if (what.equals_ci("+R"))
 			{
 				this->DoCModeR(c);
-				me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str());
+				me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str());
 			}
 			else
 				this->OnSyntaxError(u, "");
@@ -189,26 +175,44 @@ class CommandCSEnforce : public Command
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_ENFORCE_SYNTAX);
-		u->SendMessage(Config->s_ChanServ, " ");
-		me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE);
-		u->SendMessage(Config->s_ChanServ, " ");
+		me->SendMessage(ChanServ, u, _("Syntax: \002ENFORCE \037channel\037 [\037what\037]\002"));
+		me->SendMessage(ChanServ, u, " ");
+		me->SendMessage(ChanServ, u, _("Enforce various channel modes and set options. The \037channel\037\n"
+			"option indicates what channel to enforce the modes and options\n"
+			"on. The \037what\037 option indicates what modes and options to\n"
+			"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
+			"or +R. When left out, it defaults to SET.\n"
+			" \n"
+			"If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n"
+			"on the users currently in the channel, if they are set. Give\n"
+			"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
+			"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
+			"if it's not enabled."));
+		me->SendMessage(ChanServ, u, " ");
 		if (ModeManager::FindChannelModeByName(CMODE_REGISTERED))
-			me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED);
+			me->SendMessage(ChanServ, u, _("If \037what\037 is MODES, it will enforce channelmode +R if it is\n"
+				"set. If +R is specified for \037what\037, the +R channelmode will\n"
+				"also be enforced, but even if it is not set. If it is not set,\n"
+				"users will be banned to ensure they don't just rejoin."));
 		else
-			me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED);
+			me->SendMessage(ChanServ, u, _("If \037what\037 is MODES, nothing will be enforced, since it would\n"
+				"enforce modes that the current ircd does not support. If +R is\n"
+				"specified for \037what\037, an equalivant of channelmode +R on\n"
+				"other ircds will be enforced. All users that are in the channel\n"
+				"but have not identified for their nickname will be kicked and\n"
+				"banned from the channel."));
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_ENFORCE_SYNTAX);
+		me->SendMessage(ChanServ, u, _("Syntax: \002ENFORCE \037channel\037 [\037what\037]\002"));
 	}
 
 	void OnServHelp(User *u)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP);
+		me->SendMessage(ChanServ, u, _("    ENFORCE    Enforce various channel modes and set options"));
 	}
 };
 
@@ -221,218 +225,10 @@ class CSEnforce : public Module
 	{
 		me = this;
 
-		this->SetAuthor(AUTHOR);
+		this->SetAuthor("Anope");
 		this->SetType(SUPPORTED);
 
 		this->AddCommand(ChanServ, &commandcsenforce);
-
-		/* English (US) */
-		const char *langtable_en_us[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Enforce various channel modes and set options",
-			/* LNG_ENFORCE_SYNTAX */
-			"Syntax: \002ENFORCE \037channel\037 [\037what\037]\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Enforce various channel modes and set options. The \037channel\037\n"
-			"option indicates what channel to enforce the modes and options\n"
-			"on. The \037what\037 option indicates what modes and options to\n"
-			"enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n"
-			"or +R. When left out, it defaults to SET.\n"
-			" \n"
-			"If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n"
-			"on the users currently in the channel, if they are set. Give\n"
-			"SECUREOPS to enforce the SECUREOPS option, even if it is not\n"
-			"enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n"
-			"if it's not enabled.",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"If \037what\037 is MODES, it will enforce channelmode +R if it is\n"
-			"set. If +R is specified for \037what\037, the +R channelmode will\n"
-			"also be enforced, but even if it is not set. If it is not set,\n"
-			"users will be banned to ensure they don't just rejoin.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"If \037what\037 is MODES, nothing will be enforced, since it would\n"
-			"enforce modes that the current ircd does not support. If +R is\n"
-			"specified for \037what\037, an equalivant of channelmode +R on\n"
-			"other ircds will be enforced. All users that are in the channel\n"
-			"but have not identified for their nickname will be kicked and\n"
-			"banned from the channel.",
-			/* LNG_CHAN_RESPONSE */
-			"Enforced %s"
-		};
-
-		/* Dutch (NL) */
-		const char *langtable_nl[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Forceer enkele kanaalmodes en set-opties",
-			/* LNG_ENFORCE_SYNTAX */
-			"Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Forceer enkele kannalmodes en set-opties. De \037kanaal\037 optie\n"
-			"geeft aan op welk kanaal de modes en opties geforceerd moeten\n"
-			"worden. De \037wat\037 optie geeft aan welke modes en opties\n"
-			"geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n"
-			"MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n"
-			" \n"
-			"Als er voor \037wat\037 SET wordt ingevuld, zullen SECUREOPS en\n"
-			"RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n"
-			"maar alleen als die opties aangezet zijn voor het kanaal. Als\n"
-			"SECUREOPS of RESTRICTED wordt gegeven voor \037wat\037 zal die optie\n"
-			"altijd geforceerd worden, ook als die niet is aangezet.",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"Als er voor \037wat\037 MODES wordt ingevuld, zal kanaalmode +R worden\n"
-			"geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n"
-			"zal kanaalmode +R worden geforceerd, maar ook als die niet aan"
-			"staat voor het kanaal. Als +R niet aan staat, zullen alle ook\n"
-			"gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n"
-			"kunnen komen.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"Als er voor \037wat\037 MODES wordt ingevuld, zal er niks gebeuren.\n"
-			"Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n"
-			"server niet ondersteund wordt. Als +R wordt ingevuld voor \037wat\037\n"
-			"zullen alle gebruikers die in het kanaal zitten maar zich niet\n"
-			"hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n"
-			"verbannen worden.",
-			/* LNG_CHAN_RESPONSE */
-			"Enforced %s"
-		};
-
-		/* German (DE) */
-		const char *langtable_de[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Erzwingt verschieden Modes und SET Optionen",
-			/* LNG_ENFORCE_SYNTAX */
-			"Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Erzwingt verschieden Modes und SET Optionen. Die \037Channel\037\n"
-			"Option zeigt dir den Channel an, indem Modes und Optionen\n"
-			"zu erzwingen sind. Die \037was\037 Option zeigt dir welche Modes\n"
-			"und Optionen zu erzwingen sind. Die kцnnen nur SET, SECUREOPS,\n"
-			"RESTRICTED, MODES oder +R sein.Default ist SET.\n"
-			" \n"
-			"Wenn \037was\037 SET ist, wird SECUREOPS und RESTRICTED\n"
-			"auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n"
-			"Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n"
-			"zu erzwingen, also wenn sie nicht eingeschaltet sind.",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"Wenn \037was\037 MODES ist, wird das ChannelMode +R erzwungen\n"
-			"falls an. Wenn \037was\037 +R ist, wird +R erzwungen aber eben\n"
-			"wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n"
-			"Channel-Mode war werden alle User aus den Channel gebannt um\n"
-			"sicher zu sein das sie nicht rejoinen.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"Wenn \037was\037 MODES ist, wird nichts erzwungen weil es MODES seine\n"
-			"kцnnen die dein IRCD nicht unterstьtzt. Wenn \037was\037 +R ist\n"
-			"oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n"
-			"erzwungen. Alle User die nicht fьr deren Nicknamen identifiziert\n"
-			"sind werden aus den Channel gekickt und gebannt.",
-			/* LNG_CHAN_RESPONSE */
-			"Erzwungen %s"
-		};
-
-		/* Portuguese (PT) */
-		const char *langtable_pt[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas",
-			/* LNG_ENFORCE_SYNTAX */
-			"Sintaxe: \002ENFORCE \037canal\037 [\037opзгo\037]\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas.\n"
-			"O campo \037canal\037 indica qual canal deve ter os modos e opзхes verificadas\n"
-			"O campo \037opзгo\037 indica quais modos e opзхes devem ser verificadas,\n"
-			"e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n"
-			"Quando deixado em branco, o padrгo й SET.\n"
-			" \n"
-			"Se \037opзгo\037 for SET, serгo verificadas as opзхes SECUREOPS e RESTRICTED\n"
-			"para usuбrios que estiverem no canal, caso elas estejam ativadas. Use\n"
-			"SECUREOPS para verificar a opзгo SECUREOPS, mesmo que ela nгo esteja ativada\n"
-			"Use RESTRICTED para verificar a opзгo RESTRICTED, mesmo que ela nгo esteja\n"
-			"ativada.",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"Se \037opзгo\037 for MODES, serб verificado o modo de canal +R caso ele\n"
-			"esteja ativado. Se +R for especificado para \037opзгo\037, o modo de canal\n"
-			"+R tambйm serб verificado, mesmo que ele nгo esteja ativado. Se ele nгo\n"
-			"estiver ativado, os usuбrios serгo banidos para evitar que reentrem no canal.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"Se \037opзгo\037 for MODES, nada serб verificado, visto que isto poderia\n"
-			"verificar modos que o IRCd atual nгo suporta. Se +R for especificado\n"
-			"para \037opзгo\037, um equivalente ao modo de canal +R em outros IRCds\n"
-			"serб verificado. Todos os usuбrios que estгo no canal, mas nгo estejam\n"
-			"identificados para seus nicks serгo kickados e banidos do canal.",
-			/* LNG_CHAN_RESPONSE */
-			"Verificado %s"
-		};
-
-		/* Russian (RU) */
-		const char *langtable_ru[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Перепроверка и установка различных режимов и опций канала",
-			/* LNG_ENFORCE_SYNTAX */
-			"Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Перепроверка и установка различных режимов и опций канала.\n"
-			"\037Параметр\037 указывает какие опции или режимы канала должны быть\n"
-			"перепроверены. В качестве параметра могут быть указаны: SET, SECUREOPS,\n"
-			"RESTRICTED, MODES, или +R. Если параметр не указан, по-умолчанию будет SET.\n"
-			" \n"
-			"Если в качестве \037параметра\037 указано SET, будут перепроверены опции\n"
-			"SECUREOPS и RESTRICTED относительно пользователей на указанном канале\n"
-			"(при условии, что опции включены). Отдельно указанный параметр SECUREOPS\n"
-			"применит опцию SECUREOPS (даже если она \037НЕ\037 установлена). Параметр\n"
-			"RESTRICTED применит опцию RESTRICTED (даже если она \037НЕ\037 установлена)",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"Если в качестве \037параметра\037 указано MODES, будет перепроверен режим +R\n"
-			"(если он установлен). Отдельно указанный параметр \037+R\037 применит\n"
-			"канальный режим +R, даже если он не установлен, и забанит всех пользователей,\n"
-			"которые не идентифицировались к своему нику или не имеют зарегистрированного ника.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"Если в качестве \037параметра\037 указано MODES, перепроверка осуществлена\n"
-			"НЕ БУДЕТ, так как текущий IRCD не поддерживает необходимые режимы.\n"
-			"Отдельно указанный параметр \037+R\037 применит канальный режим, эквивалентный\n"
-			"режиму +R и забанит всех пользователей, которые не идентифицировались к своему\n"
-			"нику или не имеют зарегистрированного ника.",
-			/* LNG_CHAN_RESPONSE */
-			"Перепроверено: %s"
-		};
-
-		/* Italian (IT) */
-		const char *langtable_it[] = {
-			/* LNG_CHAN_HELP */
-			"    ENFORCE    Forza diversi modi di canale ed opzioni SET",
-			/* LNG_ENFORCE_SYNTAX */
-			"Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002",
-			/* LNG_CHAN_HELP_ENFORCE */
-			"Forza diversi modi di canale ed opzioni SET. Il parametro \037canale\037\n"
-			"indica il canale sul quale forzare i modi e le opzioni. Il parametro\n"
-			"\037cosa\037 indica i modi e le opzioni da forzare, e possono essere\n"
-			"qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n"
-			"Se non specificato, viene sottointeso SET.\n"
-			" \n"
-			"Se \037cosa\037 и SET, forzerа SECUREOPS e RESTRICTED sugli utenti\n"
-			"attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n"
-			"forzare l'opzione SECUREOPS, anche se non и attivata. Specifica\n"
-			"RESTRICTED per forzare l'opzione RESTRICTED, anche se non и\n"
-			"attivata.",
-			/* LNG_CHAN_HELP_ENFORCE_R_ENABLED */
-			"Se \037cosa\037 и MODES, forzerа il modo del canale +R se и impostato.\n"
-			"Se +R и specificato per \037cosa\037, il modo del canale +R verrа\n"
-			"forzato, anche se non и impostato. Se non и impostato, gli utenti\n"
-			"verranno bannati per assicurare che non rientrino semplicemente.",
-			/* LNG_CHAN_HELP_ENFORCE_R_DISABLED */
-			"Se \037cosa\037 и MODES, niente verrа forzato, siccome forzerebbe\n"
-			"dei modi che l'ircd in uso non supporterebbe. Se +R и specificato\n"
-			"per \037cosa\037, un modo equivalente a +R sui altri ircd verrа\n"
-			"forzato. Tutti gli utenti presenti nel canale ma non identificati\n"
-			"per il loro nickname verranno bannati ed espulsi dal canale.\n",
-			/* LNG_CHAN_RESPONSE */
-			"Forzato %s"
-		};
-
-		this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us);
-		this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl);
-		this->InsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de);
-		this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt);
-		this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru);
-		this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it);
 	}
 };
 
diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp
index 8b4395043..e72fdec03 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/extra/cs_set_misc.cpp
@@ -30,17 +30,17 @@ class CommandCSSetMisc : public Command
 		if (params.size() > 1)
 		{
 			ci->Extend("chanserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1]));
-			notice_lang(Config->s_ChanServ, u, CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str());
+			u->SendMessage(ChanServ, CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str());
 		}
 		else
-			notice_lang(Config->s_ChanServ, u, CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str());
+			u->SendMessage(ChanServ, CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str());
 
 		return MOD_CONT;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &)
 	{
-		syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX);
+		SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX);
 	}
 
 	void OnServHelp(User *u)
@@ -58,7 +58,7 @@ class CommandCSSASetMisc : public CommandCSSetMisc
 
 	void OnSyntaxError(User *u, const Anope::string &)
 	{
-		syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX);
+		SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX);
 	}
 };
 
diff --git a/modules/extra/cs_tban.cpp b/modules/extra/cs_tban.cpp
index 32bcd4add..444681262 100644
--- a/modules/extra/cs_tban.cpp
+++ b/modules/extra/cs_tban.cpp
@@ -17,25 +17,39 @@
 
 #include "module.h"
 
-#define AUTHOR "Rob"
+static Module *me;
 
-void mySendResponse(User *u, const Anope::string &channel, const Anope::string &mask, const Anope::string &time);
-
-void addBan(Channel *c, time_t timeout, const Anope::string &banmask);
-int canBanUser(Channel *c, User *u, User *u2);
+class TempBan : public CallBack
+{
+ private:
+	dynamic_reference<Channel> chan;
+	Anope::string mask;
 
-void mAddLanguages();
+ public:
+	TempBan(time_t seconds, Channel *c, const Anope::string &banmask) : CallBack(me, seconds), chan(c), mask(banmask) { }
 
-static Module *me = NULL;
+	void Tick(time_t ctime)
+	{
+		if (chan && chan->ci)
+			chan->RemoveMode(NULL, CMODE_BAN, mask);
+	}
+};
 
-enum
+static bool CanBanUser(Channel *c, User *u, User *u2)
 {
-	TBAN_HELP,
-	TBAN_SYNTAX,
-	TBAN_HELP_DETAIL,
-	TBAN_RESPONSE,
-	LANG_NUM_STRINGS
-};
+	ChannelInfo *ci = c->ci;
+	bool ok = false;
+	if (!check_access(u, ci, CA_BAN))
+		u->SendMessage(ChanServ, ACCESS_DENIED);
+	else if (is_excepted(ci, u2))
+		u->SendMessage(ChanServ, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
+	else if (u2->IsProtected())
+		u->SendMessage(ChanServ, ACCESS_DENIED);
+	else
+		ok = true;
+
+	return ok;
+}
 
 class CommandCSTBan : public Command
 {
@@ -55,15 +69,16 @@ class CommandCSTBan : public Command
 		Anope::string time = params[2];
 
 		if (!(c = findchan(chan)))
-			notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str());
+			u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str());
 		else if (!(u2 = finduser(nick)))
-			notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, nick.c_str());
+			u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, nick.c_str());
 		else
-			if (canBanUser(c, u, u2))
+			if (CanBanUser(c, u, u2))
 			{
 				get_idealban(c->ci, u2, mask);
-				addBan(c, dotime(time), mask);
-				mySendResponse(u, chan, mask, time);
+				c->SetMode(NULL, CMODE_BAN, mask);
+				new TempBan(dotime(time), c, mask);
+				me->SendMessage(ChanServ, u, _("%s banned from %s, will auto-expire in %s"), mask.c_str(), c->name.c_str(), time.c_str());
 			}
 
 		return MOD_CONT;
@@ -72,20 +87,21 @@ class CommandCSTBan : public Command
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
 		this->OnSyntaxError(u, "");
-		u->SendMessage(Config->s_ChanServ, " ");
-		me->NoticeLang(Config->s_ChanServ, u, TBAN_HELP_DETAIL);
+		me->SendMessage(ChanServ, u, " ");
+		me->SendMessage(ChanServ, u, _("Bans the given user from a channel for a specified length of\n"
+			"time. If the ban is removed before by hand, it will NOT be replaced."));
 
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, TBAN_SYNTAX);
+		me->SendMessage(ChanServ, u, _("Syntax: TBAN channel nick time"));
 	}
 
 	void OnServHelp(User *u)
 	{
-		me->NoticeLang(Config->s_ChanServ, u, TBAN_HELP);
+		me->SendMessage(ChanServ, u, _("    TBAN       Bans the user for a given length of time"));
 	}
 };
 
@@ -100,112 +116,9 @@ class CSTBan : public Module
 
 		this->AddCommand(ChanServ, &commandcstban);
 
-		this->SetAuthor(AUTHOR);
+		this->SetAuthor("Anope");
 		this->SetType(SUPPORTED);
-
-		const char *langtable_en_us[] = {
-			"    TBAN       Bans the user for a given length of time",
-			"Syntax: TBAN channel nick time",
-			"Bans the given user from a channel for a specified length of\n"
-			"time. If the ban is removed before by hand, it will NOT be replaced.",
-			"%s banned from %s, will auto-expire in %s"
-		};
-
-		const char *langtable_nl[] = {
-			"    TBAN       Verban een gebruiker voor een bepaalde tijd",
-			"Syntax: TBAN kanaal nick tijd",
-			"Verbant de gegeven gebruiken van het gegeven kanaal voor de\n"
-			"gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n"
-			"zal deze NIET worden vervangen.",
-			"%s verbannen van %s, zal verlopen in %s"
-		};
-
-		const char *langtable_de[] = {
-			"    TBAN       Bant ein User fьr eine bestimmte Zeit aus ein Channel",
-			"Syntax: TBAN Channel Nickname Zeit",
-			"Bant ein User fьr eine bestimmte Zeit aus ein Channel\n"
-			"Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt.",
-			"%s gebannt von %s, wird auto-auslaufen in %s"
-		};
-
-		const char *langtable_pt[] = {
-			"    TBAN       Bane o usuбrio por um determinado perнodo de tempo",
-			"Sintaxe: TBAN canal nick tempo",
-			"Bane de um canal o usuбrio especificado por um determinado perнodo de\n"
-			"tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб recolocado.",
-			"%s foi banido do %s, irб auto-expirar em %s"
-		};
-
-		const char *langtable_ru[] = {
-			"    TBAN       Банит пользователя на указанный промежуток времени",
-			"Синтаксис: TBAN #канал ник время",
-			"Банит пользователя на указанный промежуток времени в секундах\n"
-			"Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n"
-			"переустановлен сервисами автоматически!",
-			"Установленный бан %s на канале %s истечет через %s секунд"
-		};
-
-		const char *langtable_it[] = {
-			"    TBAN       Banna l'utente per un periodo di tempo specificato",
-			"Sintassi: TBAN canale nick tempo",
-			"Banna l'utente specificato da un canale per un periodo di tempo\n"
-			"specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа rimpiazzato.",
-			"%s bannato da %s, scadrа automaticamente tra %s"
-		};
-
-		this->InsertLanguage(LANG_EN_US, LANG_NUM_STRINGS, langtable_en_us);
-		this->InsertLanguage(LANG_NL, LANG_NUM_STRINGS, langtable_nl);
-		this->InsertLanguage(LANG_DE, LANG_NUM_STRINGS, langtable_de);
-		this->InsertLanguage(LANG_PT, LANG_NUM_STRINGS, langtable_pt);
-		this->InsertLanguage(LANG_RU, LANG_NUM_STRINGS, langtable_ru);
-		this->InsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it);
 	}
 };
 
-void mySendResponse(User *u, const Anope::string &channel, const Anope::string &mask, const Anope::string &time)
-{
-	me->NoticeLang(Config->s_ChanServ, u, TBAN_RESPONSE, mask.c_str(), channel.c_str(), time.c_str());
-}
-
-class TempBan : public CallBack
-{
- private:
-	Anope::string chan;
-	Anope::string mask;
-
- public:
-	TempBan(time_t seconds, const Anope::string &channel, const Anope::string &banmask) : CallBack(me, seconds), chan(channel), mask(banmask) { }
-
-	void Tick(time_t ctime)
-	{
-		Channel *c;
-
-		if ((c = findchan(chan)) && c->ci)
-			c->RemoveMode(NULL, CMODE_BAN, mask);
-	}
-};
-
-void addBan(Channel *c, time_t timeout, const Anope::string &banmask)
-{
-	c->SetMode(NULL, CMODE_BAN, banmask);
-
-	new TempBan(timeout, c->name, banmask);
-}
-
-int canBanUser(Channel *c, User *u, User *u2)
-{
-	ChannelInfo *ci = c->ci;
-	int ok = 0;
-	if (!check_access(u, ci, CA_BAN))
-		notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
-	else if (is_excepted(ci, u2))
-		notice_lang(Config->s_ChanServ, u, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
-	else if (u2->IsProtected())
-		notice_lang(Config->s_ChanServ, u, ACCESS_DENIED);
-	else
-		ok = 1;
-
-	return ok;
-}
-
 MODULE_INIT(CSTBan)
diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp
index eb55a3952..b15ce4de4 100644
--- a/modules/extra/db_mysql.cpp
+++ b/modules/extra/db_mysql.cpp
@@ -291,13 +291,13 @@ class CommandSQLSync : public Command
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		notice_help(Config->s_OperServ, u, OPER_HELP_SYNC);
+		u->SendMessage(OperServ, OPER_HELP_SYNC);
 		return true;
 	}
 
 	void OnServHelp(User *u)
 	{
-		notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SQLSYNC);
+		u->SendMessage(OperServ, OPER_HELP_CMD_SQLSYNC);
 	}
 };
 
@@ -429,7 +429,7 @@ class DBMySQL : public Module
 				}
 			}
 
-			nc->language = r.Get(i, "language").is_number_only() ? convertTo<int>(r.Get(i, "language")) : LANG_EN_US;
+			nc->language = r.Get(i, "language");
 			nc->channelcount = r.Get(i, "channelcount").is_number_only() ? convertTo<int>(r.Get(i, "channelcount")) : 0;
 			nc->memos.memomax = r.Get(i, "memomax").is_number_only() ? convertTo<int>(r.Get(i, "memomax")) : 20;
 		}
@@ -1533,7 +1533,7 @@ static void SaveDatabases()
 CommandReturn CommandSQLSync::Execute(User *u, const std::vector<Anope::string> &params)
 {
 	SaveDatabases();
-	notice_lang(Config->s_OperServ, u, OPER_SYNC_UPDATED);
+	u->SendMessage(OperServ, OPER_SYNC_UPDATED);
 	return MOD_CONT;
 }
 
diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp
index edca02ade..9ae097d27 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/extra/hs_request.cpp
@@ -1,5 +1,5 @@
 /* hs_request.c - Add request and activate functionality to HostServ,
- *				along with adding +req as optional param to HostServ list.
+ *
  *
  * (C) 2003-2010 Anope Team
  * Contact us at team@anope.org
@@ -17,48 +17,12 @@
 
 #include "module.h"
 
-#define AUTHOR "Rob"
-
-/* Configuration variables */
-int HSRequestMemoUser = 0;
-int HSRequestMemoOper = 0;
-int HSRequestMemoSetters = 0;
-
-/* Language defines */
-enum
-{
-	LNG_REQUEST_SYNTAX,
-	LNG_REQUESTED,
-	LNG_REQUEST_WAIT,
-	LNG_REQUEST_MEMO,
-	LNG_ACTIVATE_SYNTAX,
-	LNG_ACTIVATED,
-	LNG_ACTIVATE_MEMO,
-	LNG_REJECT_SYNTAX,
-	LNG_REJECTED,
-	LNG_REJECT_MEMO,
-	LNG_REJECT_MEMO_REASON,
-	LNG_NO_REQUEST,
-	LNG_HELP,
-	LNG_HELP_SETTER,
-	LNG_HELP_REQUEST,
-	LNG_HELP_ACTIVATE,
-	LNG_HELP_ACTIVATE_MEMO,
-	LNG_HELP_REJECT,
-	LNG_HELP_REJECT_MEMO,
-	LNG_WAITING_SYNTAX,
-	LNG_HELP_WAITING,
-	LNG_NUM_STRINGS
-};
+static bool HSRequestMemoUser = false;
+static bool HSRequestMemoOper = false;
 
 void my_add_host_request(const Anope::string &nick, const Anope::string &vIdent, const Anope::string &vhost, const Anope::string &creator, time_t tmp_time);
-int my_isvalidchar(char c);
-void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...);
 void req_send_memos(User *u, const Anope::string &vIdent, const Anope::string &vHost);
 
-void my_load_config();
-void my_add_languages();
-
 struct HostRequest
 {
 	Anope::string ident;
@@ -73,6 +37,13 @@ static Module *me;
 
 class CommandHSRequest : public Command
 {
+	bool isvalidchar(char c)
+	{
+		if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '.' || c == '-')
+			return true;
+		return false;
+	}
+
  public:
 	CommandHSRequest() : Command("REQUEST", 1, 1