diff options
| author | Sadie Powell <sadie@witchery.services> | 2025-05-10 14:35:03 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2025-05-10 14:40:12 +0100 |
| commit | e9a0a214b0b8454a506321164ee4318d3cee7ddd (patch) | |
| tree | 3881c2f0e9af208ab2c4745437211a9553600fda | |
| parent | 46c5570b1d900976aa0868ceae33ab8e81dc4287 (diff) | |
Refactor Anope::strftime.
| -rw-r--r-- | language/anope.en_US.po | 25 | ||||
| -rw-r--r-- | src/misc.cpp | 6 |
2 files changed, 16 insertions, 15 deletions
diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 64ee75a41..e8c67f566 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-05-10 00:58+0100\n" +"POT-Creation-Date: 2025-05-10 14:34+0100\n" "PO-Revision-Date: 2025-04-25 13:08+0100\n" "Last-Translator: Sadie Powell <sadie@witchery.services>\n" "Language-Team: English\n" @@ -776,6 +776,14 @@ msgid "%s (%d times)" msgstr "" #, c-format +msgid "%s (%s ago)" +msgstr "" + +#, c-format +msgid "%s (%s from now)" +msgstr "" + +#, c-format msgid "%s (%s) was kicked from %s (\"%s\") %s ago%s" msgstr "" @@ -820,6 +828,10 @@ msgid "%s (minimum %d/%d%%)" msgstr "" #, c-format +msgid "%s (now)" +msgstr "" + +#, c-format msgid "%s access list is empty." msgstr "" @@ -1088,14 +1100,6 @@ msgid_plural "%zu nicknames in the group." msgstr[0] "" msgstr[1] "" -#, c-format -msgid "(%s ago)" -msgstr "" - -#, c-format -msgid "(%s from now)" -msgstr "" - msgid "(Split)" msgstr "" @@ -1109,9 +1113,6 @@ msgstr "" msgid "(founder only)" msgstr "" -msgid "(now)" -msgstr "" - msgid "* AKILL any new clients connecting" msgstr "" diff --git a/src/misc.cpp b/src/misc.cpp index d8a6e8f72..f30fa9d19 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -547,11 +547,11 @@ 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); + return Anope::printf(Language::Translate(nc, _("%s (%s ago)")), buf, Duration(Anope::CurTime - t, nc).c_str()); 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); + return Anope::printf(Language::Translate(nc, _("%s (%s from now)")), buf, Duration(t - Anope::CurTime, nc).c_str(), nc); else - return Anope::string(buf) + " " + Language::Translate(nc, _("(now)")); + return Anope::printf(Language::Translate(nc, _("%s (now)")), buf); } Anope::string Anope::Expires(time_t expires, const NickCore *nc) |