Merge pull request #2615 from whowillcare/master

Time line is missing delete/edit comments

client/components/activities/activities.jade

@@ -201,6 +201,7 @@ template(name="cardActivities")
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklistItem.title
+        
         if(currentData.timeKey)
           | {{{_ activityType }}}
           = ' '
@@ -215,6 +216,10 @@ template(name="cardActivities")
           | {{{_ activityType currentData.timeValue}}}
         
 
+        if($eq activityType 'deleteComment')
+          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+        if($eq activityType 'editComment')
+          | {{{_ 'activity-editComment' currentData.commentId}}}.
         if($eq activityType 'addComment')
           +inlinedForm(classNames='js-edit-comment')
             +editor(autofocus=true)

i18n/en.i18n.json

@@ -73,6 +73,8 @@
   "activity-unchecked-item-card": "unchecked %s in checklist %s",
   "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+  "activity-editComment": "edited comment %s",
+  "activity-deleteComment": "deleted comment %s",
   "add-attachment": "Add Attachment",
   "add-board": "Add Board",
   "add-card": "Add Card",

server/notifications/email.js

@@ -13,9 +13,9 @@ Meteor.startup(() => {
     const lan = user.getLanguage();
     const subject = TAPi18n.__(title, params, lan); // the original function has a fault, i believe the title should be used according to original author
     const existing = user.getEmailBuffer().length > 0;
-    const text = `${existing ? `\n${subject}\n` : ''}${
+    const text = `${existing ? `<br/>\n${subject}<br/>\n` : ''}${
       params.user
-    } ${TAPi18n.__(description, quoteParams, lan)}\n${params.url}`;
+    } ${TAPi18n.__(description, quoteParams, lan)}<br/>\n${params.url}`;
 
     user.addEmailBuffer(text);