From ce362854a39c35249f8d2c7bcf27e3d5f9aa9980 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 16 Apr 2025 00:04:30 +0100 Subject: Update as many messages as possible for automatic line wrapping. --- modules/botserv/botserv.cpp | 64 +++++---- modules/botserv/bs_assign.cpp | 30 +++-- modules/botserv/bs_badwords.cpp | 57 ++++---- modules/botserv/bs_bot.cpp | 36 ++--- modules/botserv/bs_botlist.cpp | 28 ++-- modules/botserv/bs_control.cpp | 6 +- modules/botserv/bs_info.cpp | 12 +- modules/botserv/bs_kick.cpp | 281 +++++++++++++++++++++++++--------------- modules/botserv/bs_set.cpp | 31 +++-- 9 files changed, 328 insertions(+), 217 deletions(-) (limited to 'modules/botserv') diff --git a/modules/botserv/botserv.cpp b/modules/botserv/botserv.cpp index cd9d7f7ae..99e2c9134 100644 --- a/modules/botserv/botserv.cpp +++ b/modules/botserv/botserv.cpp @@ -135,29 +135,41 @@ public: if (source.c) { - source.Reply(_("\002%s\002 allows you to execute \"fantasy\" commands in the channel.\n" - "Fantasy commands are commands that can be executed from messaging a\n" - "channel, and provide a more convenient way to execute commands. Commands that\n" - "require a channel as a parameter will automatically have that parameter\n" - "given.\n"), source.service->nick.c_str()); + source.Reply(_( + "\002%s\002 allows you to execute \"fantasy\" commands in the channel. " + "Fantasy commands are commands that can be executed from messaging a " + "channel, and provide a more convenient way to execute commands. Commands that " + "require a channel as a parameter will automatically have that parameter " + "given." + ), + source.service->nick.c_str()); + const Anope::string &fantasycharacters = Config->GetModule("fantasy").Get("fantasycharacter", "!"); if (!fantasycharacters.empty()) - source.Reply(_(" \n" - "Fantasy commands may be prefixed with one of the following characters: %s\n"), fantasycharacters.c_str()); - source.Reply(_(" \n" - "Available commands are:")); + { + source.Reply(" "); + source.Reply(_("Fantasy commands may be prefixed with one of the following characters: %s"), + fantasycharacters.c_str()); + } + source.Reply(" "); + source.Reply(_("Available commands are:")); } else if (*source.service == BotServ) { - source.Reply(_("\002%s\002 allows you to have a bot on your own channel.\n" - "It has been created for users that can't host or\n" - "configure a bot, or for use on networks that don't\n" - "allow user bots. Available commands are listed\n" - "below; to use them, type \002%s \037command\037\002. For\n" - "more information on a specific command, type\n" - "\002%s \037command\037\002.\n"), - BotServ->nick.c_str(), BotServ->GetQueryCommand().c_str(), + source.Reply(_( + "\002%s\002 allows you to have a bot on your own channel. " + "It has been created for users that can't host or " + "configure a bot, or for use on networks that don't " + "allow user bots. Available commands are listed " + "below; to use them, type \002%s\032\037command\037\002. For " + "more information on a specific command, type " + "\002%s\032\037command\037\002." + ), + BotServ->nick.c_str(), + BotServ->GetQueryCommand().c_str(), BotServ->GetQueryCommand({}, source.command).c_str()); + + source.Reply(" "); } return EVENT_CONTINUE; @@ -168,14 +180,20 @@ public: if (!params.empty() || source.c || source.service != *BotServ) return; - source.Reply(_(" \n" - "Bot will join a channel whenever there is at least\n" - "\002%d\002 user(s) on it."), Config->GetModule(this).Get("minusers")); + source.Reply(" "); + source.Reply(_("Bot will join a channel whenever there is at least \002%d\002 user(s) on it."), + Config->GetModule(this).Get("minusers")); + const Anope::string &fantasycharacters = Config->GetModule("fantasy").Get("fantasycharacter", "!"); if (!fantasycharacters.empty()) - source.Reply(_("Additionally, if fantasy is enabled fantasy commands\n" - "can be executed by prefixing the command name with\n" - "one of the following characters: %s"), fantasycharacters.c_str()); + { + source.Reply(_( + "Additionally, if fantasy is enabled fantasy commands " + "can be executed by prefixing the command name with " + "one of the following characters: %s" + ), + fantasycharacters.c_str()); + } } EventReturn OnChannelModeSet(Channel *c, MessageSource &source, ChannelMode *mode, const Anope::string ¶m) override diff --git a/modules/botserv/bs_assign.cpp b/modules/botserv/bs_assign.cpp index f80e9c17e..292c89459 100644 --- a/modules/botserv/bs_assign.cpp +++ b/modules/botserv/bs_assign.cpp @@ -76,9 +76,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Assigns the specified bot to a channel. You\n" - "can then configure the bot for the channel so it fits\n" - "your needs.")); + source.Reply(_( + "Assigns the specified bot to a channel. You " + "can then configure the bot for the channel so it fits " + "your needs." + )); return true; } }; @@ -138,11 +140,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Unassigns a bot from a channel. When you use this command,\n" - "the bot won't join the channel anymore. However, bot\n" - "configuration for the channel is kept, so you will always\n" - "be able to reassign a bot later without having to reconfigure\n" - "it entirely.")); + source.Reply(_( + "Unassigns a bot from a channel. When you use this command, " + "the bot won't join the channel anymore. However, bot " + "configuration for the channel is kept, so you will always " + "be able to reassign a bot later without having to reconfigure " + "it entirely." + )); return true; } }; @@ -197,10 +201,12 @@ public: bool OnHelp(CommandSource &source, const Anope::string &) override { this->SendSyntax(source); - source.Reply(_(" \n" - "This option makes a channel unassignable. If a bot\n" - "is already assigned to the channel, it is unassigned\n" - "automatically when you enable it.")); + source.Reply(" "); + source.Reply(_( + "This option makes a channel unassignable. If a bot " + "is already assigned to the channel, it is unassigned " + "automatically when you enable it." + )); return true; } }; diff --git a/modules/botserv/bs_badwords.cpp b/modules/botserv/bs_badwords.cpp index 789689699..d50ca0f95 100644 --- a/modules/botserv/bs_badwords.cpp +++ b/modules/botserv/bs_badwords.cpp @@ -435,35 +435,38 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Maintains the \002bad words list\002 for a channel. The bad\n" - "words list determines which words are to be kicked\n" - "when the bad words kicker is enabled. For more information,\n" - "type \002%s KICK %s\002.\n" - " \n" - "The \002ADD\002 command adds the given word to the\n" - "bad words list. If SINGLE is specified, a kick will be\n" - "done only if a user says the entire word. If START is\n" - "specified, a kick will be done if a user says a word\n" - "that starts with \037word\037. If END is specified, a kick\n" - "will be done if a user says a word that ends with\n" - "\037word\037. If you don't specify anything, a kick will\n" - "be issued every time \037word\037 is said by a user.\n" - " \n"), source.service->GetQueryCommand("generic/help").c_str(), source.command.c_str()); - - source.Reply(_("The \002DEL\002 command removes the given word from the\n" - "bad words list. If a list of entry numbers is given, those\n" - "entries are deleted. (See the example for LIST below.)\n" - " \n" - "The \002LIST\002 command displays the bad words list. If\n" - "a wildcard mask is given, only those entries matching the\n" - "mask are displayed. If a list of entry numbers is given,\n" + source.Reply(_( + "Maintains the \002bad words list\002 for a channel. The bad " + "words list determines which words are to be kicked " + "when the bad words kicker is enabled. For more information, " + "type \002%s\032KICK\032%s\002." + "\n\n" + "The \002ADD\002 command adds the given word to the " + "bad words list. If SINGLE is specified, a kick will be " + "done only if a user says the entire word. If START is " + "specified, a kick will be done if a user says a word " + "that starts with \037word\037. If END is specified, a kick " + "will be done if a user says a word that ends with " + "\037word\037. If you don't specify anything, a kick will " + "be issued every time \037word\037 is said by a user." + "\n\n" + "The \002DEL\002 command removes the given word from the " + "bad words list. If a list of entry numbers is given, those " + "entries are deleted. (See the example for LIST below.)" + "\n\n" + "The \002LIST\002 command displays the bad words list. If " + "a wildcard mask is given, only those entries matching the " + "mask are displayed. If a list of entry numbers is given, " "only those entries are shown; for example:\n" - " \002#channel LIST 2-5,7-9\002\n" + " \002#channel\032LIST\0322-5,7-9\002\n" " Lists bad words entries numbered 2 through 5 and\n" - " 7 through 9.\n" - " \n" - "The \002CLEAR\002 command clears all entries from the\n" - "bad words list.")); + " 7 through 9." + "\n\n" + "The \002CLEAR\002 command clears all entries from the " + "bad words list." + ), + source.service->GetQueryCommand("generic/help").c_str(), + source.command.c_str()); return true; } }; diff --git a/modules/botserv/bs_bot.cpp b/modules/botserv/bs_bot.cpp index 829b8ec9d..cd39f73b0 100644 --- a/modules/botserv/bs_bot.cpp +++ b/modules/botserv/bs_bot.cpp @@ -347,23 +347,25 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows Services Operators to create, modify, and delete\n" - "bots that users will be able to use on their own\n" - "channels.\n" - " \n" - "\002BOT ADD\002 adds a bot with the given nickname, username,\n" - "hostname and realname. Since no integrity checks are done\n" - "for these settings, be really careful.\n" - " \n" - "\002BOT CHANGE\002 allows you to change the nickname, username, hostname\n" - "or realname of a bot without deleting it (and\n" - "all the data associated with it).\n" - " \n" - "\002BOT DEL\002 removes the given bot from the bot list.\n" - " \n" - "\002Note\002: You cannot create a bot with a nick that is\n" - "currently registered. If an unregistered user is currently\n" - "using the nick, they will be killed.")); + source.Reply(_( + "Allows Services Operators to create, modify, and delete " + "bots that users will be able to use on their own " + "channels." + "\n\n" + "\002BOT\032ADD\002 adds a bot with the given nickname, username, " + "hostname and realname. Since no integrity checks are done " + "for these settings, be really careful." + "\n\n" + "\002BOT\032CHANGE\002 allows you to change the nickname, username, hostname " + "or realname of a bot without deleting it (and " + "all the data associated with it)." + "\n\n" + "\002BOT\032DEL\002 removes the given bot from the bot list." + "\n\n" + "\002Note\002: You cannot create a bot with a nick that is " + "currently registered. If an unregistered user is currently " + "using the nick, they will be killed." + )); return true; } }; diff --git a/modules/botserv/bs_botlist.cpp b/modules/botserv/bs_botlist.cpp index dbb92a999..c49d5bc26 100644 --- a/modules/botserv/bs_botlist.cpp +++ b/modules/botserv/bs_botlist.cpp @@ -70,8 +70,12 @@ public: list.Process(replies); if (!count) - source.Reply(_("There are no bots available at this time.\n" - "Ask a Services Operator to create one!")); + { + source.Reply(_( + "There are no bots available at this time. " + "Ask a Services Operator to create one!" + )); + } else { source.Reply(_("Bot list:")); @@ -87,15 +91,17 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Lists all available bots on this network.\n" - "\n" - "If the OPERONLY, UNUSED or VANITY options are given only\n" - "bots which, respectively, are oper-only, unused or were\n" - "added at runtime will be displayed. If multiple options are\n" - "given, all nicks matching at least one option will be\n" - "displayed.\n" - "\n" - "Note that these options are limited to \037Services Operators\037.")); + source.Reply(_( + "Lists all available bots on this network." + "\n\n" + "If the OPERONLY, UNUSED or VANITY options are given only " + "bots which, respectively, are oper-only, unused or were " + "added at runtime will be displayed. If multiple options are " + "given, all nicks matching at least one option will be " + "displayed." + "\n\n" + "Note that these options are limited to \037Services Operators\037." + )); return true; } }; diff --git a/modules/botserv/bs_control.cpp b/modules/botserv/bs_control.cpp index 2ea81a45b..e97b98871 100644 --- a/modules/botserv/bs_control.cpp +++ b/modules/botserv/bs_control.cpp @@ -122,8 +122,10 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Makes the bot do the equivalent of a \"/me\" command\n" - "on the specified channel using the specified text.")); + source.Reply(_( + "Makes the bot do the equivalent of a \"/me\" command " + "on the specified channel using the specified text." + )); return true; } }; diff --git a/modules/botserv/bs_info.cpp b/modules/botserv/bs_info.cpp index ae4af76cf..8ecff03ec 100644 --- a/modules/botserv/bs_info.cpp +++ b/modules/botserv/bs_info.cpp @@ -104,11 +104,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows you to see %s information about a channel or a bot.\n" - "If the parameter is a channel, then you'll get information\n" - "such as enabled kickers. If the parameter is a nick,\n" - "you'll get information about a bot, such as creation\n" - "time or number of channels it is on."), source.service->nick.c_str()); + source.Reply(_( + "Allows you to see %s information about a channel or a bot. " + "If the parameter is a channel, then you'll get information " + "such as enabled kickers. If the parameter is a nick, " + "you'll get information about a bot, such as creation " + "time or number of channels it is on." + ), source.service->nick.c_str()); return true; } diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp index 835d90491..80d8fc45d 100644 --- a/modules/botserv/bs_kick.cpp +++ b/modules/botserv/bs_kick.cpp @@ -153,13 +153,14 @@ public: } } - source.Reply(_("Type \002%s \037option\037\002 for more information\n" - "on a specific option.\n" - " \n" - "Note: access to this command is controlled by the\n" - "level SET."), + source.Reply(_( + "Type \002%s\032\037option\037\002 for more information " + "on a specific option." + "\n\n" + "Note: access to this command is controlled by the " + "level SET." + ), source.service->GetQueryCommand("generic/help", this_name).c_str()); - return true; } }; @@ -221,8 +222,10 @@ protected: val = true; if (kd->ttb[ttb_idx]) - source.Reply(_("Bot will now kick for \002%s\002, and will place a ban\n" - "after %d kicks for the same user."), optname.c_str(), kd->ttb[ttb_idx]); + { + source.Reply(_("Bot will now kick for \002%s\002, and will place a ban after %d kicks for the same user."), + optname.c_str(), kd->ttb[ttb_idx]); + } else source.Reply(_("Bot will now kick for \002%s\002."), optname.c_str()); @@ -268,13 +271,16 @@ public: this->SendSyntax(source); source.Reply(" "); BotInfo *bi = Config->GetClient("BotServ"); - source.Reply(_("Sets the AMSG kicker on or off. When enabled, the bot will\n" - "kick users who send the same message to multiple channels\n" - "where %s bots are.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before they get banned. Don't give ttb to disable\n" - "the ban system once activated."), bi ? bi->nick.c_str() : "BotServ"); + source.Reply(_( + "Sets the AMSG kicker on or off. When enabled, the bot will " + "kick users who send the same message to multiple channels " + "where %s bots are." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before they get banned. Don't give ttb to disable " + "the ban system once activated." + ), + bi ? bi->nick.c_str() : "BotServ"); return true; } }; @@ -305,16 +311,19 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the bad words kicker on or off. When enabled, this\n" - "option tells the bot to kick users who say certain words\n" - "on the channels.\n" - "You can define bad words for your channel using the\n" - "\002BADWORDS\002 command. Type \002%s BADWORDS\002 for\n" - "more information.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated."), + source.Reply(_( + "Sets the bad words kicker on or off. When enabled, this " + "option tells the bot to kick users who say certain words " + "on the channels." + "\n\n" + "You can define bad words for your channel using the " + "\002BADWORDS\002 command. Type \002%s\032BADWORDS\002 for " + "more information." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + ), source.service->GetQueryCommand("generic/help").c_str()); return true; } @@ -345,12 +354,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the bolds kicker on or off. When enabled, this\n" - "option tells the bot to kick users who use bolds.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the bolds kicker on or off. When enabled, this " + "option tells the bot to kick users who use bolds." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -402,12 +413,23 @@ public: kd->caps = true; if (kd->ttb[TTB_CAPS]) - source.Reply(_("Bot will now kick for \002caps\002 (they must constitute at least\n" - "%d characters and %d%% of the entire message), and will\n" - "place a ban after %d kicks for the same user."), kd->capsmin, kd->capspercent, kd->ttb[TTB_CAPS]); + { + source.Reply(_( + "Bot will now kick for \002caps\002 (they must constitute at least " + "%d characters and %d%% of the entire message), and will " + "place a ban after %d kicks for the same user." + ), + kd->capsmin, + kd->capspercent, + kd->ttb[TTB_CAPS]); + } else - source.Reply(_("Bot will now kick for \002caps\002 (they must constitute at least\n" - "%d characters and %d%% of the entire message)."), kd->capsmin, kd->capspercent); + source.Reply(_( + "Bot will now kick for \002caps\002 (they must constitute at least " + "%d characters and %d%% of the entire message)." + ), + kd->capsmin, + kd->capspercent); } else { @@ -422,17 +444,20 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the caps kicker on or off. When enabled, this\n" - "option tells the bot to kick users who are talking in\n" - "CAPS.\n" - "The bot kicks only if there are at least \002min\002 caps\n" - "and they constitute at least \002percent\002%% of the total\n" - "text line (if not given, it defaults to 10 characters\n" - "and 25%%).\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the caps kicker on or off. When enabled, this " + "option tells the bot to kick users who are talking in " + "CAPS." + "\n\n" + "The bot kicks only if there are at least \002min\002 caps " + "and they constitute at least \002percent\002%% of the total " + "text line (if not given, it defaults to 10 characters " + "and 25%%)." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -462,12 +487,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the colors kicker on or off. When enabled, this\n" - "option tells the bot to kick users who use colors.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the colors kicker on or off. When enabled, this " + "option tells the bot to kick users who use colors." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -522,8 +549,15 @@ public: kd->flood = true; if (kd->ttb[TTB_FLOOD]) - source.Reply(_("Bot will now kick for \002flood\002 (%d lines in %d seconds\n" - "and will place a ban after %d kicks for the same user."), kd->floodlines, kd->floodsecs, kd->ttb[TTB_FLOOD]); + { + source.Reply(_( + "Bot will now kick for \002flood\002 (%d lines in %d seconds " + "and will place a ban after %d kicks for the same user." + ), + kd->floodlines, + kd->floodsecs, + kd->ttb[TTB_FLOOD]); + } else source.Reply(_("Bot will now kick for \002flood\002 (%d lines in %d seconds)."), kd->floodlines, kd->floodsecs); } @@ -542,14 +576,15 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the flood kicker on or off. When enabled, this\n" - "option tells the bot to kick users who are flooding\n" - "the channel using at least \002ln\002 lines in \002secs\002 seconds\n" - "(if not given, it defaults to 6 lines in 10 seconds).\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the flood kicker on or off. When enabled, this " + "option tells the bot to kick users who are flooding " + "the channel using at least \002ln\002 lines in \002secs\002 seconds " + "(if not given, it defaults to 6 lines in 10 seconds). " + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated.")); return true; } }; @@ -579,12 +614,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the italics kicker on or off. When enabled, this\n" - "option tells the bot to kick users who use italics.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the italics kicker on or off. When enabled, this " + "option tells the bot to kick users who use italics. " + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -633,22 +670,42 @@ public: if (kd->ttb[TTB_REPEAT]) { if (kd->repeattimes != 1) - source.Reply(_("Bot will now kick for \002repeats\002 (users that repeat the\n" - "same message %d times), and will place a ban after %d\n" - "kicks for the same user."), kd->repeattimes, kd->ttb[TTB_REPEAT]); + { + source.Reply(_( + "Bot will now kick for \002repeats\002 (users that repeat the " + "same message %d times), and will place a ban after %d " + "kicks for the same user." + ), + kd->repeattimes, + kd->ttb[TTB_REPEAT]); + } else - source.Reply(_("Bot will now kick for \002repeats\002 (users that repeat the\n" - "same message %d time), and will place a ban after %d\n" - "kicks for the same user."), kd->repeattimes, kd->ttb[TTB_REPEAT]); + source.Reply(_( + "Bot will now kick for \002repeats\002 (users that repeat the " + "same message %d time), and will place a ban after %d " + "kicks for the same user." + ), + kd->repeattimes, + kd->ttb[TTB_REPEAT]); } else { if (kd->repeattimes != 1) - source.Reply(_("Bot will now kick for \002repeats\002 (users that repeat the\n" - "same message %d times)."), kd->repeattimes); + { + source.Reply(_( + "Bot will now kick for \002repeats\002 (users that repeat the " + "same message %d times)." + ), + kd->repeattimes); + } else - source.Reply(_("Bot will now kick for \002repeats\002 (users that repeat the\n" - "same message %d time)."), kd->repeattimes); + { + source.Reply(_( + "Bot will now kick for \002repeats\002 (users that repeat the " + "same message %d time)." + ), + kd->repeattimes); + } } } else if (params[1].equals_ci("OFF")) @@ -666,14 +723,16 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the repeat kicker on or off. When enabled, this\n" - "option tells the bot to kick users who are repeating\n" - "themselves \002num\002 times (if num is not given, it\n" - "defaults to 3).\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the repeat kicker on or off. When enabled, this " + "option tells the bot to kick users who are repeating " + "themselves \002num\002 times (if num is not given, it " + "defaults to 3)." + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -703,12 +762,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the reverses kicker on or off. When enabled, this\n" - "option tells the bot to kick users who use reverses.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the reverses kicker on or off. When enabled, this " + "option tells the bot to kick users who use reverses. " + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -738,12 +799,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets the underlines kicker on or off. When enabled, this\n" - "option tells the bot to kick users who use underlines.\n" - " \n" - "\037ttb\037 is the number of times a user can be kicked\n" - "before it gets banned. Don't give ttb to disable\n" - "the ban system once activated.")); + source.Reply(_( + "Sets the underlines kicker on or off. When enabled, this " + "option tells the bot to kick users who use underlines. " + "\n\n" + "\037ttb\037 is the number of times a user can be kicked " + "before it gets banned. Don't give ttb to disable " + "the ban system once activated." + )); return true; } }; @@ -806,10 +869,12 @@ public: bool OnHelp(CommandSource &source, const Anope::string &) override { this->SendSyntax(source); - source.Reply(_(" \n" - "Enables or disables \002ops protection\002 mode on a channel.\n" - "When it is enabled, ops won't be kicked by the bot\n" - "even if they don't match the NOKICK level.")); + source.Reply(" "); + source.Reply(_( + "Enables or disables \002ops protection\002 mode on a channel. " + "When it is enabled, ops won't be kicked by the bot " + "even if they don't match the NOKICK level." + )); return true; } }; @@ -872,10 +937,12 @@ public: bool OnHelp(CommandSource &source, const Anope::string &) override { this->SendSyntax(source); - source.Reply(_(" \n" - "Enables or disables \002voices protection\002 mode on a channel.\n" - "When it is enabled, voices won't be kicked by the bot\n" - "even if they don't match the NOKICK level.")); + source.Reply(" "); + source.Reply(_( + "Enables or disables \002voices protection\002 mode on a channel. " + "When it is enabled, voices won't be kicked by the bot " + "even if they don't match the NOKICK level." + )); return true; } }; diff --git a/modules/botserv/bs_set.cpp b/modules/botserv/bs_set.cpp index 7110e123b..4cce07b98 100644 --- a/modules/botserv/bs_set.cpp +++ b/modules/botserv/bs_set.cpp @@ -30,9 +30,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Configures bot options.\n" - " \n" - "Available options:")); + source.Reply(_( + "Configures bot options." + "\n\n" + "Available options:" + )); bool hide_privileged_commands = Config->GetBlock("options").Get("hideprivilegedcommands"), hide_registered_commands = Config->GetBlock("options").Get("hideregisteredcommands"); Anope::string this_name = source.command; @@ -58,8 +60,7 @@ public: } } } - source.Reply(_("Type \002%s \037option\037\002 for more information on a\n" - "particular option."), + source.Reply(_("Type \002%s\032\037option\037\002 for more information on a particular option."), source.service->GetQueryCommand("generic/help", this_name).c_str()); return true; @@ -151,11 +152,13 @@ public: bool OnHelp(CommandSource &source, const Anope::string &) override { this->SendSyntax(source); - source.Reply(_(" \n" - "Sets the time bot bans expire in. If enabled, any bans placed by\n" - "bots, such as flood kicker, badwords kicker, etc. will automatically\n" - "be removed after the given time. Set to 0 to disable bans from\n" - "automatically expiring.")); + source.Reply(" "); + source.Reply(_( + "Sets the time bot bans expire in. If enabled, any bans placed by " + "bots, such as flood kicker, badwords kicker, etc. will automatically " + "be removed after the given time. Set to 0 to disable bans from " + "automatically expiring." + )); return true; } }; @@ -204,9 +207,11 @@ public: bool OnHelp(CommandSource &source, const Anope::string &) override { this->SendSyntax(source); - source.Reply(_(" \n" - "This option prevents a bot from being assigned to a\n" - "channel by users that aren't IRC Operators.")); + source.Reply(" "); + source.Reply(_( + "This option prevents a bot from being assigned to a " + "channel by users that aren't IRC Operators." + )); return true; } }; -- cgit