Mostly working language string rewrite with new format strings

1 files changed, 7 insertions, 8 deletions

diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp
index a23fd26d2..70f2171af 100644
--- a/modules/commands/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
@@ -31,9 +31,9 @@ class CommandNSLogout : public Command
 		if (!source.IsServicesOper() && !nick.empty())
 			this->OnSyntaxError(source, "");
 		else if (!(u2 = (!nick.empty() ? User::Find(nick, true) : source.GetUser())))
-			source.Reply(NICK_X_NOT_IN_USE, !nick.empty() ? nick.c_str() : source.GetNick().c_str());
+			source.Reply(_("\002{0}\002 isn't currently online."), !nick.empty() ? nick : source.GetNick());
 		else if (!nick.empty() && u2->IsServicesOper())
-			source.Reply(_("You can't logout %s, they are a Services Operator."), nick.c_str());
+			source.Reply(_("You can't logout \002{0}\002, they are a Services Operator."), nick);
 		else
 		{
 			if (!nick.empty() && !param.empty() && param.equals_ci("REVALIDATE") && NickServ::service)
@@ -42,11 +42,10 @@ class CommandNSLogout : public Command
 			u2->super_admin = false; /* Dont let people logout and remain a SuperAdmin */
 			Log(LOG_COMMAND, source, this) << "to logout " << u2->nick;
 
-			/* Remove founder status from this user in all channels */
 			if (!nick.empty())
-				source.Reply(_("Nick %s has been logged out."), nick.c_str());
+				source.Reply(_("\002{0}\002 has been logged out."), nick);
 			else
-				source.Reply(_("Your nick has been logged out."));
+				source.Reply(_("You have been logged out."));
 
 			IRCD->SendLogout(u2);
 			u2->RemoveMode(source.service, "REGISTERED");
@@ -55,13 +54,12 @@ class CommandNSLogout : public Command
 			/* Send out an event */
 			Event::OnNickLogout(&Event::NickLogout::OnNickLogout, u2);
 		}
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
 	{
-		this->SendSyntax(source);
-		source.Reply(" ");
+		source.Reply(_("Logs you out of your account"));
+		#if 0
 		source.Reply(_("Without a parameter, reverses the effect of the \002IDENTIFY\002\n"
 				"command, i.e. make you not recognized as the real owner of the nick\n"
 				"anymore. Note, however, that you won't be asked to reidentify\n"
@@ -70,6 +68,7 @@ class CommandNSLogout : public Command
 				"With a parameter, does the same for the given nick. If you\n"
 				"specify \002REVALIDATE\002 as well, Services will ask the given nick\n"
 				"to re-identify. This is limited to \002Services Operators\002."));
+		#endif
 
 		return true;
 	}