From 4de59d61d8f593c18630b46270f48e32e4549ec0 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 13 Nov 2024 11:44:03 +0000 Subject: Use durations instead of seconds in waiting messages. --- modules/nickserv/ns_group.cpp | 5 ++++- modules/nickserv/ns_register.cpp | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'modules/nickserv') diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index 33bf2c229..c7a118211 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -148,7 +148,10 @@ public: if (!(target = NickAlias::Find(nick))) source.Reply(NICK_X_NOT_REGISTERED, nick.c_str()); else if (user && Anope::CurTime < user->lastnickreg + reg_delay) - source.Reply(_("Please wait %lu seconds before using the GROUP command again."), (unsigned long)(reg_delay + user->lastnickreg) - Anope::CurTime); + { + auto waitperiod = (unsigned long)(reg_delay + user->lastnickreg) - Anope::CurTime; + source.Reply(_("Please wait %s before using the GROUP command again."), Anope::Duration(waitperiod, source.GetAccount()).c_str()); + } else if (target->nc->HasExt("NS_SUSPENDED")) { Log(LOG_COMMAND, source, this) << "and tried to group to SUSPENDED nick " << target->nick; diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index 277cc43a2..5217b90de 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -202,8 +202,9 @@ public: this->OnSyntaxError(source, ""); else if (u && Anope::CurTime < u->lastnickreg + reg_delay) { - source.Reply(_("Please wait %lu seconds before using the REGISTER command again."), - (unsigned long)(u->lastnickreg + reg_delay) - Anope::CurTime); + auto waitperiod = (unsigned long)(u->lastnickreg + reg_delay) - Anope::CurTime; + source.Reply(_("Please wait %s before using the REGISTER command again."), + Anope::Duration(waitperiod, source.GetAccount()).c_str()); } else if (NickAlias::Find(u_nick) != NULL) source.Reply(NICK_ALREADY_REGISTERED, u_nick.c_str()); -- cgit