From 2b324203e7701ac1dd83e9879de2543e348f1499 Mon Sep 17 00:00:00 2001
From: James Lu <glolol1@hotmail.com>
Date: Tue, 9 Dec 2014 18:32:31 -0800
Subject: [PATCH] Network: changes to the 'whois' output formatting

---
 plugins/Network/plugin.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/Network/plugin.py b/plugins/Network/plugin.py
index 8fd6f6115..702414ff3 100644
--- a/plugins/Network/plugin.py
+++ b/plugins/Network/plugin.py
@@ -211,13 +211,13 @@ class Network(callbacks.Plugin):
                 # The user is in a channel the bot is in, so the ircd may have
                 # responded with otherwise private data.
                 if chan:
-                    # Skip channels the callee isn't in.  This helps prevents
-                    # us leaking information when the channel is +s or the
-                    # target is +i
+                    # Skip channels the callee isn't in.  This prevents
+                    # us from leaking information when the channel is +s or the
+                    # target is +i.
                     if replyMsg.nick not in chan.users:
                         continue
                     # Skip +s channels the target is in only if the reply isn't
-                    # being sent to that channel
+                    # being sent to that channel.
                     if 's' in chan.modes and \
                        not ircutils.strEqual(replyMsg.args[0], channel):
                         continue
@@ -243,7 +243,8 @@ class Network(callbacks.Plugin):
                     L.append(format(_('is on %L'), normal))
         else:
             if command == 'whois':
-                L = [_('isn\'t on any non-secret channels or has channel list hiding umode')]
+                L = [_('isn\'t on any non-secret channels or is using a '
+                    'channel-list hiding umode.')]
             else:
                 L = []
         channels = format('%L', L)
@@ -272,11 +273,11 @@ class Network(callbacks.Plugin):
         else:
             identify = ''
         if command == 'whois':
-            s = _('%s (%s) has been%s on server %s since %s (idle for %s) and '
+            s = _('%s (%s) has been%s on server %s since %s (idle for %s). %s '
                 '%s.%s') % (user, hostmask, identify, server,
-                        signon, idle, channels, away)
+                        signon, idle, nick, channels, away)
         else:
-            s = _('%s (%s) has been%s on server %s and disconnect on %s.') % \
+            s = _('%s (%s) has been%s on server %s and disconnected on %s.') % \
                     (user, hostmask, identify, server, signoff)
         replyIrc.reply(s)
         del self._whois[(irc, loweredNick)]