trivia - minor updates

diff --git a/modules/trivia.py b/modules/trivia.py
index cb4b407bec7e718a66827de48344ade33b518522..dfa0b7dc5d93566e49c2ccd713839e2eaf365665 100644 (file)
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -858,8 +858,8 @@ def num_TOPIC(bot, textline):
                        "%s (%s)" % (person(x), pts(x))
                        for x in range(3) if x < len(state.db['ranks'])
                ]),
-               'top3c': ' '.join([
-                       "%s (%s, %s)" % (person(x), pts(x), country(x))
+               'top3c': ', '.join([
+                       "%s (%s) %s" % (person(x), country(x), pts(x))
                        for x in range(3) if x < len(state.db['ranks'])
                ]),
                'top10': ' '.join([
@@ -890,6 +890,7 @@ def specialQuestion(oldq):
                randnum2 = random.randrange(0, 11)
                newq[0] = "What is %d + %d?" % (randnum1, randnum2)
                newq[1] = spellout(randnum1+randnum2)
+       else: pass #default to not modifying
        return newq
 
 def spellout(num):