1 files changed, 4 insertions, 3 deletions

diff --git a/web/macros.py b/web/macros.py
index 309e0b4..05dcf5a 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -107,14 +107,15 @@ def make_news_page(posts, current_index):
         teaser = ['# ' + title]
     for p in posts:
         source = list()
+        author = p.author.encode('ascii', 'xmlcharrefreplace')
         timestamp = time.strptime(p.date, '%Y-%m-%d')
-        date = time.strftime('%A, %B %-e, %Y', timestamp)
+        author_date = author + ', ' + time.strftime('%B %-e, %Y', timestamp)
         teaser.append('## %s' % p.title)
-        teaser.append('*%s*' % date)
+        teaser.append('*%s*' % author_date)
         teaser.append('%s' % p.source.split(marker, 1)[0].rstrip())
         teaser.append('<a href="%s">Read&nbsp;more&nbsp;&raquo;</a>' % p.url)
         source.append('# %s' % p.title)
-        source.append('*%s*' % date)
+        source.append('*%s*' % author_date)
         source.append(p.source.replace(marker, '', 1))
         p.source = '\n'.join(source)
         p['parent'] = title