Revert "Renamed de-accented item names in the db."

[zzz-pokedex.git] / pokedex / __init__.py

diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 4af3fa0..ccffaf2 100644 (file)
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -66,8 +66,17 @@ def command_lookup(name):
     else:
         print "Fuzzy-matched:"
 
     else:
         print "Fuzzy-matched:"
 

-    for object, language, exact in results:
-        print object.__tablename__, object.name, language
+    for result in results:
+        if hasattr(result.object, 'full_name'):
+            name = result.object.full_name
+        else:
+            name = result.object.name
+
+        print "%s: %s" % (result.object.__tablename__, name),
+        if result.language:
+            print "(%s in %s)" % (result.name, result.language)
+        else:
+            print

 
 
 def command_help():
 
 
 def command_help():