summaryrefslogtreecommitdiff
path: root/modules/chanserv
diff options
context:
space:
mode:
Diffstat (limited to 'modules/chanserv')
-rw-r--r--modules/chanserv/cs_access.cpp74
-rw-r--r--modules/chanserv/cs_akick.cpp29
-rw-r--r--modules/chanserv/cs_entrymsg.cpp46
-rw-r--r--modules/chanserv/cs_mode.cpp10
4 files changed, 94 insertions, 65 deletions
diff --git a/modules/chanserv/cs_access.cpp b/modules/chanserv/cs_access.cpp
index c7754b2ad..43082ee02 100644
--- a/modules/chanserv/cs_access.cpp
+++ b/modules/chanserv/cs_access.cpp
@@ -591,7 +591,7 @@ public:
"a user level of 0, and any unregistered user has a user level "
"of -1."
"\n\n"
- "The \002ACCESS\032ADD\002 command adds the given mask to the "
+ "The \002%s\032ADD\002 command adds the given mask to the "
"access list with the given user level; if the mask is "
"already present on the list, its access level is changed to "
"the level specified in the command. The \037level\037 specified "
@@ -599,7 +599,8 @@ public:
"When a user joins the channel the access they receive is from the "
"highest level entry in the access list."
),
- source.service->nick.c_str());
+ source.service->nick.c_str(),
+ source.command.nobreak().c_str());
if (!Config->GetModule("chanserv").Get<bool>("disallow_channel_access"))
{
@@ -611,26 +612,32 @@ public:
source.Reply(" ");
source.Reply(_(
- "The \002ACCESS\032DEL\002 command removes the given nick from the "
- "access list. If a list of entry numbers is given, those "
- "entries are deleted. (See the example for LIST below.) "
- "You may remove yourself from an access list, even if you "
- "do not have access to modify that list otherwise."
- "\n\n"
- "The \002ACCESS\032LIST\002 command displays the access 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"
- " \002ACCESS\032#channel\032LIST\0322-5,7-9\002\n"
- " Lists access entries numbered 2 through 5 and\n"
- " 7 through 9."
- "\n\n"
- "The \002ACCESS\032VIEW\002 command displays the access list similar "
- "to \002ACCESS\032LIST\002 but shows the creator and last used time."
- "\n\n"
- "The \002ACCESS\032CLEAR\002 command clears all entries of the "
- "access list."
- ));
+ "The \002%s\032DEL\002 command removes the given nick from the "
+ "access list. If a list of entry numbers is given, those "
+ "entries are deleted. (See the example for LIST below.) "
+ "You may remove yourself from an access list, even if you "
+ "do not have access to modify that list otherwise."
+ "\n\n"
+ "The \002%s\032LIST\002 command displays the access 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%s\032#channel\032LIST\0322-5,7-9\002\n"
+ " Lists access entries numbered 2 through 5 and\n"
+ " 7 through 9."
+ "\n\n"
+ "The \002%s\032VIEW\002 command displays the access list similar "
+ "to \002%s\032LIST\002 but shows the creator and last used time."
+ "\n\n"
+ "The \002%s\032CLEAR\002 command clears all entries of the "
+ "access list."
+ ),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str());
BotInfo *bi;
Anope::string cmd;
@@ -853,27 +860,34 @@ public:
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_(
- "The \002LEVELS\002 command allows fine control over the meaning of "
+ "The \002%s\002 command allows fine control over the meaning of "
"the numeric access levels used for channels. With this "
"command, you can define the access level required for most "
"of %s's functions. (The \002SET\032FOUNDER\002 and this command "
"are always restricted to the channel founder)."
"\n\n"
- "\002LEVELS\032SET\002 allows the access level for a function or group of "
- "functions to be changed. \002LEVELS\032DISABLE\002 (or \002DIS\002 for short) "
+ "\002%s\032SET\002 allows the access level for a function or group of "
+ "functions to be changed. \002%s\032DISABLE\002 (or \002DIS\002 for short) "
"disables an automatic feature or disallows access to a "
"function by anyone, INCLUDING the founder (although, the founder "
- "can always re-enable it). Use \002LEVELS\032SET founder\002 to make a level "
+ "can always re-enable it). Use \002%s\032SET founder\002 to make a level "
"founder only."
"\n\n"
- "\002LEVELS\032LIST\002 shows the current levels for each function or "
- "group of functions. \002LEVELS\032RESET\002 resets the levels to the "
+ "\002%s\032LIST\002 shows the current levels for each function or "
+ "group of functions. \002%s\032RESET\002 resets the levels to the "
"default levels of a newly-created channel."
"\n\n"
"For a list of the features and functions whose levels can be "
- "set, see \002HELP\032LEVELS\032DESC\002."
+ "set, see \002HELP\032%s\032DESC\002."
),
- source.service->nick.c_str());
+ source.service->nick.c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str());
}
return true;
}
diff --git a/modules/chanserv/cs_akick.cpp b/modules/chanserv/cs_akick.cpp
index b242fed4a..ef63c4d3f 100644
--- a/modules/chanserv/cs_akick.cpp
+++ b/modules/chanserv/cs_akick.cpp
@@ -494,7 +494,7 @@ public:
"%s will ban that user from the channel, then kick "
"the user."
"\n\n"
- "The \002AKICK\032ADD\002 command adds the given nick or usermask "
+ "The \002%s\032ADD\002 command adds the given nick or usermask "
"to the AutoKick list. If a \037reason\037 is given with "
"the command, that reason will be used when the user is "
"kicked; if not, the default reason is \"User has been "
@@ -503,28 +503,35 @@ public:
"will be added to the akick list instead of the mask. "
"All users within that nickgroup will then be akicked. "
"\n\n"
- "The \002AKICK\032DEL\002 command removes the given nick or mask "
+ "The \002%s\032DEL\002 command removes the given nick or mask "
"from the AutoKick list. It does not, however, remove any "
"bans placed by an AutoKick; those must be removed "
"manually."
"\n\n"
- "The \002AKICK\032LIST\002 command displays the AutoKick list, or "
+ "The \002%s\032LIST\002 command displays the AutoKick list, or "
"optionally only those AutoKick entries which match the "
"given mask."
"\n\n"
- "The \002AKICK\032VIEW\002 command is a more verbose version of the "
- "\002AKICK\032LIST\002 command."
+ "The \002%s\032VIEW\002 command is a more verbose version of the "
+ "\002%s\032LIST\002 command."
"\n\n"
- "The \002AKICK\032ENFORCE\002 command causes %s to enforce the "
- "current AKICK list by removing those users who match an "
- "AKICK mask."
+ "The \002%s\032ENFORCE\002 command causes %s to enforce the "
+ "current akick list by removing those users who match an "
+ "akick mask."
"\n\n"
- "The \002AKICK\032CLEAR\002 command clears all entries of the "
+ "The \002%s\032CLEAR\002 command clears all entries of the "
"akick list."
),
source.service->nick.c_str(),
- source.service->nick.c_str(),
- bi ? bi->nick.c_str() : "NickServ");
+ source.command.nobreak().c_str(),
+ bi ? bi->nick.c_str() : "NickServ",
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str());
return true;
}
diff --git a/modules/chanserv/cs_entrymsg.cpp b/modules/chanserv/cs_entrymsg.cpp
index fa3c59c84..ac83e45f1 100644
--- a/modules/chanserv/cs_entrymsg.cpp
+++ b/modules/chanserv/cs_entrymsg.cpp
@@ -246,27 +246,31 @@ public:
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_(
- "Controls what messages will be sent to users when they join the channel."
- "\n\n"
- "The \002ENTRYMSG\032ADD\002 command adds the given message to "
- "the list of messages shown to users when they join "
- "the channel."
- "\n\n"
- "The \002ENTRYMSG\032DEL\002 command removes the specified message from "
- "the list of messages shown to users when they join "
- "the channel. You can remove a message by specifying its number "
- "which you can get by listing the messages as explained below."
- "\n\n"
- "The \002ENTRYMSG\032LIST\002 command displays a listing of messages "
- "shown to users when they join the channel."
- "\n\n"
- "The \002ENTRYMSG\032CLEAR\002 command clears all entries from "
- "the list of messages shown to users when they join "
- "the channel, effectively disabling entry messages."
- "\n\n"
- "Adding, deleting, or clearing entry messages requires the "
- "SET permission."
- ));
+ "Controls what messages will be sent to users when they join the channel."
+ "\n\n"
+ "The \002%s\032ADD\002 command adds the given message to "
+ "the list of messages shown to users when they join "
+ "the channel."
+ "\n\n"
+ "The \002%s\032DEL\002 command removes the specified message from "
+ "the list of messages shown to users when they join "
+ "the channel. You can remove a message by specifying its number "
+ "which you can get by listing the messages as explained below."
+ "\n\n"
+ "The \002%s\032LIST\002 command displays a listing of messages "
+ "shown to users when they join the channel."
+ "\n\n"
+ "The \002%s\032CLEAR\002 command clears all entries from "
+ "the list of messages shown to users when they join "
+ "the channel, effectively disabling entry messages."
+ "\n\n"
+ "Adding, deleting, or clearing entry messages requires the "
+ "SET permission."
+ ),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str());
return true;
}
};
diff --git a/modules/chanserv/cs_mode.cpp b/modules/chanserv/cs_mode.cpp
index f7f417d28..26741654f 100644
--- a/modules/chanserv/cs_mode.cpp
+++ b/modules/chanserv/cs_mode.cpp
@@ -784,16 +784,16 @@ public:
"modify the existing mode lock."
"\n\n"
"Example:\n"
- " \002MODE\032#channel\032LOCK\032ADD\032+bmnt\032*!*@*aol*\002\n"
+ " \002%s\032#channel\032%s\032ADD\032+bmnt\032*!*@*aol*\002\n"
"\n\n"
"The \002%s\032SET\002 command allows you to set modes through services. Wildcards * and ? may "
"be given as parameters for list and status modes."
"\n\n"
"Example:\n"
- " \002MODE\032#channel\032SET\032+v\032*\002\n"
+ " \002%s\032#channel\032SET\032+v\032*\002\n"
" Sets voice status to all users in the channel."
"\n\n"
- " \002MODE\032#channel\032SET\032-b\032~c:*\n"
+ " \002%s\032#channel\032SET\032-b\032~c:*\n"
" Clears all extended bans that start with ~c:"
"\n\n"
"The \002%s\032CLEAR\002 command is an easy way to clear modes on a channel. \037what\037 may be "
@@ -802,6 +802,10 @@ public:
),
source.command.nobreak().c_str(),
source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
+ source.command.nobreak().c_str(),
source.command.nobreak().c_str());
return true;
}