From 1b08ba8f4176217d43e7d8ca1ce23a06e33d2378 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 5 Oct 2013 13:21:28 -0400 Subject: Always show expire time for nicks in /ns info to opers, even if the user is online Make Anope::strftime show "now" if the time is now Fix typo in nickalias.cpp for the type of the last_seen field, spotted by grawity --- src/misc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/misc.cpp') diff --git a/src/misc.cpp b/src/misc.cpp index 33ac56bcd..c6645dee2 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -362,8 +362,10 @@ Anope::string Anope::strftime(time_t t, const NickCore *nc, bool short_output) return buf; if (t < Anope::CurTime) return Anope::string(buf) + " " + Anope::printf(Language::Translate(nc, _("(%s ago)")), Duration(Anope::CurTime - t, nc).c_str(), nc); - else + else if (t > Anope::CurTime) return Anope::string(buf) + " " + Anope::printf(Language::Translate(nc, _("(%s from now)")), Duration(t - Anope::CurTime, nc).c_str(), nc); + else + return Anope::string(buf) + " " + Language::Translate(nc, _("(now)")); } Anope::string Anope::Expires(time_t expires, const NickCore *nc) -- cgit