From a53a797271fe1c68296a5c4848f827670518a309 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 4 Feb 2011 18:32:04 -0500 Subject: [PATCH] Replaced all of the old %S's in the language strings that were used for service nicks --- modules/core/bs_badwords.cpp | 4 ++-- modules/core/bs_help.cpp | 7 ++++--- modules/core/bs_info.cpp | 4 ++-- modules/core/bs_kick.cpp | 8 ++++---- modules/core/bs_set.cpp | 4 ++-- modules/core/cs_access.cpp | 17 +++++++++-------- modules/core/cs_akick.cpp | 6 +++--- modules/core/cs_clearusers.cpp | 4 ++-- modules/core/cs_help.cpp | 10 ++++++---- modules/core/cs_invite.cpp | 4 ++-- modules/core/cs_register.cpp | 9 +++++---- modules/core/cs_saset.cpp | 4 ++-- modules/core/cs_set.cpp | 4 ++-- modules/core/cs_set_keeptopic.cpp | 4 ++-- modules/core/cs_set_opnotice.cpp | 4 ++-- modules/core/cs_set_peace.cpp | 2 +- modules/core/cs_set_private.cpp | 4 ++-- modules/core/cs_set_secure.cpp | 6 +++--- modules/core/cs_set_signkick.cpp | 5 +++-- modules/core/cs_set_topiclock.cpp | 6 +++--- modules/core/cs_topic.cpp | 6 +++--- modules/core/cs_unban.cpp | 4 ++-- modules/core/cs_xop.cpp | 31 ++++++++++++++++--------------- modules/core/ms_help.cpp | 8 ++++---- modules/core/ms_set.cpp | 4 ++-- modules/core/ns_access.cpp | 6 +++--- modules/core/ns_drop.cpp | 10 +++++----- modules/core/ns_group.cpp | 5 +++-- modules/core/ns_help.cpp | 14 ++++++++------ modules/core/ns_identify.cpp | 8 ++++---- modules/core/ns_recover.cpp | 9 +++++---- modules/core/ns_register.cpp | 14 ++++++++------ modules/core/ns_release.cpp | 4 ++-- modules/core/ns_saset.cpp | 4 ++-- modules/core/ns_set.cpp | 6 +++--- modules/core/ns_set_hide.cpp | 8 ++++---- modules/core/ns_set_kill.cpp | 8 ++++---- modules/core/ns_set_language.cpp | 2 +- modules/core/ns_set_private.cpp | 16 +++++++++------- modules/core/ns_set_secure.cpp | 12 ++++++------ modules/core/os_help.cpp | 4 ++-- modules/core/os_kick.cpp | 2 +- modules/core/os_session.cpp | 5 +++-- modules/core/os_set.cpp | 2 +- 44 files changed, 162 insertions(+), 146 deletions(-) diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp index 5c6dc3efd..4bbced7e5 100644 --- a/modules/core/bs_badwords.cpp +++ b/modules/core/bs_badwords.cpp @@ -279,7 +279,7 @@ class CommandBSBadwords : public Command "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%R%S HELP KICK BADWORDS\002.\n" + "type \002%R%s HELP KICK BADWORDS\002.\n" " \n" "The \002BADWORDS ADD\002 command adds the given word to the\n" "badword list. If SINGLE is specified, a kick will be\n" @@ -303,7 +303,7 @@ class CommandBSBadwords : public Command " 7 through 9.\n" " \n" "The \002BADWORDS CLEAR\002 command clears all entries of the\n" - "bad words list.")); + "bad words list."), BotServ->nick.c_str()); return true; } diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp index ff669e82a..7c0d2da70 100644 --- a/modules/core/bs_help.cpp +++ b/modules/core/bs_help.cpp @@ -32,13 +32,14 @@ class CommandBSHelp : public Command { // Abuse syntax error to display general list help. User *u = source.u; - source.Reply(_("\002%S\002 allows you to have a bot on your own channel.\n" + 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%R%S \037command\037\002. For \n" + "below; to use them, type \002%R%s \037command\037\002. For \n" "more information on a specific command, type \002%R\n" - "%S HELP \037command\037\002.")); + "%s HELP \037command\037\002."), + BotServ->nick.c_str(), BotServ->nick.c_str(), BotServ->nick.c_str()); for (CommandMap::const_iterator it = BotServ->Commands.begin(), it_end = BotServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(source); diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp index 123083f41..157b24d9c 100644 --- a/modules/core/bs_info.cpp +++ b/modules/core/bs_info.cpp @@ -222,11 +222,11 @@ class CommandBSInfo : public Command { source.Reply(_("Syntax: \002INFO {\037chan\037 | \037nick\037}\002\n" " \n" - "Allows you to see %S information about a channel or a bot.\n" + "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.")); + "time or number of channels it is on."), NickServ->nick.c_str()); return true; } diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp index 67bd2ca05..d37a9d990 100644 --- a/modules/core/bs_kick.cpp +++ b/modules/core/bs_kick.cpp @@ -428,22 +428,22 @@ class CommandBSKick : public Command " UNDERLINES Sets if the bot kicks underlines\n" " ITALICS Sets if the bot kicks italics\n" " \n" - "Type \002%R%S HELP KICK \037option\037\002 for more information\n" + "Type \002%R%s HELP KICK \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.")); + "level SET."), ChanServ->nick.c_str()); else if (subcommand.equals_ci("BADWORDS")) source.Reply(_("Syntax: \002KICK \037#channel\037 BADWORDS {\037ON|OFF\037} [\037ttb\037]\002\n" "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%R%S HELP BADWORDS\002 for\n" + "\002BADWORDS\002 command. Type \002%R%s HELP BADWORDS\002 for\n" "more information.\n" "ttb is the number of times a user can be kicked\n" "before it get banned. Don't give ttb to disable\n" - "the ban system once activated.")); + "the ban system once activated."), ChanServ->nick.c_str()); else if (subcommand.equals_ci("BOLDS")) source.Reply(_("Syntax: \002KICK \037channel\037 BOLDS {\037ON|OFF\037} [\037ttb\037]\002\n" "Sets the bolds kicker on or off. When enabled, this\n" diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp index ce5377878..f05cf9930 100644 --- a/modules/core/bs_set.cpp +++ b/modules/core/bs_set.cpp @@ -212,10 +212,10 @@ class CommandBSSet : public Command " SYMBIOSIS Allow the bot to act as a real bot\n" " MSG Configure how fantasy commands should be replied to\n" " \n" - "Type \002%R%S HELP SET \037option\037\002 for more information\n" + "Type \002%R%s HELP SET \037option\037\002 for more information\n" "on a specific option.\n" "Note: access to this command is controlled by the\n" - "level SET.")); + "level SET."), BotServ->nick.c_str()); User *u = source.u; if (u->Account() && u->Account()->IsServicesOper()) source.Reply(_("These options are reserved to Services Operators:\n" diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp index 4eb4974fe..3ae5693d3 100644 --- a/modules/core/cs_access.cpp +++ b/modules/core/cs_access.cpp @@ -461,9 +461,9 @@ class CommandCSAccess : public Command " \n" "Maintains the \002access list\002 for a channel. The access\n" "list specifies which users are allowed chanop status or\n" - "access to %S commands on the channel. Different\n" + "access to %s commands on the channel. Different\n" "user levels allow for access to different subsets of\n" - "privileges; \002%R%S HELP ACCESS LEVELS\002 for more\n" + "privileges; \002%R%s HELP ACCESS LEVELS\002 for more\n" "specific information. Any nick not on the access list has\n" "a user level of 0.\n" " \n" @@ -496,12 +496,13 @@ class CommandCSAccess : public Command "to \002ACCESS LIST\002 but shows the creator and last used time.\n" " \n" "The \002ACCESS CLEAR\002 command clears all entries of the\n" - "access list.")); + "access list."), + ChanServ->nick.c_str(), ChanServ->nick.c_str()); source.Reply(_("\002User access levels\002\n" " \n" "By default, the following access levels are defined:\n" " \n" - " \002Founder\002 Full access to %S functions; automatic\n" + " \002Founder\002 Full access to %s functions; automatic\n" " opping upon entering channel. Note\n" " that only one person may have founder\n" " status (it cannot be given using the\n" @@ -514,8 +515,8 @@ class CommandCSAccess : public Command " \002 <0\002 May not be opped.\n" " \n" "These levels may be changed, or new ones added, using the\n" - "\002LEVELS\002 command; type \002%R%S HELP LEVELS\002 for\n" - "information.")); + "\002LEVELS\002 command; type \002%R%s HELP LEVELS\002 for\n" + "information."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } @@ -717,7 +718,7 @@ class CommandCSLevels : public Command "The \002LEVELS\002 command allows fine control over the meaning of\n" "the numeric access levels used for channels. With this\n" "command, you can define the access level required for most\n" - "of %S's functions. (The \002SET FOUNDER\002 and this command\n" + "of %s's functions. (The \002SET FOUNDER\002 and this command\n" "are always restricted to the channel founder.)\n" " \n" "\002LEVELS SET\002 allows the access level for a function or group of\n" @@ -732,7 +733,7 @@ class CommandCSLevels : public Command "\002HELP ACCESS LEVELS\002).\n" " \n" "For a list of the features and functions whose levels can be\n" - "set, see \002HELP LEVELS DESC\002.")); + "set, see \002HELP LEVELS DESC\002."), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index 11b5485ff..637ab0b08 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -521,7 +521,7 @@ class CommandCSAKick : public Command " \n" "Maintains the \002AutoKick list\002 for a channel. If a user\n" "on the AutoKick list attempts to join the channel,\n" - "%S will ban that user from the channel, then kick\n" + "%sS will ban that user from the channel, then kick\n" "the user.\n" " \n" "The \002AKICK ADD\002 command adds the given nick or usermask\n" @@ -545,12 +545,12 @@ class CommandCSAKick : public Command "The \002AKICK VIEW\002 command is a more verbose version of\n" "\002AKICK LIST\002 command.\n" " \n" - "The \002AKICK ENFORCE\002 command causes %S to enforce the\n" + "The \002AKICK ENFORCE\002 command causes %sS to enforce the\n" "current AKICK list by removing those users who match an\n" "AKICK mask.\n" " \n" "The \002AKICK CLEAR\002 command clears all entries of the\n" - "akick list.")); + "akick list."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_clearusers.cpp b/modules/core/cs_clearusers.cpp index b4786209c..ed58bacdf 100644 --- a/modules/core/cs_clearusers.cpp +++ b/modules/core/cs_clearusers.cpp @@ -53,10 +53,10 @@ class CommandCSClearUsers : public Command { source.Reply(_("Syntax: \002CLEARUSERS \037channel\037\002\n" " \n" - "Tells %S to clear (kick) all users certain settings on a channel." + "Tells %s to clear (kick) all users certain settings on a channel." " \n" "By default, limited to those with founder access on the\n" - "channel.")); + "channel."), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp index b1916bace..db34fc8ea 100644 --- a/modules/core/cs_help.cpp +++ b/modules/core/cs_help.cpp @@ -32,13 +32,15 @@ class CommandCSHelp : public Command void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) { User *u = source.u; - source.Reply(_("\002%S\002 allows you to register and control various\n" - "aspects of channels. %S can often prevent\n" + source.Reply(_("\002%s\002 allows you to register and control various\n" + "aspects of channels. %s can often prevent\n" "malicious users from \"taking over\" channels by limiting\n" "who is allowed channel operator privileges. Available\n" "commands are listed below; to use them, type\n" - "\002%R%S \037command\037\002. For more information on a\n" - "specific command, type \002%R%S HELP \037command\037\002.")); + "\002%R%s \037command\037\002. For more information on a\n" + "specific command, type \002%R%s HELP \037command\037\002."), + ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str(), + ChanServ->nick.c_str()); for (CommandMap::const_iterator it = ChanServ->Commands.begin(); it != ChanServ->Commands.end(); ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(source); diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp index 0f55c1e1e..5b588824b 100644 --- a/modules/core/cs_invite.cpp +++ b/modules/core/cs_invite.cpp @@ -72,10 +72,10 @@ class CommandCSInvite : public Command { source.Reply(_("Syntax: \002INVITE \037channel\037\002\n" " \n" - "Tells %S to invite you into the given channel.\n" + "Tells %s to invite you into the given channel.\n" " \n" "By default, limited to AOPs or those with level 5 and above\n" - "on the channel.")); + "on the channel."), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp index 92d1746cb..8968be739 100644 --- a/modules/core/cs_register.cpp +++ b/modules/core/cs_register.cpp @@ -100,7 +100,7 @@ class CommandCSRegister : public Command { source.Reply(_("Syntax: \002REGISTER \037channel\037 \037description\037\002\n" " \n" - "Registers a channel in the %S database. In order\n" + "Registers a channel in the %s database. In order\n" "to use this command, you must first be a channel operator\n" "on the channel you're trying to register.\n" "The description, which \002must\002 be included, is a\n" @@ -109,15 +109,16 @@ class CommandCSRegister : public Command "When you register a channel, you are recorded as the\n" "\"founder\" of the channel. The channel founder is allowed\n" "to change all of the channel settings for the channel;\n" - "%S will also automatically give the founder\n" + "%s will also automatically give the founder\n" "channel-operator privileges when s/he enters the channel.\n" - "See the \002ACCESS\002 command (\002%R%S HELP ACCESS\002) for\n" + "See the \002ACCESS\002 command (\002%R%s HELP ACCESS\002) for\n" "information on giving a subset of these privileges to\n" "other channel users.\n" " \n" "NOTICE: In order to register a channel, you must have\n" "first registered your nickname. If you haven't,\n" - "\002%R%s HELP\002 for information on how to do so.")); + "\002%R%s HELP\002 for information on how to do so."), + ChanServ->nick.c_str(), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp index 896f23971..6dcec0f56 100644 --- a/modules/core/cs_saset.cpp +++ b/modules/core/cs_saset.cpp @@ -77,8 +77,8 @@ class CommandCSSASet : public Command "Available options:")); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(source); - source.Reply(_("Type \002%R%S HELP SASET \037option\037\002 for more information on a\n" - "particular option.")); + source.Reply(_("Type \002%R%s HELP SASET \037option\037\002 for more information on a\n" + "particular option."), ChanServ->nick.c_str()); return true; } else diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp index 489314e3c..560a5a1e2 100644 --- a/modules/core/cs_set.cpp +++ b/modules/core/cs_set.cpp @@ -81,8 +81,8 @@ class CommandCSSet : public Command "Available options:")); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(source); - source.Reply(_("Type \002%R%S HELP SET \037option\037\002 for more information on a\n" - "particular option.")); + source.Reply(_("Type \002%R%s HELP SET \037option\037\002 for more information on a\n" + "particular option."), ChanServ->nick.c_str()); return true; } else diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp index 5a7bbd334..3d697e499 100644 --- a/modules/core/cs_set_keeptopic.cpp +++ b/modules/core/cs_set_keeptopic.cpp @@ -48,9 +48,9 @@ class CommandCSSetKeepTopic : public Command " \n" "Enables or disables the \002topic retention\002 option for a \n" "channel. When \002topic retention\002 is set, the topic for the\n" - "channel will be remembered by %S even after the\n" + "channel will be remembered by %s even after the\n" "last user leaves the channel, and will be restored the\n" - "next time the channel is created."), this->name.c_str()); + "next time the channel is created."), this->name.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp index e55607ca3..535001919 100644 --- a/modules/core/cs_set_opnotice.cpp +++ b/modules/core/cs_set_opnotice.cpp @@ -47,9 +47,9 @@ class CommandCSSetOpNotice : public Command source.Reply(_("Syntax: \002%s \037channel\037 OPNOTICE {ON | OFF}\002\n" " \n" "Enables or disables the \002op-notice\002 option for a channel.\n" - "When \002op-notice\002 is set, %S will send a notice to the\n" + "When \002op-notice\002 is set, %s will send a notice to the\n" "channel whenever the \002OP\002 or \002DEOP\002 commands are used for a user\n" - "in the channel."), this->name.c_str()); + "in the channel."), this->name.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp index 5daa648f8..11cf545a1 100644 --- a/modules/core/cs_set_peace.cpp +++ b/modules/core/cs_set_peace.cpp @@ -49,7 +49,7 @@ class CommandCSSetPeace : public Command "Enables or disables the \002peace\002 option for a channel.\n" "When \002peace\002 is set, a user won't be able to kick,\n" "ban or remove a channel status of a user that has\n" - "a level superior or equal to his via %S commands."), this->name.c_str()); + "a level superior or equal to his via %s commands."), this->name.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp index 162da757d..1f8f98fdc 100644 --- a/modules/core/cs_set_private.cpp +++ b/modules/core/cs_set_private.cpp @@ -47,8 +47,8 @@ class CommandCSSetPrivate : public Command source.Reply(_("Syntax: \002%s \037channel\037 PRIVATE {ON | OFF}\002\n" " \n" "Enables or disables the \002private\002 option for a channel.\n" - "When \002private\002 is set, a \002%R%S LIST\002 will not\n" - "include the channel in any lists."), this->name.c_str()); + "When \002private\002 is set, a \002%R%s LIST\002 will not\n" + "include the channel in any lists."), this->name.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp index a84e91958..1aea9f887 100644 --- a/modules/core/cs_set_secure.cpp +++ b/modules/core/cs_set_secure.cpp @@ -46,11 +46,11 @@ class CommandCSSetSecure : public Command { source.Reply(_("Syntax: \002%s \037channel\037 SECURE {ON | OFF}\002\n" " \n" - "Enables or disables %S's security features for a\n" + "Enables or disables %s's security features for a\n" "channel. When \002SECURE\002 is set, only users who have\n" "registered their nicknames with %s and IDENTIFY'd\n" "with their password will be given access to the channel\n" - "as controlled by the access list."), this->name.c_str(), Config->s_NickServ.c_str()); + "as controlled by the access list."), this->name.c_str(), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } @@ -61,7 +61,7 @@ class CommandCSSetSecure : public Command void OnServHelp(CommandSource &source) { - source.Reply(_(" SECURE Activate %S security features")); + source.Reply(_(" SECURE Activate %s security features"), ChanServ->nick.c_str()); } }; diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp index c89e4b502..a3b0e0ea3 100644 --- a/modules/core/cs_set_signkick.cpp +++ b/modules/core/cs_set_signkick.cpp @@ -57,12 +57,13 @@ class CommandCSSetSignKick : public Command " \n" "Enables or disables signed kicks for a\n" "channel. When \002SIGNKICK\002 is set, kicks issued with\n" - "%S KICK command will have the nick that used the\n" + "%s KICK command will have the nick that used the\n" "command in their reason.\n" " \n" "If you use \002LEVEL\002, those who have a level that is superior \n" "or equal to the SIGNKICK level on the channel won't have their \n" - "kicks signed. See \002%R%S HELP LEVELS\002 for more information."), this->name.c_str()); + "kicks signed. See \002%R%s HELP LEVELS\002 for more information."), this->name.c_str(), + ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp index cb8faf724..5ffb05b1d 100644 --- a/modules/core/cs_set_topiclock.cpp +++ b/modules/core/cs_set_topiclock.cpp @@ -44,12 +44,12 @@ class CommandCSSetTopicLock : public Command bool OnHelp(CommandSource &source, const Anope::string &) { - source.Reply(_("Syntax: \002SET \037%s\037 TOPICLOCK {ON | OFF}\002\n" + source.Reply(_("Syntax: \002%s \037channel\037 TOPICLOCK {ON | OFF}\002\n" " \n" "Enables or disables the \002topic lock\002 option for a channel.\n" - "When \002topic lock\002 is set, %S will not allow the\n" + "When \002topic lock\002 is set, %s will not allow the\n" "channel topic to be changed except via the \002TOPIC\002\n" - "command."), this->name.c_str()); + "command."), this->name.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp index 20005b07b..47c2b4aae 100644 --- a/modules/core/cs_topic.cpp +++ b/modules/core/cs_topic.cpp @@ -50,14 +50,14 @@ class CommandCSTopic : public Command { source.Reply(_("Syntax: \002TOPIC \037channel\037 [\037topic\037]\002\n" " \n" - "Causes %S to set the channel topic to the one\n" + "Causes %s to set the channel topic to the one\n" "specified. If \002topic\002 is not given, then an empty topic\n" "is set. This command is most useful in conjunction\n" - "with \002SET TOPICLOCK\002. See \002%R%S HELP SET TOPICLOCK\002\n" + "with \002SET TOPICLOCK\002. See \002%R%s HELP SET TOPICLOCK\002\n" "for more information.\n" " \n" "By default, limited to those with founder access on the\n" - "channel.")); + "channel."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp index f4156e02a..91db12350 100644 --- a/modules/core/cs_unban.cpp +++ b/modules/core/cs_unban.cpp @@ -61,11 +61,11 @@ class CommandCSUnban : public Command { source.Reply(_("Syntax: \002UNBAN \037channel\037 [\037nick\037]\002\n" " \n" - "Tells %S to remove all bans preventing you or the given\n" + "Tells %s to remove all bans preventing you or the given\n" "user from entering the given channel. \n" " \n" "By default, limited to AOPs or those with level 5 and above\n" - "on the channel.")); + "on the channel."), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp index 9a0e6e16d..0df9713db 100644 --- a/modules/core/cs_xop.cpp +++ b/modules/core/cs_xop.cpp @@ -447,9 +447,10 @@ class CommandCSQOP : public XOPBase " \n" "This command may have been disabled for your channel, and\n" "in that case you need to use the access list. See \n" - "\002%R%S HELP ACCESS\002 for information about the access list,\n" - "and \002%R%S HELP SET XOP\002 to know how to toggle between \n" - "the access list and xOP list systems.")); + "\002%R%s HELP ACCESS\002 for information about the access list,\n" + "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" + "the access list and xOP list systems."), ChanServ->nick.c_str(), + ChanServ->nick.c_str()); return true; } @@ -513,9 +514,9 @@ class CommandCSAOP : public XOPBase " \n" "This command may have been disabled for your channel, and\n" "in that case you need to use the access list. See \n" - "\002%R%S HELP ACCESS\002 for information about the access list,\n" - "and \002%R%S HELP SET XOP\002 to know how to toggle between \n" - "the access list and xOP list systems.")); + "\002%R%s HELP ACCESS\002 for information about the access list,\n" + "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" + "the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); /* CHAN_HELP_HOP */ return true; } @@ -578,9 +579,9 @@ class CommandCSHOP : public XOPBase " \n" "This command may have been disabled for your channel, and\n" "in that case you need to use the access list. See \n" - "\002%R%S HELP ACCESS\002 for information about the access list,\n" - "and \002%R%S HELP SET XOP\002 to know how to toggle between \n" - "the access list and xOP list systems.")); + "\002%R%s HELP ACCESS\002 for information about the access list,\n" + "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" + "the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } @@ -643,9 +644,9 @@ class CommandCSSOP : public XOPBase " \n" "This command may have been disabled for your channel, and\n" "in that case you need to use the access list. See \n" - "\002%R%S HELP ACCESS\002 for information about the access list,\n" - "and \002%R%S HELP SET XOP\002 to know how to toggle between \n" - "the access list and xOP list systems.")); + "\002%R%s HELP ACCESS\002 for information about the access list,\n" + "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" + "the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } @@ -707,9 +708,9 @@ class CommandCSVOP : public XOPBase " \n" "This command may have been disabled for your channel, and\n" "in that case you need to use the access list. See \n" - "\002%R%S HELP ACCESS\002 for information about the access list,\n" - "and \002%R%S HELP SET XOP\002 to know how to toggle between \n" - "the access list and xOP list systems.")); + "\002%R%s HELP ACCESS\002 for information about the access list,\n" + "and \002%R%s HELP SET XOP\002 to know how to toggle between \n" + "the access list and xOP list systems."), ChanServ->nick.c_str(), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/ms_help.cpp b/modules/core/ms_help.cpp index fdcbbaf1e..c27f1791b 100644 --- a/modules/core/ms_help.cpp +++ b/modules/core/ms_help.cpp @@ -30,20 +30,20 @@ class CommandMSHelp : public Command void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) { User *u = source.u; - source.Reply(_("\002%S\002 is a utility allowing IRC users to send short\n" + source.Reply(_("\002%s\002 is a utility allowing IRC users to send short\n" "messages to other IRC users, whether they are online at\n" "the time or not, or to channels(*). Both the sender's\n" "nickname and the target nickname or channel must be\n" "registered in order to send a memo.\n" - "%S's commands include:")); + "%s's commands include:"), MemoServ->nick.c_str(), MemoServ->nick.c_str()); for (CommandMap::const_iterator it = MemoServ->Commands.begin(), it_end = MemoServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(source); - source.Reply(_("Type \002%R%S HELP \037command\037\002 for help on any of the\n" + source.Reply(_("Type \002%R%s HELP \037command\037\002 for help on any of the\n" "above commands.\n" "(*) By default, any user with at least level 10 access on a\n" " channel can read that channel's memos. This can be\n" - " changed with the %s \002LEVELS\002 command."), Config->s_ChanServ.c_str()); + " changed with the %s \002LEVELS\002 command."), MemoServ->nick.c_str(), Config->s_ChanServ.c_str()); } }; diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp index f5602b835..efeb59ba0 100644 --- a/modules/core/ms_set.cpp +++ b/modules/core/ms_set.cpp @@ -237,8 +237,8 @@ class CommandMSSet : public Command " LIMIT Sets the maximum number of memos you can\n" " receive\n" " \n" - "Type \002%R%S HELP SET \037option\037\002 for more information\n" - "on a specific option.")); + "Type \002%R%s HELP SET \037option\037\002 for more information\n" + "on a specific option."), MemoServ->nick.c_str()); else if (subcommand.equals_ci("NOTIFY")) source.Reply(_("Syntax: \002SET NOTIFY {ON | LOGON | NEW | MAIL | NOMAIL | OFF}\002\n" "Changes when you will be notified about new memos:\n" diff --git a/modules/core/ns_access.cpp b/modules/core/ns_access.cpp index e7c0c3f90..5f28a9271 100644 --- a/modules/core/ns_access.cpp +++ b/modules/core/ns_access.cpp @@ -156,9 +156,9 @@ class CommandNSAccess : public Command " \n" "Modifies or displays the access list for your nick. This\n" "is the list of addresses which will be automatically\n" - "recognized by %S as allowed to use the nick. If\n" + "recognized by %s as allowed to use the nick. If\n" "you want to use the nick from a different address, you\n" - "need to send an \002IDENTIFY\002 command to make %S\n" + "need to send an \002IDENTIFY\002 command to make %s\n" "recognize you.\n" " \n" "Examples:\n" @@ -171,7 +171,7 @@ class CommandNSAccess : public Command " Reverses the previous command.\n" " \n" " \002ACCESS LIST\002\n" - " Displays the current access list.")); + " Displays the current access list."), ChanServ->nick.c_str()); return true; } diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp index 30ec2730a..7fd85e0f9 100644 --- a/modules/core/ns_drop.cpp +++ b/modules/core/ns_drop.cpp @@ -121,16 +121,16 @@ class CommandNSDrop : public Command source.Reply(_("Syntax: \002DROP [\037nickname\037]\002\n" " \n" "Without a parameter, drops your nickname from the\n" - "%S database.\n" + "%s database.\n" " \n" "With a parameter, drops the named nick from the database.\n" "You may drop any nick within your group without any \n" "special privileges. Dropping any nick is limited to \n" - "\002Services Operators\002.")); + "\002Services Operators\002."), NickServ->nick.c_str()); else source.Reply(_("Syntax: \002DROP [\037nickname\037 | \037password\037]\002\n" " \n" - "Drops your nickname from the %S database. A nick\n" + "Drops your nickname from the %s database. A nick\n" "that has been dropped is free for anyone to re-register.\n" " \n" "You may drop a nick within your group by passing it\n" @@ -141,8 +141,8 @@ class CommandNSDrop : public Command "your password as the \002password\002 parameter.\n" " \n" "In order to use this command, you must first identify\n" - "with your password (\002%R%S HELP IDENTIFY\002 for more\n" - "information).")); + "with your password (\002%R%s HELP IDENTIFY\002 for more\n" + "information)."), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index 8fbcfb2fe..987a7e163 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -152,7 +152,7 @@ class CommandNSGroup : public Command "You can use this command even if you have not registered\n" "your nick yet. If your nick is already registered, you'll\n" "need to identify yourself before using this command. Type\n" - "\037%R%S HELP IDENTIFY\037 for more information. This\n" + "\037%R%s HELP IDENTIFY\037 for more information. This\n" "last may be not possible on your IRC network.\n" " \n" "It is recommended to use this command with a non-registered\n" @@ -164,7 +164,8 @@ class CommandNSGroup : public Command "You can only be in one group at a time. Group merging is\n" "not possible.\n" " \n" - "\037Note\037: all the nicknames of a group have the same password.")); + "\037Note\037: all the nicknames of a group have the same password."), + NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_help.cpp b/modules/core/ns_help.cpp index 654d2233a..bb16f5594 100644 --- a/modules/core/ns_help.cpp +++ b/modules/core/ns_help.cpp @@ -30,12 +30,13 @@ class CommandNSHelp : public Command void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) { User *u = source.u; - source.Reply(_("\002%S\002 allows you to \"register\" a nickname and\n" + source.Reply(_("\002%s\002 allows you to \"register\" a nickname and\n" "prevent others from using it. The following\n" "commands allow for registration and maintenance of\n" - "nicknames; to use them, type \002%R%S \037command\037\002.\n" + "nicknames; to use them, type \002%R%s \037command\037\002.\n" "For more information on a specific command, type\n" - "\002%R%S HELP \037command\037\002.")); + "\002%R%s HELP \037command\037\002."), NickServ->nick.c_str(), NickServ->nick.c_str(), + NickServ->nick.c_str()); for (CommandMap::const_iterator it = NickServ->Commands.begin(), it_end = NickServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(source); @@ -43,7 +44,8 @@ class CommandNSHelp : public Command source.Reply(_(" \n" "Services Operators can also drop any nickname without needing\n" "to identify for the nick, and may view the access list for\n" - "any nickname (\002%R%S ACCESS LIST \037nick\037\002).")); + "any nickname (\002%R%s ACCESS LIST \037nick\037\002)."), + NickServ->nick.c_str()); if (Config->NSExpire >= 86400) source.Reply(_("Nicknames that are not used anymore are subject to \n" "the automatic expiration, i.e. they will be deleted\n" @@ -52,9 +54,9 @@ class CommandNSHelp : public Command "\002NOTICE:\002 This service is intended to provide a way for\n" "IRC users to ensure their identity is not compromised.\n" "It is \002NOT\002 intended to facilitate \"stealing\" of\n" - "nicknames or other malicious actions. Abuse of %S\n" + "nicknames or other malicious actions. Abuse of %s\n" "will result in, at minimum, loss of the abused\n" - "nickname(s).")); + "nickname(s)."), NickServ->nick.c_str()); } }; diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp index 625ccd7e2..640644d6e 100644 --- a/modules/core/ns_identify.cpp +++ b/modules/core/ns_identify.cpp @@ -90,9 +90,9 @@ class CommandNSIdentify : public Command source.Reply(_("You must now supply an e-mail for your nick.\n" "This e-mail will allow you to retrieve your password in\n" "case you forget it.")); - source.Reply(_("Type \002%R%S SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n" + source.Reply(_("Type \002%R%s SET EMAIL \037e-mail\037\002 in order to set your e-mail.\n" "Your privacy is respected; this e-mail won't be given to\n" - "any third-party person.")); + "any third-party person."), NickServ->nick.c_str()); } if (u->IsIdentified()) @@ -106,11 +106,11 @@ class CommandNSIdentify : public Command { source.Reply(_("Syntax: \002IDENTIFY [account] \037password\037\002\n" " \n" - "Tells %S that you are really the owner of this\n" + "Tells %s that you are really the owner of this\n" "nick. Many commands require you to authenticate yourself\n" "with this command before you use them. The password\n" "should be the same one you sent with the \002REGISTER\002\n" - "command.")); + "command."), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp index ad32c664c..66cc06c5d 100644 --- a/modules/core/ns_recover.cpp +++ b/modules/core/ns_recover.cpp @@ -91,25 +91,26 @@ class CommandNSRecover : public Command source.Reply(_("Syntax: \002RECOVER \037nickname\037 [\037password\037]\002\n" " \n" "Allows you to recover your nickname if someone else has\n" - "taken it; this does the same thing that %S does\n" + "taken it; this does the same thing that %s does\n" "automatically if someone tries to use a kill-protected\n" "nick.\n" " \n" - "When you give this command, %S will bring a fake\n" + "When you give this command, %s will bring a fake\n" "user online with the same nickname as the user you're\n" "trying to recover your nick from. This causes the IRC\n" "servers to disconnect the other user. This fake user will\n" "remain online for %s to ensure that the other\n" "user does not immediately reconnect; after that time, you\n" "can reclaim your nick. Alternatively, use the \002RELEASE\002\n" - "command (\002%R%S HELP RELEASE\002) to get the nick\n" + "command (\002%R%s HELP RELEASE\002) to get the nick\n" "back sooner.\n" " \n" "In order to use the \002RECOVER\002 command for a nick, your\n" "current address as shown in /WHOIS must be on that nick's\n" "access list, you must be identified and in the group of\n" "that nick, or you must supply the correct password for\n" - "the nickname."), relstr.c_str()); + "the nickname."), NickServ->nick.c_str(), NickServ->nick.c_str(), relstr.c_str(), + NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index ec885f728..b7d0712a2 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -149,13 +149,14 @@ class CommandNSConfirm : public Command " \n" "This is the second step of nickname registration process.\n" "You must perform this command in order to get your nickname\n" - "registered with %S. The passcode (or called auth code also)\n" + "registered with %s. The passcode (or called auth code also)\n" "is sent to your e-mail address in the first step of the\n" "registration process. For more information about the first\n" - "stage of the registration process, type: \002%R%S HELP REGISTER\002\n" + "stage of the registration process, type: \002%R%s HELP REGISTER\002\n" " \n" "This is also used after the RESETPASS command has been used to\n" - "force identify you to your nick so you may change your password.")); + "force identify you to your nick so you may change your password."), + NickServ->nick.c_str()); if (u->Account() && u->Account()->HasPriv("nickserv/confirm")) source.Reply(_("Additionally, Services Operators with the \037nickserv/confirm\037 permission can\n" "replace \037passcode\037 with a users nick to force validate them.")); @@ -312,7 +313,7 @@ class CommandNSRegister : public CommandNSConfirm { source.Reply(_("Syntax: \002REGISTER \037password\037 \037[email]\037\002\n" " \n" - "Registers your nickname in the %S database. Once\n" + "Registers your nickname in the %s database. Once\n" "your nick is registered, you can use the \002SET\002 and \002ACCESS\002\n" "commands to configure your nick's settings as you like\n" "them. Make sure you remember the password you use when\n" @@ -325,7 +326,7 @@ class CommandNSRegister : public CommandNSConfirm "Passwords should not be easily guessable. For example,\n" "using your real name as a password is a bad idea. Using\n" "your nickname as a password is a much worse idea ;) and,\n" - "in fact, %S will not allow it. Also, short\n" + "in fact, %s will not allow it. Also, short\n" "passwords are vulnerable to trial-and-error searches, so\n" "you should choose a password at least 5 characters long.\n" "Finally, the space character cannot be used in passwords.\n" @@ -340,7 +341,8 @@ class CommandNSRegister : public CommandNSConfirm "that will allow you to register other nicks later sharing\n" "the same configuration, the same set of memos and the\n" "same channel privileges. For more information on this\n" - "feature, type \002%R%S HELP GROUP\002.")); + "feature, type \002%R%s HELP GROUP\002."), + NickServ->nick.c_str(), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp index 67c1b73ea..4c8e47b08 100644 --- a/modules/core/ns_release.cpp +++ b/modules/core/ns_release.cpp @@ -76,7 +76,7 @@ class CommandNSRelease : public Command source.Reply(_("Syntax: \002RELEASE \037nickname\037 [\037password\037]\002\n" " \n" - "Instructs %S to remove any hold on your nickname\n" + "Instructs %s to remove any hold on your nickname\n" "caused by automatic kill protection or use of the \002RECOVER\002\n" "command. This holds lasts for %s;\n" "This command gets rid of them sooner.\n" @@ -85,7 +85,7 @@ class CommandNSRelease : public Command "current address as shown in /WHOIS must be on that nick's\n" "access list, you must be identified and in the group of\n" "that nick, or you must supply the correct password for\n" - "the nickname.")); + "the nickname."), NickServ->nick.c_str()); return true; diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp index 66c4b6ef7..8c809b7c4 100644 --- a/modules/core/ns_saset.cpp +++ b/modules/core/ns_saset.cpp @@ -79,9 +79,9 @@ class CommandNSSASet : public Command "Sets various nickname options. \037option\037 can be one of:")); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(source); - source.Reply(_("Type \002%R%S HELP SASET \037option\037\002 for more information\n" + source.Reply(_("Type \002%R%s HELP SASET \037option\037\002 for more information\n" "on a specific option. The options will be set on the given\n" - "\037nickname\037.")); + "\037nickname\037."), NickServ->nick.c_str()); return true; } else diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp index 703bec9df..e398868ed 100644 --- a/modules/core/ns_set.cpp +++ b/modules/core/ns_set.cpp @@ -74,11 +74,11 @@ class CommandNSSet : public Command for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(source); source.Reply(_("In order to use this command, you must first identify\n" - "with your password (\002%R%S HELP IDENTIFY\002 for more\n" + "with your password (\002%R%s HELP IDENTIFY\002 for more\n" "information).\n" " \n" - "Type \002%R%S HELP SET \037option\037\002 for more information\n" - "on a specific option.")); + "Type \002%R%s HELP SET \037option\037\002 for more information\n" + "on a specific option."), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } else diff --git a/modules/core/ns_set_hide.cpp b/modules/core/ns_set_hide.cpp index 460dbebaa..b915d6b53 100644 --- a/modules/core/ns_set_hide.cpp +++ b/modules/core/ns_set_hide.cpp @@ -84,12 +84,12 @@ class CommandNSSetHide : public Command source.Reply(_("Syntax: \002SET HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\002\n" " \n" "Allows you to prevent certain pieces of information from\n" - "being displayed when someone does a %S \002INFO\002 on your\n" + "being displayed when someone does a %s \002INFO\002 on your\n" "nick. You can hide your E-mail address (\002EMAIL\002), last seen\n" "user@host mask (\002USERMASK\002), your services access status\n" "(\002STATUS\002) and last quit message (\002QUIT\002).\n" "The second parameter specifies whether the information should\n" - "be displayed (\002OFF\002) or hidden (\002ON\002).")); + "be displayed (\002OFF\002) or hidden (\002ON\002)."), NickServ->nick.c_str()); return true; } @@ -116,12 +116,12 @@ class CommandNSSASetHide : public CommandNSSetHide source.Reply(_("Syntax: \002SASET \037nickname\037 HIDE {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}\002\n" " \n" "Allows you to prevent certain pieces of information from\n" - "being displayed when someone does a %S \002INFO\002 on the\n" + "being displayed when someone does a %s \002INFO\002 on the\n" "nick. You can hide the E-mail address (\002EMAIL\002), last seen\n" "user@host mask (\002USERMASK\002), the services access status\n" "(\002STATUS\002) and last quit message (\002QUIT\002).\n" "The second parameter specifies whether the information should\n" - "be displayed (\002OFF\002) or hidden (\002ON\002).")); + "be displayed (\002OFF\002) or hidden (\002ON\002)."), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_set_kill.cpp b/modules/core/ns_set_kill.cpp index 35cca658d..a9ca2eaa5 100644 --- a/modules/core/ns_set_kill.cpp +++ b/modules/core/ns_set_kill.cpp @@ -76,7 +76,7 @@ class CommandNSSetKill : public Command "Turns the automatic protection option for your nick\n" "on or off. With protection on, if another user\n" "tries to take your nick, they will be given one minute to\n" - "change to another nick, after which %S will forcibly change\n" + "change to another nick, after which %s will forcibly change\n" "their nick.\n" " \n" "If you select \002QUICK\002, the user will be given only 20 seconds\n" @@ -84,7 +84,7 @@ class CommandNSSetKill : public Command "\002IMMED\002, user's nick will be changed immediately \037without\037 being\n" "warned first or given a chance to change their nick; please\n" "do not use this option unless necessary. Also, your\n" - "network's administrators may have disabled this option.")); + "network's administrators may have disabled this option."), NickServ->nick.c_str()); return true; } @@ -113,7 +113,7 @@ class CommandNSSASetKill : public CommandNSSetKill "Turns the automatic protection option for the nick\n" "on or off. With protection on, if another user\n" "tries to take the nick, they will be given one minute to\n" - "change to another nick, after which %S will forcibly change\n" + "change to another nick, after which %s will forcibly change\n" "their nick.\n" " \n" "If you select \002QUICK\002, the user will be given only 20 seconds\n" @@ -121,7 +121,7 @@ class CommandNSSASetKill : public CommandNSSetKill "\002IMMED\002, the user's nick will be changed immediately \037without\037 being\n" "warned first or given a chance to change their nick; please\n" "do not use this option unless necessary. Also, your\n" - "network's administrators may have disabled this option.")); + "network's administrators may have disabled this option."), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_set_language.cpp b/modules/core/ns_set_language.cpp index e942be388..20ce5f558 100644 --- a/modules/core/ns_set_language.cpp +++ b/modules/core/ns_set_language.cpp @@ -114,7 +114,7 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage "Changes the language Services uses when sending messages to\n" "\037nickname\037 (for example, when responding to a command he sends).\n" "\037language\037 should be chosen from a list of supported languages\n" - "that you can get by typing \002%R%S HELP SET LANGUAGE\002.")); + "that you can get by typing \002%R%s HELP SET LANGUAGE\002."), NickServ->nick.c_str()); } }; diff --git a/modules/core/ns_set_private.cpp b/modules/core/ns_set_private.cpp index 70e93e27e..db879eb21 100644 --- a/modules/core/ns_set_private.cpp +++ b/modules/core/ns_set_private.cpp @@ -49,11 +49,12 @@ class CommandNSSetPrivate : public Command { source.Reply(_("Syntax: \002SET PRIVATE {ON | OFF}\002\n" " \n" - "Turns %S's privacy option on or off for your nick.\n" + "Turns %s's privacy option on or off for your nick.\n" "With \002PRIVATE\002 set, your nickname will not appear in\n" - "nickname lists generated with %S's \002LIST\002 command.\n" + "nickname lists generated with %s's \002LIST\002 command.\n" "(However, anyone who knows your nickname can still get\n" - "information on it using the \002INFO\002 command.)")); + "information on it using the \002INFO\002 command.)"), + NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } @@ -64,7 +65,7 @@ class CommandNSSetPrivate : public Command void OnServHelp(CommandSource &source) { - source.Reply(_(" PRIVATE Prevent the nickname from appearing in a \002%R%S LIST\002")); + source.Reply(_(" PRIVATE Prevent the nickname from appearing in a \002%R%s LIST\002"), ChanServ->nick.c_str()); } }; @@ -79,11 +80,12 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate { source.Reply(_("Syntax: \002SASET \037nickname\037 PRIVATE {ON | OFF}\002\n" " \n" - "Turns %S's privacy option on or off for the nick.\n" + "Turns %s's privacy option on or off for the nick.\n" "With \002PRIVATE\002 set, the nickname will not appear in\n" - "nickname lists generated with %S's \002LIST\002 command.\n" + "nickname lists generated with %s's \002LIST\002 command.\n" "(However, anyone who knows the nickname can still get\n" - "information on it using the \002INFO\002 command.)")); + "information on it using the \002INFO\002 command.)"), + NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } diff --git a/modules/core/ns_set_secure.cpp b/modules/core/ns_set_secure.cpp index 9c3ad7b60..b15ed0d22 100644 --- a/modules/core/ns_set_secure.cpp +++ b/modules/core/ns_set_secure.cpp @@ -49,13 +49,13 @@ class CommandNSSetSecure : public Command { source.Reply(_("Syntax: \002SET SECURE {ON | OFF}\002\n" " \n" - "Turns %S's security features on or off for your\n" + "Turns %s's security features on or off for your\n" "nick. With \002SECURE\002 set, you must enter your password\n" "before you will be recognized as the owner of the nick,\n" "regardless of whether your address is on the access\n" - "list. However, if you are on the access list, %S\n" + "list. However, if you are on the access list, %s\n" "will not auto-kill you regardless of the setting of the\n" - "\002KILL\002 option.")); + "\002KILL\002 option."), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } @@ -81,13 +81,13 @@ class CommandNSSASetSecure : public CommandNSSetSecure { source.Reply(_("Syntax: \002SASET \037nickname\037 SECURE {ON | OFF}\002\n" " \n" - "Turns %S's security features on or off for your\n" + "Turns %s's security features on or off for your\n" "nick. With \002SECURE\002 set, you must enter your password\n" "before you will be recognized as the owner of the nick,\n" "regardless of whether your address is on the access\n" - "list. However, if you are on the access list, %S\n" + "list. However, if you are on the access list, %s\n" "will not auto-kill you regardless of the setting of the\n" - "\002KILL\002 option.")); + "\002KILL\002 option."), NickServ->nick.c_str(), NickServ->nick.c_str()); return true; } diff --git a/modules/core/os_help.cpp b/modules/core/os_help.cpp index 31b62b349..f455b9079 100644 --- a/modules/core/os_help.cpp +++ b/modules/core/os_help.cpp @@ -29,11 +29,11 @@ class CommandOSHelp : public Command void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) { User *u = source.u; - source.Reply(_("%S commands:")); + source.Reply(_("%s commands:"), OperServ->nick.c_str()); for (CommandMap::const_iterator it = OperServ->Commands.begin(), it_end = OperServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(source); - source.Reply(_("\002Notice:\002 All commands sent to %S are logged!")); + source.Reply(_("\002Notice:\002 All commands sent to %s are logged!"), OperServ->nick.c_str()); } }; diff --git a/modules/core/os_kick.cpp b/modules/core/os_kick.cpp index 5cdca38ce..c299f1bd8 100644 --- a/modules/core/os_kick.cpp +++ b/modules/core/os_kick.cpp @@ -60,7 +60,7 @@ class CommandOSKick : public Command "command. The kick message will have the nickname of the\n" "IRCop sending the KICK command prepended; for example:\n" " \n" - "*** SpamMan has been kicked off channel #my_channel by %S (Alcan (Flood))")); + "*** SpamMan has been kicked off channel #my_channel by %s (Alcan (Flood))"), OperServ->nick.c_str()); return true; } diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp index e5f26d548..dd10c2cae 100644 --- a/modules/core/os_session.cpp +++ b/modules/core/os_session.cpp @@ -465,7 +465,7 @@ class CommandOSException : public Command "of clients at a time. Once a host reaches its session limit,\n" "all clients attempting to connect from that host will be\n" "killed. Before the user is killed, they are notified, via a\n" - "/NOTICE from %S, of a source of help regarding session\n" + "/NOTICE from %s, of a source of help regarding session\n" "limiting. The content of this notice is a config setting.\n" " \n" "\002EXCEPTION ADD\002 adds the given host mask to the exception list.\n" @@ -489,7 +489,8 @@ class CommandOSException : public Command " \n" "Note that a connecting client will \"use\" the first exception\n" "their host matches. Large exception lists and widely matching\n" - "exception masks are likely to degrade services' performance.")); + "exception masks are likely to degrade services' performance."), + OperServ->nick.c_str()); return true; } diff --git a/modules/core/os_set.cpp b/modules/core/os_set.cpp index 17841279a..954ca636e 100644 --- a/modules/core/os_set.cpp +++ b/modules/core/os_set.cpp @@ -200,7 +200,7 @@ class CommandOSSet : public Command " LIST List the options")); else if (subcommand.equals_ci("LIST")) source.Reply(_("Syntax: \002SET LIST\n" - "Display the various %S settings")); + "Display the various %s settings"), OperServ->nick.c_str()); else if (subcommand.equals_ci("READONLY")) source.Reply(_("Syntax: \002SET READONLY {ON | OFF}\002\n" " \n"