X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/2b931d7a9cd2782246bb739bcff66e230bb706bd..012083841930091acb27446ad0c8a320b5f6fecf:/pokedex/db/tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 5e7e99b..6afe000 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -500,7 +500,7 @@ create_translation_table('item_names', Item, 'names',
         info=dict(description="The name", format='plaintext', official=True, ripped=True)),
 )
 create_translation_table('item_prose', Item, 'prose',
-    short_effect = Column(Unicode(256), nullable=False,
+    short_effect = Column(markdown.MarkdownColumn(256), nullable=False,
         info=dict(description="A short summary of the effect", format='plaintext')),
     effect = Column(markdown.MarkdownColumn(5120), nullable=False,
         info=dict(description=u"Detailed description of the item's effect.", format='markdown')),
@@ -1150,7 +1150,7 @@ class Pokemon(TableBase):
         u"""Returns the Pokémon's name, including its form if applicable."""
 
         if self.form_name:
-            return u'{0} {1}'.format(self.form_name, self.name)
+            return u'%s %s' % (self.form_name, self.name)
         else:
             return self.name
 
@@ -1354,7 +1354,7 @@ class PokemonForm(TableBase):
         if not self.name:
             return None
         elif self.form_group and self.form_group.term:
-            return u'{0} {1}'.format(self.name, self.form_group.term)
+            return u'%s %s' % (self.name, self.form_group.term)
         else:
             return self.name
 
@@ -1365,7 +1365,7 @@ class PokemonForm(TableBase):
         """
 
         if self.name:
-            return u'{0} {1}'.format(self.name, self.form_base_pokemon.name)
+            return u'%s %s' % (self.name, self.form_base_pokemon.name)
         else:
             return self.form_base_pokemon.name