diff options
Diffstat (limited to 'modules')
47 files changed, 169 insertions, 161 deletions
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index b654ae12f..41cfb7f4c 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -190,7 +190,7 @@ class CommandBSBadwords : public Command ListFormatter list(source.GetAccount()); BadWords *bw = ci->GetExt<BadWords>("badwords"); - list.AddColumn("Number").AddColumn("Word").AddColumn("Type"); + list.AddColumn(_("Number")).AddColumn(_("Word")).AddColumn(_("Type")); if (!bw || !bw->GetBadWordCount()) { diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index b45f8bda7..d6ae463ab 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -24,7 +24,7 @@ class CommandBSBotList : public Command unsigned count = 0; ListFormatter list(source.GetAccount()); - list.AddColumn("Nick").AddColumn("Mask"); + list.AddColumn(_("Nick")).AddColumn(_("Mask")); for (botinfo_map::const_iterator it = BotListByNick->begin(), it_end = BotListByNick->end(); it != it_end; ++it) { diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index a3eb9ce2d..9cd01ebf0 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -56,7 +56,7 @@ class CommandBSInfo : public Command source.Reply(_("Information for bot \002%s\002:"), bi->nick.c_str()); info[_("Mask")] = bi->GetIdent() + "@" + bi->host; info[_("Real name")] = bi->realname; - info[_("Created")] = Anope::strftime(bi->created); + info[_("Created")] = Anope::strftime(bi->created, source.GetAccount()); info[_("Options")] = bi->oper_only ? _("Private") : _("None"); info[_("Used on")] = stringify(bi->GetChannelCount()) + " channel(s)"; diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index 1d7563c38..b0ff8b26e 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -1184,9 +1184,9 @@ class BSKick : public Module info[_("AMSG kicker")] = disabled; if (kd && kd->dontkickops) - info.AddOption(_("Ops Protection")); + info.AddOption(_("Ops protection")); if (kd && kd->dontkickvoices) - info.AddOption(_("Voices Protection")); + info.AddOption(_("Voices protection")); } void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 414704722..91f9cff4f 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -426,7 +426,7 @@ class CommandCSAccess : public Command } ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Level").AddColumn("Mask"); + list.AddColumn(_("Number")).AddColumn(_("Level")).AddColumn(_("Mask")); this->ProcessList(source, ci, params, list); } @@ -439,7 +439,7 @@ class CommandCSAccess : public Command } ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Level").AddColumn("Mask").AddColumn("By").AddColumn("Last seen"); + list.AddColumn(_("Number")).AddColumn(_("Level")).AddColumn(_("Mask")).AddColumn(_("By")).AddColumn(_("Last seen")); this->ProcessList(source, ci, params, list); } @@ -661,7 +661,7 @@ class CommandCSLevels : public Command source.Reply(_("Access level settings for channel %s:"), ci->name.c_str()); ListFormatter list(source.GetAccount()); - list.AddColumn("Name").AddColumn("Level"); + list.AddColumn(_("Name")).AddColumn(_("Level")); const std::vector<Privilege> &privs = PrivilegeManager::GetPrivileges(); @@ -674,9 +674,9 @@ class CommandCSLevels : public Command entry["Name"] = p.name; if (j == ACCESS_INVALID) - entry["Level"] = "(disabled)"; + entry["Level"] = Language::Translate(source.GetAccount(), _("(disabled)")); else if (j == ACCESS_FOUNDER) - entry["Level"] = "(founder only)"; + entry["Level"] = Language::Translate(source.GetAccount(), _("(founder only)")); else entry["Level"] = stringify(j); @@ -755,7 +755,7 @@ class CommandCSLevels : public Command source.Reply(_("The following feature/function names are available:")); ListFormatter list(source.GetAccount()); - list.AddColumn("Name").AddColumn("Description"); + list.AddColumn(_("Name")).AddColumn(_("Description")); const std::vector<Privilege> &privs = PrivilegeManager::GetPrivileges(); for (unsigned i = 0; i < privs.size(); ++i) diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 06ddc406e..2a0d623af 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -257,11 +257,12 @@ class CommandCSAKick : public Command { class AkickListCallback : public NumberList { + CommandSource &source; ListFormatter &list; ChannelInfo *ci; public: - AkickListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci) + AkickListCallback(CommandSource &_source, ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), source(_source), list(_list), ci(_ci) { } @@ -274,11 +275,11 @@ class CommandCSAKick : public Command Anope::string timebuf, lastused; if (akick->addtime) - timebuf = Anope::strftime(akick->addtime, NULL, false); + timebuf = Anope::strftime(akick->addtime, source.GetAccount(), false); else timebuf = UNKNOWN; if (akick->last_used) - lastused = Anope::strftime(akick->last_used, NULL, false); + lastused = Anope::strftime(akick->last_used, source.GetAccount(), false); else lastused = UNKNOWN; @@ -295,7 +296,7 @@ class CommandCSAKick : public Command this->list.AddEntry(entry); } } - nl_list(list, ci, mask); + nl_list(source, list, ci, mask); nl_list.Process(); } else @@ -314,11 +315,11 @@ class CommandCSAKick : public Command Anope::string timebuf, lastused; if (akick->addtime) - timebuf = Anope::strftime(akick->addtime); + timebuf = Anope::strftime(akick->addtime, source.GetAccount()); else timebuf = UNKNOWN; if (akick->last_used) - lastused = Anope::strftime(akick->last_used); + lastused = Anope::strftime(akick->last_used, source.GetAccount()); else lastused = UNKNOWN; @@ -361,7 +362,7 @@ class CommandCSAKick : public Command } ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Mask").AddColumn("Reason"); + list.AddColumn(_("Number")).AddColumn(_("Mask")).AddColumn(_("Reason")); this->ProcessList(source, ci, params, list); } @@ -374,7 +375,7 @@ class CommandCSAKick : public Command } ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Mask").AddColumn("Creator").AddColumn("Created").AddColumn("Last used").AddColumn("Reason"); + list.AddColumn(_("Number")).AddColumn(_("Mask")).AddColumn(_("Creator")).AddColumn(_("Created")).AddColumn(_("Last used")).AddColumn(_("Reason")); this->ProcessList(source, ci, params, list); } diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index e0b40a9d5..86061dc91 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -39,7 +39,7 @@ class CommandCSDrop : public Command if (params.size() < 2 || !chan.equals_ci(params[1])) { - source.Reply(_("You must enter the channel name twice as a confirmation that you wish to drop \2%s\2."), chan.c_str()); + source.Reply(_("You must enter the channel name twice as a confirmation that you wish to drop \002%s\002."), chan.c_str()); return; } diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index 1aeadaac8..3cf14e523 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -110,7 +110,7 @@ class CommandEntryMessage : public Command source.Reply(_("Entry message list for \002%s\002:"), ci->name.c_str()); ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Creator").AddColumn("Created").AddColumn("Message"); + list.AddColumn(_("Number")).AddColumn(_("Creator")).AddColumn(_("Created")).AddColumn(_("Message")); for (unsigned i = 0; i < (*messages)->size(); ++i) { EntryMsg *msg = (*messages)->at(i); @@ -118,7 +118,7 @@ class CommandEntryMessage : public Command ListFormatter::ListEntry entry; entry["Number"] = stringify(i + 1); entry["Creator"] = msg->creator; - entry["Created"] = Anope::strftime(msg->when); + entry["Created"] = Anope::strftime(msg->when, source.GetAccount()); entry["Message"] = msg->message; list.AddEntry(entry); } diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 984c0089c..05129ad05 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -249,9 +249,9 @@ class CommandCSFlags : public Command if (p != NULL) { if (add) - source.Reply(_("Privilege \2%s\2 added to \2%s\2 on \2%s\2, new flags are +\2%s\2"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); + source.Reply(_("Privilege \002%s\002 added to \002%s\002 on \002%s\002, new flags are +\002%s\002"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); else - source.Reply(_("Privilege \2%s\2 removed from \2%s\2 on \2%s\2, new flags are +\2%s\2"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); + source.Reply(_("Privilege \002%s\002 removed from \002%s\002 on \002%s\002, new flags are +\002%s\002"), p->name.c_str(), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); } else source.Reply(_("Flags for \002%s\002 on %s set to +\002%s\002"), access->mask.c_str(), ci->name.c_str(), access->AccessSerialize().c_str()); @@ -269,7 +269,7 @@ class CommandCSFlags : public Command ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Mask").AddColumn("Flags").AddColumn("Creator").AddColumn("Created"); + list.AddColumn(_("Number")).AddColumn(_("Mask")).AddColumn(_("Flags")).AddColumn(_("Creator")).AddColumn(_("Created")); unsigned count = 0; for (unsigned i = 0, end = ci->GetAccessCount(); i < end; ++i) diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp index 8f910fc83..a52c43d87 100644 --- a/modules/commands/cs_info.cpp +++ b/modules/commands/cs_info.cpp @@ -44,20 +44,20 @@ class CommandCSInfo : public Command source.Reply(CHAN_INFO_HEADER, chan.c_str()); if (ci->GetFounder()) - info["Founder"] = ci->GetFounder()->display; + info[_("Founder")] = ci->GetFounder()->display; if (show_all && ci->GetSuccessor()) - info["Successor"] = ci->GetSuccessor()->display; + info[_("Successor")] = ci->GetSuccessor()->display; if (!ci->desc.empty()) - info["Description"] = ci->desc; + info[_("Description")] = ci->desc; - info["Registered"] = Anope::strftime(ci->time_registered); - info["Last used"] = Anope::strftime(ci->last_used); + info[_("Registered")] = Anope::strftime(ci->time_registered, source.GetAccount()); + info[_("Last used")] = Anope::strftime(ci->last_used, source.GetAccount()); if (show_all) { - info["Ban type"] = stringify(ci->bantype); + info[_("Ban type")] = stringify(ci->bantype); } FOREACH_MOD(OnChanInfo, (source, ci, info, show_all)); diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index 661c54ac6..ef9f86dd4 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -71,7 +71,7 @@ class CommandCSList : public Command source.Reply(_("List of entries matching \002%s\002:"), pattern.c_str()); ListFormatter list(source.GetAccount()); - list.AddColumn("Name").AddColumn("Description"); + list.AddColumn(_("Name")).AddColumn(_("Description")); Anope::map<ChannelInfo *> ordered_map; for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it) @@ -99,7 +99,7 @@ class CommandCSList : public Command ListFormatter::ListEntry entry; entry["Name"] = (isnoexpire ? "!" : "") + ci->name; if (ci->HasExt("CS_SUSPENDED")) - entry["Description"] = "[Suspended]"; + entry["Description"] = Language::Translate(source.GetAccount(), _("[Suspended]")); else entry["Description"] = ci->desc; list.AddEntry(entry); diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 643fa152e..cca0d19de 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -124,7 +124,7 @@ public: else { ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Service").AddColumn("Command").AddColumn("Method").AddColumn(""); + list.AddColumn(_("Number")).AddColumn(_("Service")).AddColumn(_("Command")).AddColumn(_("Method")).AddColumn(""); for (unsigned i = 0; i < (*ls)->size(); ++i) { diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index c40678a5f..1d3050f32 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -423,7 +423,7 @@ class CommandCSMode : public Command else { ListFormatter list(source.GetAccount()); - list.AddColumn("Mode").AddColumn("Param").AddColumn("Creator").AddColumn("Created"); + list.AddColumn(_("Mode")).AddColumn(_("Param")).AddColumn(_("Creator")).AddColumn(_("Created")); for (ModeLocks::ModeList::const_iterator it = mlocks.begin(), it_end = mlocks.end(); it != it_end; ++it) { @@ -701,8 +701,8 @@ class CommandCSMode : public Command "on a channel.\n" " \n" "The \002%s LOCK\002 command allows you to add, delete, and view mode locks on a channel.\n" - "If a mode is locked on or off, services will not allow that mode to be changed. The \2SET\2\n" - "command will clear all existing mode locks and set the new one given, while \2ADD\2 and \2DEL\2\n" + "If a mode is locked on or off, services will not allow that mode to be changed. The \002SET\002\n" + "command will clear all existing mode locks and set the new one given, while \002ADD\002 and \002DEL\002\n" "modify the existing mode lock.\n" "Example:\n" " \002MODE #channel LOCK ADD +bmnt *!*@*aol*\002\n" @@ -812,9 +812,9 @@ class CommandCSModes : public Command if (!m.second.empty()) { if (m.first) - return Anope::printf(_("Gives you or the specified nick %s status on a channel"), m.second.c_str()); + return Anope::printf(Language::Translate(source.GetAccount(), _("Gives you or the specified nick %s status on a channel")), m.second.c_str()); else - return Anope::printf(_("Removes %s status from you or the specified nick on a channel"), m.second.c_str()); + return Anope::printf(Language::Translate(source.GetAccount(), _("Removes %s status from you or the specified nick on a channel")), m.second.c_str()); } else return ""; diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 2998a850a..228a593be 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -1303,13 +1303,13 @@ class CSSet : public Module if (peace.HasExt(ci)) info.AddOption(_("Peace")); if (restricted.HasExt(ci)) - info.AddOption(_("Restricted Access")); + info.AddOption(_("Restricted access")); if (secure.HasExt(ci)) info.AddOption(_("Security")); if (securefounder.HasExt(ci)) - info.AddOption(_("Secure Founder")); + info.AddOption(_("Secure founder")); if (secureops.HasExt(ci)) - info.AddOption(_("Secure Ops")); + info.AddOption(_("Secure ops")); if (signkick.HasExt(ci) || signkick_level.HasExt(ci)) info.AddOption(_("Signed kicks")); if (persist.HasExt(ci)) @@ -1318,10 +1318,12 @@ class CSSet : public Module info.AddOption(_("No expire")); if (keep_modes.HasExt(ci)) info.AddOption(_("Keep modes")); + if (noautoop.HasExt(ci)) + info.AddOption(_("No auto-op")); time_t chanserv_expire = Config->GetModule(this)->Get<time_t>("expire", "14d"); if (!noexpire.HasExt(ci) && chanserv_expire && !Anope::NoExpire) - info["Expires on"] = Anope::strftime(ci->last_used + chanserv_expire); + info[_("Expires")] = Anope::strftime(ci->last_used + chanserv_expire, source.GetAccount()); } }; diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index bc122d048..ca2fd0893 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -94,7 +94,7 @@ class CommandCSSuspend : public Command if (ci->HasExt("CS_SUSPENDED")) { - source.Reply(_("\2%s\2 is already suspended."), ci->name.c_str()); + source.Reply(_("\002%s\002 is already suspended."), ci->name.c_str()); return; } @@ -213,15 +213,15 @@ class CSSuspend : public Module CSSuspendInfo *si = suspend.Get(ci); if (si) { - info["Suspended"] = "This channel is \2suspended\2."; + info[_("Suspended")] = _("This channel is \002suspended\002."); if (!si->by.empty()) - info["Suspended by"] = si->by; + info[_("Suspended by")] = si->by; if (!si->reason.empty()) - info["Suspend reason"] = si->reason; + info[_("Suspend reason")] = si->reason; if (si->time) - info["Suspended on"] = Anope::strftime(si->time, source.GetAccount(), true); + info[_("Suspended on")] = Anope::strftime(si->time, source.GetAccount(), true); if (si->expires) - info["Suspended expires"] = Anope::strftime(si->expires, source.GetAccount(), true); + info[_("Suspension expires")] = Anope::strftime(si->expires, source.GetAccount(), true); } } diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp index 95c83f154..cb015e94a 100644 --- a/modules/commands/cs_topic.cpp +++ b/modules/commands/cs_topic.cpp @@ -248,16 +248,16 @@ class CSTopic : public Module void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool show_all) anope_override { if (keeptopic.HasExt(ci)) - info.AddOption(_("Topic Retention")); + info.AddOption(_("Topic retention")); if (topiclock.HasExt(ci)) - info.AddOption(_("Topic Lock")); + info.AddOption(_("Topic lock")); ModeLocks *ml = ci->GetExt<ModeLocks>("modelocks"); const ModeLock *secret = ml ? ml->GetMLock("SECRET") : NULL; if (!ci->last_topic.empty() && (show_all || ((!secret || secret->set == false) && (!ci->c || !ci->c->HasMode("SECRET"))))) { - info["Last topic"] = ci->last_topic; - info["Topic set by"] = ci->last_topic_setter; + info[_("Last topic")] = ci->last_topic; + info[_("Topic set by")] = ci->last_topic_setter; } } }; diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 0b404ea6a..67ce6898d 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -379,7 +379,7 @@ class CommandCSXOP : public Command } ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Mask"); + list.AddColumn(_("Number")).AddColumn(_("Mask")); if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { @@ -483,15 +483,15 @@ class CommandCSXOP : public Command public: CommandCSXOP(Module *modname) : Command(modname, "chanserv/xop", 2, 4) { - this->SetSyntax("\037channel\037 ADD \037mask\037"); - this->SetSyntax("\037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}"); - this->SetSyntax("\037channel\037 LIST [\037mask\037 | \037list\037]"); - this->SetSyntax("\037channel\037 CLEAR"); + this->SetSyntax(_("\037channel\037 ADD \037mask\037")); + this->SetSyntax(_("\037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}")); + this->SetSyntax(_("\037channel\037 LIST [\037mask\037 | \037list\037]")); + this->SetSyntax(_("\037channel\037 CLEAR")); } const Anope::string GetDesc(CommandSource &source) const anope_override { - return Anope::printf(_("Modify the list of %s users"), source.command.upper().c_str()); + return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str()); } void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -524,7 +524,7 @@ class CommandCSXOP : public Command this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Maintains the \2%s list\2 for a channel. Users who match an access entry\n" + source.Reply(_("Maintains the \002%s list\002 for a channel. Users who match an access entry\n" "on the %s list receive the following privileges:\n" " "), cmd.c_str(), cmd.c_str()); diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp index e0b2b8834..5e7b4beb8 100644 --- a/modules/commands/hs_list.cpp +++ b/modules/commands/hs_list.cpp @@ -55,7 +55,7 @@ class CommandHSList : public Command unsigned display_counter = 0, listmax = Config->GetModule(this->owner)->Get<unsigned>("listmax", "50"); ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Nick").AddColumn("Vhost").AddColumn("Creator").AddColumn("Created"); + list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("Vhost")).AddColumn(_("Creator")).AddColumn(_("Created")); for (nickalias_map::const_iterator it = NickAliasList->begin(), it_end = NickAliasList->end(); it != it_end; ++it) { @@ -78,7 +78,7 @@ class CommandHSList : public Command else entry["Vhost"] = na->GetVhostHost(); entry["Creator"] = na->GetVhostCreator(); - entry["Created"] = Anope::strftime(na->GetVhostCreated()); + entry["Created"] = Anope::strftime(na->GetVhostCreated(), source.GetAccount()); list.AddEntry(entry); } } @@ -99,7 +99,7 @@ class CommandHSList : public Command else entry["Vhost"] = na->GetVhostHost(); entry["Creator"] = na->GetVhostCreator(); - entry["Created"] = Anope::strftime(na->GetVhostCreated()); + entry["Created"] = Anope::strftime(na->GetVhostCreated(), source.GetAccount()); list.AddEntry(entry); } } diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index 36e12505d..3b3865c41 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -297,7 +297,7 @@ class CommandHSWaiting : public Command unsigned display_counter = 0, listmax = Config->GetModule(this->owner)->Get<unsigned>("listmax"); ListFormatter list(source.GetAccount()); - list.AddColumn("Number").AddColumn("Nick").AddColumn("Vhost").AddColumn("Created"); + list.AddColumn(_("Number")).AddColumn(_("Nick")).AddColumn(_("Vhost")).AddColumn(_("Created")); for (nickalias_map::const_iterator it = NickAliasList->begin(), it_end = NickAliasList->end(); it != it_end; ++it) { @@ -317,7 +317,7 @@ class CommandHSWaiting : public Command entry["Vhost"] = hr->ident + "@" + hr->host; else entry["Vhost"] = hr->host; - entry["Created"] = Anope::strftime(hr->time); + entry["Created"] = Anope::strftime(hr->time, source.GetAccount()); list.AddEntry(entry); } ++counter; @@ -329,7 +329,7 @@ class CommandHSWaiting : public Command for (unsigned i = 0; i < replies.size(); ++i) source.Reply(replies[i]); - source.Reply(_("Displayed \2%d\2 records (\2%d\2 total)."), display_counter, counter); + source.Reply(_("Displayed \002%d\002 records (\002%d\002 total)."), display_counter, counter); } bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp index 452a0f337..a6d72c376 100644 --- a/modules/commands/ms_check.cpp +++ b/modules/commands/ms_check.cpp @@ -46,9 +46,9 @@ class CommandMSCheck : public Command found = true; /* Yes, we've found the memo */ if (mi->GetMemo(i)->unread) - source.Reply(_("The last memo you sent to %s (sent on %s) has not yet been read."), na->nick.c_str(), Anope::strftime(mi->GetMemo(i)->time).c_str()); + source.Reply(_("The last memo you sent to %s (sent on %s) has not yet been read."), na->nick.c_str(), Anope::strftime(mi->GetMemo(i)->time, source.GetAccount()).c_str()); |