From c6a045730ca0cf1ee484110a0dcc34173ce97690 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 28 Oct 2013 00:50:35 +0100
Subject: Mention news article authors

Mention the names of news articles authors, as we did on the old web
site.

diff --git a/web/input/news/domain-transfer.md b/web/input/news/domain-transfer.md
index d206040..b30f817 100644
--- a/web/input/news/domain-transfer.md
+++ b/web/input/news/domain-transfer.md
@@ -1,4 +1,5 @@
 title: Domain Name Transfer
+author: Ton Voon
 date: 2011-09-25
 ---
 
diff --git a/web/input/news/release-1-4-15.md b/web/input/news/release-1-4-15.md
index 16ba4e3..e0af748 100644
--- a/web/input/news/release-1-4-15.md
+++ b/web/input/news/release-1-4-15.md
@@ -1,4 +1,5 @@
 title: Version 1.4.15 Released
+author: Ton Voon
 date: 2010-07-27
 ---
 
diff --git a/web/input/news/release-1-4-16.md b/web/input/news/release-1-4-16.md
index 65cda74..988786a 100644
--- a/web/input/news/release-1-4-16.md
+++ b/web/input/news/release-1-4-16.md
@@ -1,4 +1,5 @@
 title: Version 1.4.16 Released
+author: Holger Weiß
 date: 2013-06-27
 ---
 
diff --git a/web/input/news/release-1-5.md b/web/input/news/release-1-5.md
index ed70d8c..6eef24e 100644
--- a/web/input/news/release-1-5.md
+++ b/web/input/news/release-1-5.md
@@ -1,4 +1,5 @@
 title: Version 1.5 Released
+author: Holger Weiß
 date: 2013-10-02
 ---
 
diff --git a/web/input/news/ton-voon-resigns.md b/web/input/news/ton-voon-resigns.md
index 32351df..7130c55 100644
--- a/web/input/news/ton-voon-resigns.md
+++ b/web/input/news/ton-voon-resigns.md
@@ -1,4 +1,5 @@
 title: Ton Voon Resigns as Team Leader
+author: Ton Voon
 date: 2011-11-04
 ---
 
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
-- 
cgit v0.10-9-g596f