diff --git a/include/language.h b/include/language.h index 388a37378..faf8ef350 100644 --- a/include/language.h +++ b/include/language.h @@ -127,10 +127,10 @@ namespace Language #define NO_EXPIRE _("does not expire") #define PASSWORD_INCORRECT _("Password incorrect.") #define READ_ONLY_MODE _("Services are temporarily in read-only mode.") -#define SERVICE_UNAVAILABLE _("Sorry, %s is temporarily unavailable.") #define TIME_NEVER _("Never") #define TIME_NOW _("Now") #define TIME_UNKNOWN _("Unknown") +#define TRY_AGAIN_LATER _("The \002%s\002 command is temporarily unavailable. Please try again later.") #define USERHOST_MASK_TOO_WIDE _("%s coverage is too wide; Please use a more specific mask.") #define BOT_DOES_NOT_EXIST _("Bot \002%s\002 does not exist.") diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 4b189971b..d2dca66de 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-11-20 15:05+0000\n" -"PO-Revision-Date: 2025-11-20 15:05+0000\n" +"POT-Creation-Date: 2025-11-25 00:00+0000\n" +"PO-Revision-Date: 2025-11-25 00:00+0000\n" "Last-Translator: Sadie Powell \n" "Language-Team: English\n" "Language: en_US\n" @@ -1359,9 +1359,6 @@ msgstr "" msgid "Account registered" msgstr "" -msgid "Accounts can not be registered right now. Please try again later." -msgstr "" - #, c-format msgid "Accounts that are not used anymore are subject to the automatic expiration, i.e. they will be deleted after %s if not used." msgstr "" @@ -4223,9 +4220,6 @@ msgstr "" msgid "Password reset email for %s has been sent." msgstr "" -msgid "Passwords can not be changed right now. Please try again later." -msgstr "" - #, c-format msgid "Passwords encrypted with %s: %zu" msgstr "" @@ -5092,10 +5086,6 @@ msgstr "" msgid "Sorry, %s currently has too many memos and cannot receive more." msgstr "" -#, c-format -msgid "Sorry, %s is temporarily unavailable." -msgstr "" - #, c-format msgid "Sorry, I have not seen %s." msgstr "" @@ -5313,6 +5303,10 @@ msgid "" "For a list of the features and functions whose levels can be set, see HELP%sDESC." msgstr "" +#, c-format +msgid "The %s command is temporarily unavailable. Please try again later." +msgstr "" + #, c-format msgid "" "The %sADD command adds the given nickname to the %s list.\n" diff --git a/modules/chanserv/cs_clone.cpp b/modules/chanserv/cs_clone.cpp index 75cfc9c75..933d2cbf6 100644 --- a/modules/chanserv/cs_clone.cpp +++ b/modules/chanserv/cs_clone.cpp @@ -65,7 +65,10 @@ class CommandCSClone final static void CopyAkick(CommandSource &source, ChannelInfo *ci, ChannelInfo *target_ci) { if (!ChanServ::akick_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } ChanServ::akick_service->ClearAKick(target_ci); for (unsigned i = 0; i < ChanServ::akick_service->GetAKickCount(ci); ++i) @@ -87,7 +90,7 @@ class CommandCSClone final if (!target_badwords || !badwords) { - source.Reply(ACCESS_DENIED); // BotServ doesn't exist/badwords isn't loaded + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/global/gl_global.cpp b/modules/global/gl_global.cpp index c4cdf1c59..742e1a4ac 100644 --- a/modules/global/gl_global.cpp +++ b/modules/global/gl_global.cpp @@ -41,7 +41,7 @@ public: { if (!Global::service) { - source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str()); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/global/gl_queue.cpp b/modules/global/gl_queue.cpp index 1ea1f89c4..89ec81e4e 100644 --- a/modules/global/gl_queue.cpp +++ b/modules/global/gl_queue.cpp @@ -141,7 +141,7 @@ public: { if (!Global::service) { - source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str()); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/global/gl_server.cpp b/modules/global/gl_server.cpp index cdb2ca7ab..aa8b4f636 100644 --- a/modules/global/gl_server.cpp +++ b/modules/global/gl_server.cpp @@ -41,7 +41,7 @@ public: { if (!Global::service) { - source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str()); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/memoserv/ms_rsend.cpp b/modules/memoserv/ms_rsend.cpp index c6701f634..119c87adb 100644 --- a/modules/memoserv/ms_rsend.cpp +++ b/modules/memoserv/ms_rsend.cpp @@ -28,7 +28,10 @@ public: void Execute(CommandSource &source, const std::vector ¶ms) override { if (!MemoServ::service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } if (Anope::ReadOnly && !source.IsOper()) { diff --git a/modules/memoserv/ms_send.cpp b/modules/memoserv/ms_send.cpp index bc6ed2741..3aecb96e3 100644 --- a/modules/memoserv/ms_send.cpp +++ b/modules/memoserv/ms_send.cpp @@ -28,7 +28,10 @@ public: void Execute(CommandSource &source, const std::vector ¶ms) override { if (!MemoServ::service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &nick = params[0]; const Anope::string &text = params[1]; diff --git a/modules/memoserv/ms_sendall.cpp b/modules/memoserv/ms_sendall.cpp index 016c070c3..5f5731591 100644 --- a/modules/memoserv/ms_sendall.cpp +++ b/modules/memoserv/ms_sendall.cpp @@ -28,7 +28,10 @@ public: void Execute(CommandSource &source, const std::vector ¶ms) override { if (!MemoServ::service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &text = params[0]; diff --git a/modules/memoserv/ms_staff.cpp b/modules/memoserv/ms_staff.cpp index c09171879..eccfc3370 100644 --- a/modules/memoserv/ms_staff.cpp +++ b/modules/memoserv/ms_staff.cpp @@ -28,7 +28,10 @@ public: void Execute(CommandSource &source, const std::vector ¶ms) override { if (!MemoServ::service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &text = params[0]; diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 223ee9b3f..3ae5da3e1 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -127,7 +127,7 @@ public: Anope::string encpass; if (!Anope::Encrypt(pass, encpass)) { - source.Reply(_("Accounts can not be registered right now. Please try again later.")); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp index 3031c4627..999aff45d 100644 --- a/modules/nickserv/ns_set.cpp +++ b/modules/nickserv/ns_set.cpp @@ -144,7 +144,7 @@ public: if (!Anope::Encrypt(param, nc->pass)) { - source.Reply(_("Passwords can not be changed right now. Please try again later.")); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } @@ -203,7 +203,7 @@ public: if (!Anope::Encrypt(param, nc->pass)) { - source.Reply(_("Passwords can not be changed right now. Please try again later.")); + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; } diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp index 54ba280f2..2d5c0c824 100644 --- a/modules/operserv/os_forbid.cpp +++ b/modules/operserv/os_forbid.cpp @@ -245,7 +245,10 @@ public: void Execute(CommandSource &source, const std::vector ¶ms) override { if (!OperServ::forbid_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &command = params[0]; const Anope::string &subcommand = params.size() > 1 ? params[1] : ""; diff --git a/modules/operserv/os_ignore.cpp b/modules/operserv/os_ignore.cpp index a2e816d6b..bcba088d6 100644 --- a/modules/operserv/os_ignore.cpp +++ b/modules/operserv/os_ignore.cpp @@ -214,7 +214,10 @@ private: void DoAdd(CommandSource &source, const std::vector ¶ms) { if (!OperServ::ignore_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &time = params.size() > 1 ? params[1] : ""; const Anope::string &nick = params.size() > 2 ? params[2] : ""; @@ -268,7 +271,10 @@ private: static void DoList(CommandSource &source) { if (!OperServ::ignore_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } auto &ignores = OperServ::ignore_service->GetIgnores(); for (unsigned i = ignores.size(); i > 0; --i) @@ -315,7 +321,10 @@ private: void DoDel(CommandSource &source, const std::vector ¶ms) { if (!OperServ::ignore_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string nick = params.size() > 1 ? params[1] : ""; if (nick.empty()) @@ -348,7 +357,10 @@ private: void DoClear(CommandSource &source) { if (!OperServ::ignore_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } if (Anope::ReadOnly) source.Reply(READ_ONLY_MODE); diff --git a/modules/operserv/os_news.cpp b/modules/operserv/os_news.cpp index 9020b2163..9153821ac 100644 --- a/modules/operserv/os_news.cpp +++ b/modules/operserv/os_news.cpp @@ -290,7 +290,10 @@ protected: void DoNews(CommandSource &source, const std::vector ¶ms, OperServ::NewsType ntype) { if (!OperServ::news_service) + { + source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str()); return; + } const Anope::string &cmd = params[0];