1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Merge remote-tracking branch 'origin/encounters-i18n'

Conflicts:
	pokedex/db/__init__.py
This commit is contained in:
Eevee 2011-04-05 22:32:51 -07:00
commit 905f5b3d13
27 changed files with 12048 additions and 437 deletions
pokedex/db

View file

@ -31,11 +31,17 @@ class MarkdownString(object):
def __unicode__(self):
return self.source_text
def __str__(self):
return unicode(self.source_text).encode()
def __html__(self):
return self.as_html
@property
def as_html(self):
"""Returns the string as HTML4."""
if self._as_html:
if self._as_html is not None:
return self._as_html
md = markdown.Markdown(