summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2024-11-13 11:52:12 +0000
committerSadie Powell <sadie@witchery.services>2024-11-13 11:56:50 +0000
commit309c342b86bb2ec15398e4e2f711556a0667a871 (patch)
treeb6c01ef104822d49fa37170b1e1b706218760264
parent4de59d61d8f593c18630b46270f48e32e4549ec0 (diff)
Use the remaining wait time in the registration delay message.
Closes #452.
-rw-r--r--language/anope.en_US.po8
-rw-r--r--modules/nickserv/ns_register.cpp5
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
@@ -7082,10 +7082,6 @@ 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<time_t>("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;
}