From 19867ddfcdd3f455ec919064d588e86addf8995d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 8 Mar 2015 11:20:05 +0100
Subject: [PATCH] Fixed some formatting to make untittests pass again.

---
 evennia/commands/cmdsethandler.py | 2 +-
 evennia/server/sessionhandler.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/cmdsethandler.py b/evennia/commands/cmdsethandler.py
index fc501fe9f1..9104ce950b 100644
--- a/evennia/commands/cmdsethandler.py
+++ b/evennia/commands/cmdsethandler.py
@@ -229,7 +229,7 @@ class CmdSetHandler(object):
             permstring = "non-perm"
             if self.current.permanent:
                 permstring = "perm"
-            tmpstring = _(" <{key} ({mergetype} prio {prio}, {permstring}>: {keylist}")
+            tmpstring = _(" <{key} ({mergetype}, prio {prio}, {permstring})>:\n {keylist}")
             string += tmpstring.format(key=self.current.key, mergetype=mergetype,
                                        prio=self.current.priority,
                                        permstring=permstring,
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 8809998687..64a4291810 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -328,7 +328,7 @@ class ServerSessionHandler(SessionHandler):
                                                          operation=SSYNC,
                                                          data=sessdata)
 
-    def disconnect_all_sessions(self, reason=_("You have been disconnected.")):
+    def disconnect_all_sessions(self, reason="You have been disconnected."):
         """
         Cleanly disconnect all of the connected sessions.
         """