git ssb

30+

cel / git-ssb-web



Commit 351e84025393b1505cc97f2d743bc5be6c97b6ac

Distinguish between issue state in plural

Charles Lehner committed on 4/17/2016, 12:11:03 AM
Parent: e23389e12b990d2f01341f262cea6da52eec5b1c

Files changed

index.jschanged
locale/en.jsonchanged
locale/eo.jsonchanged
index.jsView
@@ -2052,11 +2052,11 @@
20522052 '<button class="btn">&plus; ' + req._t('issue.New') + '</button>' +
20532053 '</form>') +
20542054 '<h3>' + req._t('Issues') + '</h3>' +
20552055 nav([
2056- ['?', req._t('state.Open'), 'open'],
2057- ['?state=closed', req._t('state.Closed'), 'closed'],
2058- ['?state=all', req._t('state.All'), 'all']
2056+ ['?', req._t('issues.Open'), 'open'],
2057+ ['?state=closed', req._t('issues.Closed'), 'closed'],
2058+ ['?state=all', req._t('issues.All'), 'all']
20592059 ], state)),
20602060 pull(
20612061 issues.createFeedStream({ project: repo.id }),
20622062 pull.filter(function (issue) {
@@ -2064,9 +2064,10 @@
20642064 }),
20652065 pull.map(function (issue) {
20662066 numIssues++
20672067 var state = (issue.open ? 'open' : 'closed')
2068- var stateStr = req._t(issue.open ? 'state.Open' : 'state.Closed')
2068+ var stateStr = req._t(issue.open ?
2069+ 'issue.state.Open' : 'issue.state.Closed')
20692070 return '<section class="collapse">' +
20702071 '<i class="issue-state issue-state-' + state + '"' +
20712072 ' title="' + stateStr + '">◼</i> ' +
20722073 '<a href="' + encodeLink(issue.id) + '">' +
@@ -2098,11 +2099,11 @@
20982099 '</button>' +
20992100 '</form>') +
21002101 '<h3>' + req._t('PullRequests') + '</h3>' +
21012102 nav([
2102- ['?', req._t('state.Open'), 'open'],
2103- ['?state=closed', req._t('state.Closed'), 'closed'],
2104- ['?state=all', req._t('state.All'), 'all']
2103+ ['?', req._t('issues.Open'), 'open'],
2104+ ['?state=closed', req._t('issues.Closed'), 'closed'],
2105+ ['?state=all', req._t('issues.All'), 'all']
21052106 ], state)),
21062107 pull(
21072108 pullReqs.list({
21082109 repo: repo.id,
@@ -2110,9 +2111,10 @@
21102111 }),
21112112 pull.map(function (issue) {
21122113 count++
21132114 var state = (issue.open ? 'open' : 'closed')
2114- var stateStr = req._t(issue.open ? 'state.Open' : 'state.Closed')
2115+ var stateStr = req._t(issue.open ?
2116+ 'issue.state.Open' : 'issue.state.Closed')
21152117 return '<section class="collapse">' +
21162118 '<i class="issue-state issue-state-' + state + '"' +
21172119 ' title="' + stateStr + '">◼</i> ' +
21182120 '<a href="' + encodeLink(issue.id) + '">' +
@@ -2157,11 +2159,11 @@
21572159 '<code>' + issue.id + '</code>' +
21582160 '<section class="collapse">' +
21592161 (issue.open
21602162 ? '<strong class="issue-status open">' +
2161- req._t('state.Open') + '</strong>'
2163+ req._t('issue.state.Open') + '</strong>'
21622164 : '<strong class="issue-status closed">' +
2163- req._t('state.Closed') + '</strong>')),
2165+ req._t('issue.state.Closed') + '</strong>')),
21642166 readOnce(function (cb) {
21652167 about.getName(issue.author, function (err, authorName) {
21662168 if (err) return cb(err)
21672169 var authorLink = link([issue.author], authorName)
@@ -2332,9 +2334,9 @@
23322334 var baseBranchLink = link([repo.id, 'tree', pr.baseBranch])
23332335 cb(null, '<section class="collapse">' +
23342336 '<strong class="issue-status ' +
23352337 (pr.open ? 'open' : 'closed') + '">' +
2336- req._t(pr.open ? 'state.Open' : 'state.Closed') +
2338+ req._t(pr.open ? 'issue.state.Open' : 'issue.state.Closed') +
23372339 '</strong> ' +
23382340 req._t('pullRequest.WantToMerge', {
23392341 name: authorLink,
23402342 base: '<code>' + baseBranchLink + '</code>',
locale/en.jsonView
@@ -89,9 +89,9 @@
8989 "Total": "Total",
9090 "NoForks": "No forks",
9191 "ForkRepoPrompt": "Fork this repo?",
9292 "Cancel": "Cancel",
93- "state": {
93+ "issues": {
9494 "Open": "Open",
9595 "Closed": "Closed",
9696 "All": "All"
9797 },
@@ -101,8 +101,12 @@
101101 "Create": "Create",
102102 "Title": "Title",
103103 "issue": {
104104 "": "issue",
105+ "state": {
106+ "Open": "Open",
107+ "Closed": "Closed"
108+ },
105109 "New": "New Issue",
106110 "Title": "Issue Title",
107111 "Description": "Description",
108112 "Rename": "Rename the issue",
locale/eo.jsonView
@@ -89,9 +89,9 @@
8989 "Total": "Tuta",
9090 "NoForks": "Neniu forkoj",
9191 "ForkRepoPrompt": "Forki ĉi tiun deponejon?",
9292 "Cancel": "Nuligi",
93- "state": {
93+ "issues": {
9494 "Open": "Malfermitaj",
9595 "Closed": "Fermitaj",
9696 "All": "Ċiuj"
9797 },
@@ -101,8 +101,12 @@
101101 "Create": "Krei",
102102 "Title": "Titolo",
103103 "issue": {
104104 "": "temon",
105+ "state": {
106+ "Open": "Malfermita",
107+ "Closed": "Fermita"
108+ },
105109 "New": "Nova Temo",
106110 "Title": "Temo titolo",
107111 "Description": "Priskribo",
108112 "Rename": "Renomiĝi la temon",

Built with git-ssb-web