Eliminate text concatenation. (Patch by Eero, kiitos.)

* src/plugins/NarrativeWeb.py


svn: r10569

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
+        if date and place:
-        # back to what it was. (Sorry, I (keestux) messed up.)
+            text = _("(%(date) s   at    %(place)s") % { 'date': date, 'place': place }
+        elif place:
+            text = _("at    %(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())