From e6c36830c4af4d9a8ea2e0bec8fd2198f1820d0a Mon Sep 17 00:00:00 2001
From: skizzerz <skizzerz@skizzerz.net>
Date: Wed, 11 Nov 2015 13:08:50 -0600
Subject: [PATCH] Fix formatting issues and fgame

---
 src/messages.py | 14 +++++++-------
 src/wolfgame.py |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/messages.py b/src/messages.py
index 2a42044..7bb2a7c 100644
--- a/src/messages.py
+++ b/src/messages.py
@@ -1,12 +1,15 @@
 import json
 import os
+
 import src.settings as var
 
+MESSAGES_DIR = os.path.join(os.path.dirname(__file__), "..", "messages")
+ROOT_DIR = os.path.join(os.path.dirname(__file__), "..")
+
 class Messages:
     def __init__ (self):
         self.lang = var.LANGUAGE
         self._load_messages()
-        # some stuff
 
     def get(self, key):
         if not self.messages[key.lower()]:
@@ -16,14 +19,12 @@ class Messages:
     __getitem__ = get
 
     def _load_messages(self):
-        MESSAGES_DIR = os.path.join(os.path.dirname(__file__), '..', 'messages')
-        ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
-        with open(os.path.join(MESSAGES_DIR, self.lang + '.json')) as f:
+        with open(os.path.join(MESSAGES_DIR, self.lang + ".json")) as f:
             self.messages = json.load(f)
 
-        if not os.path.isfile(os.path.join(ROOT_DIR, 'messages.json')):
+        if not os.path.isfile(os.path.join(ROOT_DIR, "messages.json")):
             return
-        with open(os.path.join(ROOT_DIR, 'messages.json')) as f:
+        with open(os.path.join(ROOT_DIR, "messages.json")) as f:
             custom_msgs = json.load(f)
 
         if not custom_msgs:
@@ -33,7 +34,6 @@ class Messages:
             if key in self.messages:
                 if not isinstance(message, type(self.messages[key.lower()])):
                     raise TypeError("messages.json: Key {0!r} must be of type {1!r}".format(key, type(self.messages[key.lower()]).__name__))
-
             self.messages[key.lower()] = message
 
 messages = Messages()
diff --git a/src/wolfgame.py b/src/wolfgame.py
index abd44e5..c043996 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -8975,7 +8975,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
                 parts[0] = gamemode
 
             if cgamemode(cli, "=".join(parts)):
-                cli.msg(chan, ('fgame_success').format(nick))
+                cli.msg(chan, messages["fgame_success"].format(nick))
                 var.FGAMED = True
         else:
             cli.notice(nick, fgame.__doc__())