diff options
| author | Sadie Powell <sadie@witchery.services> | 2025-04-16 00:04:30 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2025-04-16 00:04:30 +0100 |
| commit | ce362854a39c35249f8d2c7bcf27e3d5f9aa9980 (patch) | |
| tree | 6d4012d9579c2d56055d621768122cf5f3b658ba /modules/nickserv | |
| parent | a883b616a1360ba74254661cbd39280404d1753a (diff) | |
Update as many messages as possible for automatic line wrapping.
Diffstat (limited to 'modules/nickserv')
| -rw-r--r-- | modules/nickserv/nickserv.cpp | 75 | ||||
| -rw-r--r-- | modules/nickserv/ns_ajoin.cpp | 10 | ||||
| -rw-r--r-- | modules/nickserv/ns_alist.cpp | 12 | ||||
| -rw-r--r-- | modules/nickserv/ns_cert.cpp | 38 | ||||
| -rw-r--r-- | modules/nickserv/ns_drop.cpp | 18 | ||||
| -rw-r--r-- | modules/nickserv/ns_group.cpp | 100 | ||||
| -rw-r--r-- | modules/nickserv/ns_identify.cpp | 13 | ||||
| -rw-r--r-- | modules/nickserv/ns_info.cpp | 47 | ||||
| -rw-r--r-- | modules/nickserv/ns_list.cpp | 95 | ||||
| -rw-r--r-- | modules/nickserv/ns_logout.cpp | 18 | ||||
| -rw-r--r-- | modules/nickserv/ns_recover.cpp | 26 | ||||
| -rw-r--r-- | modules/nickserv/ns_register.cpp | 86 | ||||
| -rw-r--r-- | modules/nickserv/ns_resetpass.cpp | 8 | ||||
| -rw-r--r-- | modules/nickserv/ns_set.cpp | 64 | ||||
| -rw-r--r-- | modules/nickserv/ns_set_keepmodes.cpp | 16 | ||||
| -rw-r--r-- | modules/nickserv/ns_set_language.cpp | 20 | ||||
| -rw-r--r-- | modules/nickserv/ns_set_message.cpp | 17 | ||||
| -rw-r--r-- | modules/nickserv/ns_set_protect.cpp | 22 | ||||
| -rw-r--r-- | modules/nickserv/ns_suspend.cpp | 10 | ||||
| -rw-r--r-- | modules/nickserv/ns_update.cpp | 8 |
20 files changed, 418 insertions, 285 deletions
diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index 3358dcbef..36d32d236 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -390,10 +390,12 @@ public: if (block.Get<bool>("forceemail", "yes") && u->Account()->email.empty()) { - u->SendMessage(NickServ, _("You must now supply an email for your nick.\n" - "This email will allow you to retrieve your password in\n" - "case you forget it.")); - u->SendMessage(NickServ, _("Type \002%s \037email\037\002 in order to set your email."), + u->SendMessage(NickServ, _( + "You must now supply an email for your nick. " + "This email will allow you to retrieve your password in " + "case you forget it. " + "Type \002%s\032\037email\037\002 in order to set your email." + ), NickServ->GetQueryCommand("nickserv/set/email").c_str()); } @@ -497,20 +499,34 @@ public: { if (!params.empty() || source.c || source.service != *NickServ) return EVENT_CONTINUE; + if (!Config->GetModule("nickserv").Get<bool>("nonicknameownership")) - 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%s \037command\037\002.\n" - "For more information on a specific command, type\n" - "\002%s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand({}, source.command).c_str()); + { + source.Reply(_( + "\002%s\002 allows you to register a nickname and " + "prevent others from using it. The following " + "commands allow for registration and maintenance of " + "nicknames; to use them, type \002%s\032\037command\037\002. " + "For more information on a specific command, type " + "\002%s\032\037command\037\002." + ), + NickServ->nick.c_str(), + NickServ->GetQueryCommand().c_str(), + NickServ->GetQueryCommand({}, source.command).c_str()); + } else - source.Reply(_("\002%s\002 allows you to register an account.\n" - "The following commands allow for registration and maintenance of\n" - "accounts; to use them, type \002%s \037command\037\002.\n" - "For more information on a specific command, type\n" - "\002%s \037command\037\002.\n"), - NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand({}, source.command.c_str()).c_str()); + { + source.Reply(_( + "\002%s\002 allows you to register an account. " + "The following commands allow for registration and maintenance of " + "accounts; to use them, type \002%s\032\037command\037\002. " + "For more information on a specific command, type " + "\002%s\032\037command\037\002." + ), + NickServ->nick.c_str(), + NickServ->GetQueryCommand().c_str(), + NickServ->GetQueryCommand({}, source.command.c_str()).c_str()); + } return EVENT_CONTINUE; } @@ -518,17 +534,28 @@ public: { if (!params.empty() || source.c || source.service != *NickServ) return; + if (source.IsServicesOper()) - 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.")); + { + source.Reply(" "); + source.Reply(_( + "Services Operators can also drop any nickname without needing " + "to identify for the nick, and may view the access list for " + "any nickname." + )); + } + time_t nickserv_expire = Config->GetModule(this).Get<time_t>("expire", "1y"); if (nickserv_expire >= 86400) - source.Reply(_(" \n" - "Accounts that are not used anymore are subject to\n" - "the automatic expiration, i.e. they will be deleted\n" - "after %lu days if not used."), (unsigned long)nickserv_expire / 86400); + { + source.Reply(" "); + source.Reply(_( + "Accounts that are not used anymore are subject to " + "the automatic expiration, i.e. they will be deleted " + "after %lu days if not used." + ), + (unsigned long)nickserv_expire / 86400); + } } void OnNickCoreCreate(NickCore *nc) override diff --git a/modules/nickserv/ns_ajoin.cpp b/modules/nickserv/ns_ajoin.cpp index c2e432f2e..7404db93e 100644 --- a/modules/nickserv/ns_ajoin.cpp +++ b/modules/nickserv/ns_ajoin.cpp @@ -304,10 +304,12 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("This command manages your auto join list. When you identify\n" - "you will automatically join the channels on your auto join list.\n" - "Services Operators may provide a nick to modify other users'\n" - "auto join lists.")); + source.Reply(_( + "This command manages your auto join list. When you identify " + "you will automatically join the channels on your auto join list. " + "Services Operators may provide a nick to modify other users' " + "auto join lists." + )); return true; } }; diff --git a/modules/nickserv/ns_alist.cpp b/modules/nickserv/ns_alist.cpp index 4b246f54f..aeb817155 100644 --- a/modules/nickserv/ns_alist.cpp +++ b/modules/nickserv/ns_alist.cpp @@ -119,11 +119,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Lists all channels you have access on.\n" - " \n" - "Channels that have the \037NOEXPIRE\037 option set will be\n" - "prefixed by an exclamation mark. The nickname parameter is\n" - "limited to Services Operators")); + source.Reply(_( + "Lists all channels you have access on." + "\n\n" + "Channels that have the \037NOEXPIRE\037 option set will be " + "prefixed by an exclamation mark. The nickname parameter is " + "limited to Services Operators." + )); return true; } diff --git a/modules/nickserv/ns_cert.cpp b/modules/nickserv/ns_cert.cpp index f89199565..869f236fa 100644 --- a/modules/nickserv/ns_cert.cpp +++ b/modules/nickserv/ns_cert.cpp @@ -354,24 +354,26 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Modifies or displays the certificate list for your nick.\n" - "If you connect to IRC and provide a client certificate with a\n" - "matching fingerprint in the cert list, you will be\n" - "automatically identified to services. Services Operators\n" - "may provide a nick to modify other users' certificate lists.\n" - " \n")); - source.Reply(_("Examples:\n" - " \n" - " \002CERT ADD\002\n" - " Adds your current fingerprint to the certificate list and\n" - " automatically identifies you when you connect to IRC\n" - " using this fingerprint.\n" - " \n" - " \002CERT DEL <fingerprint>\002\n" - " Removes the fingerprint <fingerprint> from your certificate list.\n" - " \n" - " \002CERT LIST\002\n" - " Displays the current certificate list.")); + source.Reply(_( + "Modifies or displays the certificate list for your nick. " + "If you connect to IRC and provide a client certificate with a " + "matching fingerprint in the cert list, you will be " + "automatically identified to services. Services Operators " + "may provide a nick to modify other users' certificate lists." + "\n\n" + "Examples:" + "\n\n" + " \002CERT\032ADD\002\n" + " Adds your current fingerprint to the certificate list and\n" + " automatically identifies you when you connect to IRC\n" + " using this fingerprint." + "\n\n" + " \002CERT\032DEL\032<fingerprint>\002\n" + " Removes the fingerprint <fingerprint> from your certificate list." + "\n\n" + " \002CERT\032LIST\002\n" + " Displays the current certificate list." + )); return true; } }; diff --git a/modules/nickserv/ns_drop.cpp b/modules/nickserv/ns_drop.cpp index a51f5ce58..69f998395 100644 --- a/modules/nickserv/ns_drop.cpp +++ b/modules/nickserv/ns_drop.cpp @@ -89,10 +89,12 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Drops the given nick from the database. Once your nickname\n" - "is dropped you may lose all of your access and channels that\n" - "you may own. Any other user will be able to gain control of\n" - "this nick.")); + source.Reply(_( + "Drops the given nick from the database. Once your nickname " + "is dropped you may lose all of your access and channels that " + "you may own. Any other user will be able to gain control of " + "this nick." + )); source.Reply(" "); if (!source.HasPriv("nickserv/drop")) @@ -102,8 +104,12 @@ public: source.Reply(" "); if (source.HasPriv("nickserv/drop/override")) - source.Reply(_("Additionally, Services Operators with the \037nickserv/drop/override\037 permission can\n" - "replace \037code\037 with \002OVERRIDE\002 to drop without a confirmation code.")); + { + source.Reply(_( + "Additionally, Services Operators with the \037nickserv/drop/override\037 permission can " + "replace \037code\037 with \002OVERRIDE\002 to drop without a confirmation code." + )); + } return true; } }; diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index 18521bf0c..e1cd7e46f 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -207,32 +207,34 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("This command makes your nickname join the \037target\037 nickname's\n" - "group. \037password\037 is the password of the target nickname.\n" - " \n" - "Joining a group will allow you to share your configuration,\n" - "memos, and channel privileges with all the nicknames in the\n" - "group, and much more!\n" - " \n" - "A group exists as long as it is useful. This means that even\n" - "if a nick of the group is dropped, you won't lose the\n" - "shared things described above, as long as there is at\n" - "least one nick remaining in the group.\n" - " \n" - "You may be able to 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.\n" - " \n" - "It is recommended to use this command with a non-registered\n" - "nick because it will be registered automatically when\n" - "using this command. You may use it with a registered nick (to\n" - "change your group) only if your network administrators allowed\n" - "it.\n" - " \n" - "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.")); + source.Reply(_( + "This command makes your nickname join the \037target\037 nickname's " + "group. \037password\037 is the password of the target nickname. " + "\n\n" + "Joining a group will allow you to share your configuration, " + "memos, and channel privileges with all the nicknames in the " + "group, and much more!" + "\n\n" + "A group exists as long as it is useful. This means that even " + "if a nick of the group is dropped, you won't lose the " + "shared things described above, as long as there is at " + "least one nick remaining in the group." + "\n\n" + "You may be able to use this command even if you have not registered " + "your nick yet. If your nick is already registered, you'll " + "need to identify yourself before using this command. " + "\n\n" + "It is recommended to use this command with a non-registered " + "nick because it will be registered automatically when " + "using this command. You may use it with a registered nick (to " + "change your group) only if your network administrators allowed " + "it." + "\n\n" + "You can only be in one group at a time. Group merging is " + "not possible. " + "\n\n" + "\037Note\037: all the nicknames of a group have the same password." + )); return true; } }; @@ -292,11 +294,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("This command ungroups your nick, or if given, the specified nick,\n" - "from the group it is in. The ungrouped nick keeps its registration\n" - "time, password, email, greet, language, and url. Everything else\n" - "is reset. You may not ungroup yourself if there is only one nick in\n" - "your group.")); + source.Reply(_( + "This command ungroups your nick, or if given, the specified nick, " + "from the group it is in. The ungrouped nick keeps its registration " + "time, password, email, greet, language, and url. Everything else " + "is reset. You may not ungroup yourself if there is only one nick in " + "your group." + )); return true; } }; @@ -369,19 +373,29 @@ public: bool OnHelp(CommandSource &source, const Anope::string &subcommand) override { if (source.IsServicesOper()) - source.Reply(_("Syntax: \002%s [\037nickname\037]\002\n" - " \n" - "Without a parameter, lists all nicknames that are in\n" - "your group.\n" - " \n" - "With a parameter, lists all nicknames that are in the\n" - "group of the given nick.\n" - "Specifying a nick is limited to \002Services Operators\002."), - source.command.c_str()); + { + source.Reply(_( + "Syntax: \002%s [\037nickname\037]\002" + "\n\n" + "Without a parameter, lists all nicknames that are in " + "your group." + "\n\n" + "With a parameter, lists all nicknames that are in the " + "group of the given nick." + "\n\n" + "Specifying a nick is limited to \002Services Operators\002." + ), + source.command.c_str()); + } else - source.Reply(_("Syntax: \002%s\002\n" - " \n" - "Lists all nicks in your group."), source.command.c_str()); + { + source.Reply(_( + "Syntax: \002%s\002" + "\n\n" + "Lists all nicks in your group." + ), + source.command.c_str()); + } return true; } diff --git a/modules/nickserv/ns_identify.cpp b/modules/nickserv/ns_identify.cpp index 44e6bb840..94ca476ae 100644 --- a/modules/nickserv/ns_identify.cpp +++ b/modules/nickserv/ns_identify.cpp @@ -111,11 +111,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("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."), source.service->nick.c_str()); + source.Reply(_( + "Tells %s that you are really the owner of this " + "nick. Many commands require you to authenticate yourself " + "with this command before you use them. The password " + "should be the same one you sent with the \002REGISTER\002 " + "command." + ), + source.service->nick.c_str()); return true; } }; diff --git a/modules/nickserv/ns_info.cpp b/modules/nickserv/ns_info.cpp index d67fe0a18..4637bb06e 100644 --- a/modules/nickserv/ns_info.cpp +++ b/modules/nickserv/ns_info.cpp @@ -148,12 +148,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Displays information about the given nickname, such as\n" - "the nick's owner, last seen address and time, and nick\n" - "options. If no nick is given, and you are identified,\n" - "your account name is used, else your current nickname is\n" - "used.")); - + source.Reply(_( + "Displays information about the given nickname, such as " + "the nick's owner, last seen address and time, and nick " + "options. If no nick is given, and you are identified, " + "your account name is used, else your current nickname is " + "used." + )); return true; } }; @@ -247,13 +248,16 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows you to prevent certain pieces of information from\n" - "being displayed when someone does a %s \002INFO\002 on your\n" - "nick. You can hide your email 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)."), source.service->nick.c_str()); + source.Reply(_( + "Allows you to prevent certain pieces of information from " + "being displayed when someone does a %s\032\002INFO\002 on your " + "nick. You can hide your email address\032(\002EMAIL\002), last seen " + "user@host mask (\002USERMASK\002), your services access status " + "(\002STATUS\002) and last quit message (\002QUIT\002). " + "The second parameter specifies whether the information should " + "be displayed (\002OFF\002) or hidden (\002ON\002)." + ), + source.service->nick.c_str()); return true; } }; @@ -277,13 +281,16 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows you to prevent certain pieces of information from\n" - "being displayed when someone does a %s \002INFO\002 on the\n" - "nick. You can hide the email 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)."), source.service->nick.c_str()); + source.Reply(_( + "Allows you to prevent certain pieces of information from " + "being displayed when someone does a %s\032\002INFO\002 on the " + "nick. You can hide the email address (\002EMAIL\002), last seen " + "user@host mask (\002USERMASK\002), the services access status " + "(\002STATUS\002) and last quit message (\002QUIT\002). " + "The second parameter specifies whether the information should " + "be displayed (\002OFF\002) or hidden (\002ON\002)." + ), + source.service->nick.c_str()); return true; } }; diff --git a/modules/nickserv/ns_list.cpp b/modules/nickserv/ns_list.cpp index 5a5beacbd..61f05171f 100644 --- a/modules/nickserv/ns_list.cpp +++ b/modules/nickserv/ns_list.cpp @@ -135,41 +135,46 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Lists all registered nicknames which match the given\n" - "pattern, in \037nick!user@host\037 format. Nicks with the \002PRIVATE\002\n" - "option set will only be displayed to Services Operators with the\n" - "proper access. Nicks with the \002NOEXPIRE\002 option set will have\n" - "a \002!\002 prefixed to the nickname for Services Operators to see.\n" - " \n" - "Note that a preceding '#' specifies a range.\n" - " \n" - "If the SUSPENDED, UNCONFIRMED or NOEXPIRE options are given, only\n" - "nicks which, respectively, are SUSPENDED, UNCONFIRMED or have the\n" - "NOEXPIRE flag set will be displayed. If multiple options are\n" - "given, all nicks matching at least one option will be displayed.\n" - "Note that these options are limited to \037Services Operators\037.\n" - " \n" - "Examples:\n" - " \n" - " \002LIST *!joeuser@foo.com\002\n" - " Lists all registered nicks owned by joeuser@foo.com.\n" - " \n" - " \002LIST *Bot*!*@*\002\n" - " Lists all registered nicks with \002Bot\002 in their\n" - " names (case insensitive).\n" - " \n" - " \002LIST * NOEXPIRE\002\n" - " Lists all registered nicks which have been set to not expire.\n" - " \n" - " \002LIST #51-100\002\n" - " Lists all registered nicks within the given range (51-100).")); + source.Reply(_( + "Lists all registered nicknames which match the given " + "pattern, in \037nick!user@host\037 format. Nicks with the \002PRIVATE\002 " + "option set will only be displayed to Services Operators with the " + "proper access. Nicks with the \002NOEXPIRE\002 option set will have " + "a \002!\002 prefixed to the nickname for Services Operators to see." + "\n\n" + "Note that a preceding '#' specifies a range." + "\n\n" + "If the SUSPENDED, UNCONFIRMED or NOEXPIRE options are given, only " + "nicks which, respectively, are SUSPENDED, UNCONFIRMED or have the " + "NOEXPIRE flag set will be displayed. If multiple options are " + "given, all nicks matching at least one option will be displayed. " + "Note that these options are limited to \037Services Operators\037." + "\n\n" + "Examples:" + "\n\n" + " \002LIST *!joeuser@foo.com\002\n" + " Lists all registered nicks owned by joeuser@foo.com." + "\n\n" + " \002LIST *Bot*!*@*\002\n" + " Lists all registered nicks with \002Bot\002 in their\n" + " names (case insensitive)." + "\n\n" + " \002LIST * NOEXPIRE\002\n" + " Lists all registered nicks which have been set to not expire." + "\n\n" + " \002LIST #51-100\002\n" + " Lists all registered nicks within the given range (51-100)." + )); const Anope::string ®exengine = Config->GetBlock("options").Get<const Anope::string>("regexengine"); if (!regexengine.empty()) { source.Reply(" "); - source.Reply(_("Regex matches are also supported using the %s engine.\n" - "Enclose your pattern in // if this is desired."), regexengine.c_str()); + source.Reply(_( + "Regex matches are also supported using the %s engine. " + "Enclose your pattern in // if this is desired." + ), + regexengine.c_str()); } return true; @@ -233,12 +238,15 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("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" - "(However, anyone who knows your nickname can still get\n" - "information on it using the \002INFO\002 command.)"), - source.service->nick.c_str(), source.service->nick.c_str()); + source.Reply(_( + "Turns %s's privacy option on or off for your nick. " + "With \002PRIVATE\002 set, your nickname will not appear in " + "nickname lists generated with %s's \002LIST\002 command. " + "(However, anyone who knows your nickname can still get " + "information on it using the \002INFO\002 command.)" + ), + source.service->nick.c_str(), + source.service->nick.c_str()); return true; } }; @@ -262,12 +270,15 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("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" - "(However, anyone who knows the nickname can still get\n" - "information on it using the \002INFO\002 command.)"), - source.service->nick.c_str(), source.service->nick.c_str()); + source.Reply(_( + "Turns %s's privacy option on or off for the nick. " + "With \002PRIVATE\002 set, the nickname will not appear in " + "nickname lists generated with %s's \002LIST\002 command. " + "(However, anyone who knows the nickname can still get " + "information on it using the \002INFO\002 command.)" + ), + source.service->nick.c_str(), + source.service->nick.c_str()); return true; } }; diff --git a/modules/nickserv/ns_logout.cpp b/modules/nickserv/ns_logout.cpp index 90f9f295a..c0095e95d 100644 --- a/modules/nickserv/ns_logout.cpp +++ b/modules/nickserv/ns_logout.cpp @@ -64,14 +64,16 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Without a parameter, reverses the effect of the \002IDENTIFY\002\n" - "command, i.e. make you not recognized as the real owner of the nick\n" - "anymore. Note, however, that you won't be asked to reidentify\n" - "yourself.\n" - " \n" - "With a parameter, does the same for the given nick. If you\n" - "specify \002REVALIDATE\002 as well, services will ask the given nick\n" - "to re-identify. This is limited to \002Services Operators\002.")); + source.Reply(_( + "Without a parameter, reverses the effect of the \002IDENTIFY\002 " + "command, i.e. make you not recognized as the real owner of the nick " + "anymore. Note, however, that you won't be asked to reidentify " + "yourself." + "\n\n" + "With a parameter, does the same for the given nick. If you " + "specify \002REVALIDATE\002 as well, services will ask the given nick " + "to re-identify. This is limited to \002Services Operators\002." + )); return true; } diff --git a/modules/nickserv/ns_recover.cpp b/modules/nickserv/ns_recover.cpp index ef0d009ec..1c14a2cad 100644 --- a/modules/nickserv/ns_recover.cpp +++ b/modules/nickserv/ns_recover.cpp @@ -81,9 +81,12 @@ public: } } - u->SendMessage(source.service, _("This nickname has been recovered by %s. If you did not do\n" - "this then %s may have your password, and you should change it."), - source.GetNick().c_str(), source.GetNick().c_str()); + u->SendMessage(source.service, _( + "This nickname has been recovered by %s. If you did not do " + "this then %s may have your password, and you should change it." + ), + source.GetNick().c_str(), + source.GetNick().c_str()); Anope::string buf = source.command.upper() + " command used by " + source.GetNick(); u->Kill(*source.service, buf); @@ -125,8 +128,7 @@ public: } else { - source.Reply(_("The user with your nick has been removed. Use this command again\n" - "to release services's hold on your nick.")); + source.Reply(_("The user with your nick has been removed. Use this command again to release services's hold on your nick.")); } } } @@ -217,12 +219,14 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Recovers your nick from another user or from services.\n" - "If services are currently holding your nick, the hold\n" - "will be released. If another user is holding your nick\n" - "and is identified they will be killed (similar to the old\n" - "GHOST command). If they are not identified they will be\n" - "forced off of the nick.")); + source.Reply(_( + "Recovers your nick from another user or from services. " + "If services are currently holding your nick, the hold " + "will be released. If another user is holding your nick " + "and is identified they will be killed (similar to the old " + "GHOST command). If they are not identified they will be " + "forced off of the nick." + )); return true; } }; diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 2bcb8eac1..bfa528bd5 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -97,17 +97,24 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("This command is used by several commands as a way to confirm\n" - "changes made to your account.\n" - " \n" - "This is most commonly used to confirm your email address once\n" - "you register or change it.\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.")); + source.Reply(_( + "This command is used by several commands as a way to confirm " + "changes made to your account." + "\n\n" + "This is most commonly used to confirm your email address once " + "you register or change it." + "\n\n" + "This is also used after the RESETPASS command has been used to " + "force identify you to your nick so you may change your password." + )); + if (source.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.")); + { + source.Reply(_( + "Additionally, Services Operators with the \037nickserv/confirm\037 permission can " + "replace \037passcode\037 with a users nick to force validate them." + )); + } return true; } @@ -274,39 +281,46 @@ public: unsigned int minpasslen = Config->GetModule("nickserv").Get<unsigned>("minpasslen", "10"); this->SendSyntax(source); source.Reply(" "); - source.Reply(_("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" - "registering - you'll need it to make changes to your nick\n" - "later. (Note that \002case matters!\002 \037ANOPE\037, \037Anope\037, and\n" - "\037anope\037 are all different passwords!)\n" - " \n" - "Guidelines on choosing passwords:\n" - " \n" - "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" - "passwords are vulnerable to trial-and-error searches, so\n" - "you should choose a password at least %u characters long.\n" - "Finally, the space character cannot be used in passwords."), - source.service->nick.c_str(), source.service->nick.c_str(), - minpasslen); + source.Reply(_( + "Registers your nickname in the %s database. Once " + "your nick is registered, you can use the \002SET\002 and \002ACCESS\002 " + "commands to configure your nick's settings as you like " + "them. Make sure you remember the password you use when " + "registering - you'll need it to make changes to your nick " + "later. (Note that \002case matters!\002 \037ANOPE\037, \037Anope\037, and " + "\037anope\037 are all different passwords!) " + "\n\n" + "Guidelines on choosing passwords:" + "\n\n" + "Passwords should not be easily guessable. For example, " + "using your real name as a password is a bad idea. Using " + "your nickname as a password is a much worse idea ;) and, " + "in fact, %s will not allow it. Also, short " + "passwords are vulnerable to trial-and-error searches, so " + "you should choose a password at least %u characters long. " + "Finally, the space character cannot be used in passwords." + ), + source.service->nick.c_str(), + source.service->nick.c_str(), + minpasslen); if (!Config->GetModule("nickserv").Get<bool>("forceemail", "yes")) { source.Reply(" "); - source.Reply(_("The \037email\037 parameter is optional and will set the email\n" - "for your nick immediately. You may also wish to \002SET HIDE\002 it\n" - "after registering if it isn't the default setting already.")); + source.Reply(_( + "The \037email\037 parameter is optional and will set the email " + "for your nick immediately. You may also wish to \002SET\032HIDE\002 it " + "after registering if it isn't the default setting already." + )); } source.Reply(" "); - source.Reply(_("This command also creates a new group for your nickname,\n" - "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.")); + source.Reply(_( + "This command also creates a new group for your nickname, " + "that will allow you to register other nicks later sharing " + "the same configuration, the same set of memos and the " + "same channel privileges." + )); return true; } }; diff --git a/modules/nickserv/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp index 7425ade66..94e1c89b2 100644 --- a/modules/nickserv/ns_resetpass.cpp +++ b/modules/nickserv/ns_resetpass.cpp @@ -50,9 +50,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sends a passcode to the nickname with instructions on how to\n" - "reset their password. Email must be the email address associated\n" - "to the nickname.")); + source.Reply(_( + "Sends a passcode to the nickname with instructions on how to " + "reset their password. Email must be the email address associated " + "to the nickname." + )); return true; } }; diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp index b8f6c257b..d1fefecab 100644 --- a/modules/nickserv/ns_set.cpp +++ b/modules/nickserv/ns_set.cpp @@ -57,8 +57,7 @@ public: } } - source.Reply(_("Type \002%s \037option\037\002 for more information\n" - "on a specific option."), + source.Reply(_("Type \002%s\032\037option\037\002 for more information on a specific option."), source.service->GetQueryCommand("generic/help", this_name).c_str()); return true; @@ -101,9 +100,11 @@ public: } } - source.Reply(_("Type \002%s \037option\037\002 for more information\n" - "on a specific option. The options will be set on the given\n" - "\037nickname\037."), + source.Reply(_( + "Type \002%s\032\037option\037\002 for more information " + "on a specific option. The options will be set on the given " + "\037nickname\037." + ), source.service->GetQueryCommand("generic/help", this_name).c_str()); return true; } @@ -164,8 +165,7 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Changes the password used to identify you as the nick's\n" - "owner.")); + source.Reply(_("Changes the password used to identify you as the nick's owner.")); return true; } }; @@ -300,10 +300,13 @@ public: BotInfo *bi = Config->GetClient("ChanServ"); this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets whether you will be given your channel status modes automatically.\n" - "Set to \002ON\002 to allow %s to set status modes on you automatically\n" - "when entering channels. Note that depending on channel settings some modes\n" - "may not get set automatically."), bi ? bi->nick.c_str() : "ChanServ"); + source.Reply(_( + "Sets whether you will be given your channel status modes automatically. " + "Set to \002ON\002 to allow %s to set status modes on you automatically " + "when entering channels. Note that depending on channel settings some modes " + "may not get set automatically." + ), + bi ? bi->nick.c_str() : "ChanServ"); return true; } }; @@ -328,11 +331,14 @@ public: BotInfo *bi = Config->GetClient("ChanServ"); this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets whether the given nickname will be given its status modes\n" - "in channels automatically. Set to \002ON\002 to allow %s\n" - "to set status modes on the given nickname automatically when it\n" - "is entering channels. Note that depending on channel settings\n" - "some modes may not get set automatically."), bi ? bi->nick.c_str() : "ChanServ"); + source.Reply(_( + "Sets whether the given nickname will be given its status modes " + "in channels automatically. Set to \002ON\002 to allow %s " + "to set status modes on the given nickname automatically when it " + "is entering channels. Note that depending on channel settings " + "some modes may not get set automatically." + ), + bi ? bi->nick.c_str() : "ChanServ"); return true; } }; @@ -486,8 +492,10 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Changes the display used to refer to your nickname group in\n" - "services. The new display MUST be a nick of your group.")); + source.Reply(_( + "Changes the display used to refer to your nickname group in " + "services. The new display MUST be a nick of your group." + )); return true; } }; @@ -511,8 +519,10 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Changes the display used to refer to the nickname group in\n" - "services. The new display MUST be a nick of the group.")); + source.Reply(_( + "Changes the display used to refer to the nickname group in " + "services. The new display MUST be a nick of the group." + )); return true; } }; @@ -631,9 +641,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Associates the given email address with your nickname.\n" - "This address will be displayed whenever someone requests\n" - "information on the nickname with the \002INFO\002 command.")); + source.Reply(_( + "Associates the given email address with your nickname. " + "This address will be displayed whenever someone requests " + "information on the nickname with the \002INFO\002 command." + )); return true; } }; @@ -709,8 +721,10 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Sets whether the given nickname will expire. Setting this\n" - "to \002ON\002 prevents the nickname from expiring.")); + source.Reply(_( + "Sets whether the given nickname will expire. Setting this " + "to \002ON\002 prevents the nickname from expiring." + )); return true; } }; diff --git a/modules/nickserv/ns_set_keepmodes.cpp b/modules/nickserv/ns_set_keepmodes.cpp index 03fec7d1f..faa44b9d3 100644 --- a/modules/nickserv/ns_set_keepmodes.cpp +++ b/modules/nickserv/ns_set_keepmodes.cpp @@ -68,9 +68,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Enables or disables keepmodes for your nick. If keep\n" - "modes is enabled, services will remember your usermodes\n" - "and attempt to re-set them the next time you authenticate.")); + source.Reply(_( + "Enables or disables keepmodes for your nick. If keep " + "modes is enabled, services will remember your usermodes " + "and attempt to re-set them the next time you authenticate." + )); return true; } }; @@ -95,9 +97,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Enables or disables keepmodes for the given nick. If keep\n" - "modes is enabled, services will remember users' usermodes\n" - "and attempt to re-set them the next time they authenticate.")); + source.Reply(_( + "Enables or disables keepmodes for the given nick. If keep " + "modes is enabled, services will remember users' usermodes " + "and attempt to re-set them the next time they authenticate." + )); return true; } }; diff --git a/modules/nickserv/ns_set_language.cpp b/modules/nickserv/ns_set_language.cpp index 07f31d8b0..7ac553bef 100644 --- a/modules/nickserv/ns_set_language.cpp +++ b/modules/nickserv/ns_set_language.cpp @@ -87,10 +87,12 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Changes the language services uses when sending messages to\n" - "you (for example, when responding to a command you send).\n" - "\037language\037 should be chosen from the following list of\n" - "supported languages:")); + source.Reply(_( + "Changes the language services uses when sending messages to " + "you (for example, when responding to a command you send). " + "\037language\037 should be chosen from the following list of " + "supported languages:" + )); for (const auto &[langcode, langname] : languages) source.Reply(" %s (%s)", langcode.c_str(), langname.c_str()); @@ -119,10 +121,12 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Changes the language services uses when sending messages to\n" - "the given user (for example, when responding to a command they send).\n" - "\037language\037 should be chosen from the following list of\n" - "supported languages:")); + source.Reply(_( + "Changes the language services uses when sending messages to " + "the given user (for example, when responding to a command they send). " + "\037language\037 should be chosen from the following list of " + "supported languages:" + )); for (const auto &[langcode, langname] : languages) source.Reply(" %s (%s)", langcode.c_str(), langname.c_str()); diff --git a/modules/nickserv/ns_set_message.cpp b/modules/nickserv/ns_set_message.cpp index 99f5d6782..6027d1d0a 100644 --- a/modules/nickserv/ns_set_message.cpp +++ b/modules/nickserv/ns_set_message.cpp @@ -74,9 +74,12 @@ public: this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows you to choose the way services are communicating with\n" - "you. With \002%s\002 set, services will use messages, else they'll\n" - "use notices."), cmd.upper().c_str()); + source.Reply(_( + "Allows you to choose the way services are communicating with " + "you. With \002%s\002 set, services will use messages, else they'll " + "use notices." + ), + cmd.upper().c_str()); return true; } }; @@ -95,9 +98,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows you to choose the way services are communicating with\n" - "the given user. With \002MSG\002 set, services will use messages,\n" - "else they'll use notices.")); + source.Reply(_( + "Allows you to choose the way services are communicating with " + "the given user. With \002MSG\002 set, services will use messages, " + "else they'll use notices." + )); return true; } diff --git a/modules/nickserv/ns_set_protect.cpp b/modules/nickserv/ns_set_protect.cpp index af4f37e0a..5d3bd8c5b 100644 --- a/modules/nickserv/ns_set_protect.cpp +++ b/modules/nickserv/ns_set_protect.cpp @@ -99,10 +99,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Turns automatic protection for your account on or off. With\n" - "protection on if another user tries to use a nickname from\n" - "your group they will be given some time to change their nick\n" - "after which %s will forcibly change their nick."), source.service->nick.c_str()); + source.Reply(_( + "Turns automatic protection for your account on or off. With " + "protection on if another user tries to use a nickname from " + "your group they will be given some time to change their nick " + "after which %s will forcibly change their nick." + ), + source.service->nick.c_str()); return true; } }; @@ -127,10 +130,13 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Turns automatic protection for the nick on or off. With\n" - "protection on if a user tries to use a nickname from the\n" - "nick's group they will be given some time to change their\n" - "nick after which %s will forcibly change their nick."), source.service->nick.c_str()); + source.Reply(_( + "Turns automatic protection for the nick on or off. With " + "protection on if a user tries to use a nickname from the " + "nick's group they will be given some time to change their " + "nick after which %s will forcibly change their nick." + ), + source.service->nick.c_str()); return true; } }; diff --git a/modules/nickserv/ns_suspend.cpp b/modules/nickserv/ns_suspend.cpp index 04af0797d..c5d284e0a 100644 --- a/modules/nickserv/ns_suspend.cpp +++ b/modules/nickserv/ns_suspend.cpp @@ -157,10 +157,12 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Suspends a registered nickname, which prevents it from being used\n" - "while keeping all the data for that nick. If an expiry is given\n" - "the nick will be unsuspended after that period of time, else the\n" - "default expiry from the configuration is used.")); + source.Reply(_( + "Suspends a registered nickname, which prevents it from being used " + "while keeping all the data for that nick. If an expiry is given " + "the nick will be unsuspended after that period of time, else the " + "default expiry from the configuration is used." + )); return true; } }; diff --git a/modules/nickserv/ns_update.cpp b/modules/nickserv/ns_update.cpp index 0ce6a5c95..9a182bc6a 100644 --- a/modules/nickserv/ns_update.cpp +++ b/modules/nickserv/ns_update.cpp @@ -41,9 +41,11 @@ public: { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Updates your current status, i.e. it checks for new memos,\n" - "sets needed channel modes and updates your vhost and\n" - "your userflags (lastseentime, etc).")); + source.Reply(_( + "Updates your current status, i.e. it checks for new memos, " + "sets needed channel modes and updates your vhost and " + "your userflags (lastseentime, etc)." + )); return true; } }; |
