git ssb

30+

cel / git-ssb-web



Commit a2849b8cb3da0e9380f59225307ae4c89438ba1b

Improve feed rendering of posts that affect issues

Charles Lehner committed on 4/24/2016, 3:23:12 AM
Parent: cbaa9d67bdc3ff77eb179a880b36532cdcbffa7f

Files changed

index.jschanged
locale/en.jsonchanged
locale/eo.jsonchanged
index.jsView
@@ -620,14 +620,17 @@
620620 return this.pullReqs.get(c.issue, function (err, pr) {
621621 if (err) return cb(err)
622622 var type = pr.msg.value.content.type == 'pull-request' ?
623623 'pull request' : 'issue.'
624 + var changed = self.issues.isStatusChanged(msg, pr)
624625 return cb(null, '<section class="collapse">' + msgLink + '<br>' +
625- req._t('CommentedOn', {
626- author: authorLink,
627- target: req._t(type) + ' ' + u.link([pr.id], pr.title, true)
626 + req._t(changed == null ? 'CommentedOn' :
627 + changed ? 'ReopenedIssue' : 'ClosedIssue', {
628 + name: authorLink,
629 + type: req._t(type),
630 + title: u.link([pr.id], pr.title, true)
628631 }) +
629- '<blockquote>' + markdown(c.text) + '</blockquote>' +
632 + (c.text ? '<blockquote>' + markdown(c.text) + '</blockquote>' : '') +
630633 '</section>')
631634 })
632635 default:
633636 return cb(null, u.json(msg))
locale/en.jsonView
@@ -26,10 +26,12 @@
2626 "Forked": "%{name} forked %{upstream} to %{repo}",
2727 "CreatedRepo": "%{name} created repo %{repo}",
2828 "Pushed": "%{name} pushed to %{repo}",
2929 "OpenedIssue": "%{name} opened %{type} %{title} on %{project}",
30 + "ReopenedIssue": "%{name} reopened %{type} %{title}",
31 + "ClosedIssue": "%{name} closed %{type} %{title}",
3032 "Named": "%{author} named %{target} %{name}",
31- "CommentedOn": "%{author} commented on %{target}",
33 + "CommentedOn": "%{name} commented on %{type} %{title}",
3234 "Activity": "Activity",
3335 "Repos": "Repos",
3436 "UsersRepos": "%{name}'s repos",
3537 "UpdatedOnDate": "Updated %{date}",
locale/eo.jsonView
@@ -26,10 +26,12 @@
2626 "Forked": "%{name} forkis %{upstream} al %{repo}",
2727 "CreatedRepo": "%{name} kreis deponejon %{repo}",
2828 "Pushed": "%{name} puŝis al %{repo}",
2929 "OpenedIssue": "%{name} malfermiĝis %{type} %{title} sur %{project}",
30 + "ReopenedIssue": "%{name} remalfermis %{type} %{title}",
31 + "ClosedIssue": "%{name} fermiĝis %{type} %{title}",
3032 "Named": "%{author} nomis %{target} %{name}",
31- "CommentedOn": "%{author} komentis %{target}",
33 + "CommentedOn": "%{name} komentis %{type} %{title}",
3234 "Activity": "Aktivaĵo",
3335 "Repos": "Deponejoj",
3436 "UsersRepos": "Deponejoj de %{name}",
3537 "UpdatedOnDate": "Ĝisdatigis je %{date}",

Built with git-ssb-web