diff options
| author | Robby- <robby@chat.be> | 2013-09-28 20:44:57 +0200 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-09-29 15:42:22 -0400 |
| commit | 2a5e8f1890ecc3a390d814cf24cbc9451a938840 (patch) | |
| tree | 36a72a17a03a6c0dfb842abd97bca087ce84d88d /modules/commands/os_forbid.cpp | |
| parent | a04c320b4b34f67eba0d1d304dfb0e2df453f1d3 (diff) | |
cs_akick: Make the default autokick reason translatable.
os_forbid: It is required to specify a reason.
Diffstat (limited to 'modules/commands/os_forbid.cpp')
| -rw-r--r-- | modules/commands/os_forbid.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index 0e8c34e78..485f66ee7 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -92,7 +92,7 @@ class CommandOSForbid : public Command CommandOSForbid(Module *creator) : Command(creator, "operserv/forbid", 1, 5), fs("ForbidService", "forbid") { this->SetDesc(_("Forbid usage of nicknames, channels, and emails")); - this->SetSyntax(_("ADD {NICK|CHAN|EMAIL|REGISTER} [+\037expiry\037] \037entry\037 [\037reason\037]")); + this->SetSyntax(_("ADD {NICK|CHAN|EMAIL|REGISTER} [+\037expiry\037] \037entry\037 \037reason\037")); this->SetSyntax(_("DEL {NICK|CHAN|EMAIL|REGISTER} \037entry\037")); this->SetSyntax("LIST [NICK|CHAN|EMAIL|REGISTER]"); } @@ -236,10 +236,7 @@ class CommandOSForbid : public Command if (u->server == Me || u->HasMode("OPER")) continue; - if (d->reason.empty()) - reason = Language::Translate(u, _("This channel has been forbidden.")); - else - reason = Anope::printf(Language::Translate(u, _("This channel has been forbidden: %s")), d->reason.c_str()); + reason = Anope::printf(Language::Translate(u, _("This channel has been forbidden: %s")), d->reason.c_str()); c->Kick(source.service, u, "%s", reason.c_str()); } @@ -400,10 +397,7 @@ class OSForbid : public Module BotInfo *OperServ = Config->GetClient("OperServ"); if (OperServ) { - if (d->reason.empty()) - u->SendMessage(OperServ, _("This nickname has been forbidden.")); - else - u->SendMessage(OperServ, _("This nickname has been forbidden: %s"), d->reason.c_str()); + u->SendMessage(OperServ, _("This nickname has been forbidden: %s"), d->reason.c_str()); } if (nickserv) nickserv->Collide(u, NULL); @@ -431,10 +425,7 @@ class OSForbid : public Module chanserv->Hold(c); } - if (d->reason.empty()) - reason = Language::Translate(u, _("This channel has been forbidden.")); - else - reason = Anope::printf(Language::Translate(u, _("This channel has been forbidden: %s")), d->reason.c_str()); + reason = Anope::printf(Language::Translate(u, _("This channel has been forbidden: %s")), d->reason.c_str()); return EVENT_STOP; } |