From 75b1a77e9901b9422522469c58f759481f6697a9 Mon Sep 17 00:00:00 2001
From: Kees Bakker <kees.bakker@xs4all.nl>
Date: Wed, 16 Apr 2008 14:46:48 +0000
Subject: [PATCH] Eliminate text concatenation. (Patch by Eero, kiitos.) 
 * src/plugins/NarrativeWeb.py

svn: r10569
---
 src/plugins/NarrativeWeb.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py
index 940db0062..a1b133d6b 100644
--- a/src/plugins/NarrativeWeb.py
+++ b/src/plugins/NarrativeWeb.py
@@ -2313,19 +2313,18 @@ class IndividualPage(BasePage):
 
         date = _dd.display(event.get_date_object())
 
-        # TODO. This logic does not work for LTR languages. We should go
-        # back to what it was. (Sorry, I (keestux) messed up.)
-        text = ''
+        if date and place:
+            text = _("(%(date) s&nbsp;&nbsp; at &nbsp;&nbsp; %(place)s") % { 'date': date, 'place': place }
+        elif place:
+            text = _("at &nbsp;&nbsp; %(place)s") % { 'place': place }
+        elif date:
+            text = date
+        else:
+            text = ''
         if descr:
+            if text:
+                text += "<br />"
             text += descr
-        if date:
-            if text:
-                text += ',&nbsp;&nbsp;'
-            text += date
-        if place:
-            if text:
-                text += '&nbsp;&nbsp;'
-            text += _('place|at') + '&nbsp;&nbsp;' + place
 
         text += self.get_citation_links(event.get_source_references())