Commit a2849b8cb3da0e9380f59225307ae4c89438ba1b
Improve feed rendering of posts that affect issues
Charles Lehner committed on 4/24/2016, 3:23:12 AMParent: cbaa9d67bdc3ff77eb179a880b36532cdcbffa7f
Files changed
index.js | changed |
locale/en.json | changed |
locale/eo.json | changed |
index.js | ||
---|---|---|
@@ -620,14 +620,17 @@ | ||
620 | 620 … | return this.pullReqs.get(c.issue, function (err, pr) { |
621 | 621 … | if (err) return cb(err) |
622 | 622 … | var type = pr.msg.value.content.type == 'pull-request' ? |
623 | 623 … | 'pull request' : 'issue.' |
624 … | + var changed = self.issues.isStatusChanged(msg, pr) | |
624 | 625 … | 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) | |
628 | 631 … | }) + |
629 | - '<blockquote>' + markdown(c.text) + '</blockquote>' + | |
632 … | + (c.text ? '<blockquote>' + markdown(c.text) + '</blockquote>' : '') + | |
630 | 633 … | '</section>') |
631 | 634 … | }) |
632 | 635 … | default: |
633 | 636 … | return cb(null, u.json(msg)) |
locale/en.json | |||
---|---|---|---|
@@ -26,10 +26,12 @@ | |||
26 | 26 … | "Forked": "%{name} forked %{upstream} to %{repo}", | |
27 | 27 … | "CreatedRepo": "%{name} created repo %{repo}", | |
28 | 28 … | "Pushed": "%{name} pushed to %{repo}", | |
29 | 29 … | "OpenedIssue": "%{name} opened %{type} %{title} on %{project}", | |
30 … | + "ReopenedIssue": "%{name} reopened %{type} %{title}", | ||
31 … | + "ClosedIssue": "%{name} closed %{type} %{title}", | ||
30 | 32 … | "Named": "%{author} named %{target} %{name}", | |
31 | - "CommentedOn": "%{author} commented on %{target}", | ||
33 … | + "CommentedOn": "%{name} commented on %{type} %{title}", | ||
32 | 34 … | "Activity": "Activity", | |
33 | 35 … | "Repos": "Repos", | |
34 | 36 … | "UsersRepos": "%{name}'s repos", | |
35 | 37 … | "UpdatedOnDate": "Updated %{date}", |
locale/eo.json | ||
---|---|---|
@@ -26,10 +26,12 @@ | ||
26 | 26 … | "Forked": "%{name} forkis %{upstream} al %{repo}", |
27 | 27 … | "CreatedRepo": "%{name} kreis deponejon %{repo}", |
28 | 28 … | "Pushed": "%{name} puŝis al %{repo}", |
29 | 29 … | "OpenedIssue": "%{name} malfermiĝis %{type} %{title} sur %{project}", |
30 … | + "ReopenedIssue": "%{name} remalfermis %{type} %{title}", | |
31 … | + "ClosedIssue": "%{name} fermiĝis %{type} %{title}", | |
30 | 32 … | "Named": "%{author} nomis %{target} %{name}", |
31 | - "CommentedOn": "%{author} komentis %{target}", | |
33 … | + "CommentedOn": "%{name} komentis %{type} %{title}", | |
32 | 34 … | "Activity": "Aktivaĵo", |
33 | 35 … | "Repos": "Deponejoj", |
34 | 36 … | "UsersRepos": "Deponejoj de %{name}", |
35 | 37 … | "UpdatedOnDate": "Ĝisdatigis je %{date}", |
Built with git-ssb-web