diff options
Diffstat (limited to 'modules/commands/ns_group.cpp')
| -rw-r--r-- | modules/commands/ns_group.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index 62620f7c4..7a67337f9 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -138,12 +138,14 @@ class CommandNSGroup : public Command Log(LOG_COMMAND, source, this) << "and tried to group to suspended nick " << target->nick; source.Reply(_("\002{0}\002 is suspended."), target->nick); } + else if (na && Config->GetModule(this->owner)->Get<bool>("nogroupchange")) + source.Reply(_("Your nick is already registered.")); else if (na && *target->nc == *na->nc) source.Reply(_("You are already a member of the group of \002{0}\002."), target->nick); else if (na && na->nc != u->Account()) source.Reply(_("\002{0}\002 is already registered."), na->nick); else if (na && Config->GetModule(this->owner)->Get<bool>("nogroupchange")) - source.Reply(_("Your nick is already registered.")); + source.Reply(_("You are already registered.")); else if (maxaliases && target->nc->aliases->size() >= maxaliases && !target->nc->IsServicesOper()) source.Reply(_("There are too many nicknames in your group.")); else if (u->nick.length() <= guestnick.length() + 7 && @@ -155,7 +157,7 @@ class CommandNSGroup : public Command else { bool ok = false; - if (!na && u->Account()) + if (!na && u->Account() == target->nc) ok = true; NSCertList *cl = target->nc->GetExt<NSCertList>("certificates"); @@ -290,7 +292,7 @@ class CommandNSGList : public Command Anope::string expires; if (na2->HasExt("NS_NO_EXPIRE")) - expires = "Does not expire"; + expires = _("Does not expire"); else if (!nickserv_expire || Anope::NoExpire) ; else if (na2->nc->HasExt("UNCONFIRMED") && unconfirmed_expire) |