From: Petr Viktorin Date: Sun, 13 Mar 2011 13:42:50 +0000 (+0200) Subject: Rename StatHint.text to .message (clashed with the all-texts attribute) X-Git-Tag: veekun-promotions/2011041101~35^2~3 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/cc7913d7554e80c9999b65841ea3af16d5e18dae?ds=sidebyside Rename StatHint.text to .message (clashed with the all-texts attribute) --- diff --git a/pokedex/data/csv/stat_hint_texts.csv b/pokedex/data/csv/stat_hint_texts.csv index c3551a5..36acada 100644 --- a/pokedex/data/csv/stat_hint_texts.csv +++ b/pokedex/data/csv/stat_hint_texts.csv @@ -1,4 +1,4 @@ -stat_hint_id,language_id,text +stat_hint_id,language_id,message 1,9,Loves to eat 2,9,Proud of its power 3,9,Sturdy body diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 0750d3e..5615fc6 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1365,7 +1365,7 @@ class StatHint(TableBase): info=dict(description=u"ID of the highest stat")) gene_mod_5 = Column(Integer, nullable=False, index=True, info=dict(description=u"Value of the highest stat modulo 5")) - text = TextColumn(Unicode(24), plural='texts', nullable=False, index=True, unique=True, + message = TextColumn(Unicode(24), plural='messages', nullable=False, index=True, unique=True, info=dict(description=u"The text displayed", official=True, format='plaintext')) class SuperContestCombo(TableBase):