summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/feeds/build-feed.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/admin/feeds/build-feed.py b/admin/feeds/build-feed.py
index e835ad7..e010b63 100755
--- a/admin/feeds/build-feed.py
+++ b/admin/feeds/build-feed.py
@@ -70,10 +70,12 @@ def join(sequence, joiner_factory):
result.append(item)
if i == len(sequence):
- return result
+ break
result.append(joiner_factory())
+ return result
+
def cdata_concert(concert, lang):
formatters = DATE_FORMATTERS[lang]
@@ -89,13 +91,15 @@ def cdata_concert(concert, lang):
E.p(formatters['time'](concert.time)),
))
+ pieces = touchup_plaintext(concert.pieces)
+ instructions = touchup_plaintext(concert.instructions)
+
blocks.extend((
E.p(*join(concert.address.splitlines(), E.br)),
E.ol(
- *(XML(f'<li>{touchup_plaintext(p)}</li>')
- for p in concert.pieces.splitlines())
+ *(XML(f'<li>{line}</li>') for line in pieces.splitlines())
),
- *(E.p(line) for line in concert.instructions.splitlines()),
+ *(XML(f'<p>{line}</p>') for line in instructions.splitlines()),
))
# Do a silly dance to indent CDATA correctly.