From 309c342b86bb2ec15398e4e2f711556a0667a871 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 13 Nov 2024 11:52:12 +0000 Subject: [PATCH] Use the remaining wait time in the registration delay message. Closes #452. --- language/anope.en_US.po | 8 ++++---- modules/nickserv/ns_register.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/language/anope.en_US.po b/language/anope.en_US.po index decfba2c8..7708cb2d2 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7081,10 +7081,6 @@ msgstr "" msgid "You must confirm your account before you may send a memo." msgstr "" -#, c-format -msgid "You must have been using this nick for at least %lu seconds to register." -msgstr "" - #, c-format msgid "You must have the %s(ME) privilege on the channel to use this command." msgstr "" @@ -7095,6 +7091,10 @@ msgid "" "case you forget it." msgstr "" +#, c-format +msgid "You must wait %s before registering your nick." +msgstr "" + msgid "You need to be identified to use this command." msgstr "" diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 5217b90de..4775fc594 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -154,8 +154,9 @@ public: time_t reg_delay = Config->GetModule("nickserv")->Get("regdelay"); if (u && !u->HasMode("OPER") && nickregdelay && Anope::CurTime - u->timestamp < nickregdelay) { - source.Reply(_("You must have been using this nick for at least %lu seconds to register."), - (unsigned long)nickregdelay); + auto waitperiod = (u->timestamp + nickregdelay) - Anope::CurTime; + source.Reply(_("You must wait %s before registering your nick."), + Anope::Duration(waitperiod, source.GetAccount()).c_str()); return; }