Mercurial > kallithea
changeset 6124:833488c0a20a
pullrequests: put iteration advice in parens - it is not that essential
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 12 Aug 2016 03:04:48 +0200 |
| parents | 12919ffab34c |
| children | 96d228a53d55 |
| files | kallithea/controllers/pullrequests.py kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Fri Aug 12 03:04:48 2016 +0200 +++ b/kallithea/controllers/pullrequests.py Fri Aug 12 03:04:48 2016 +0200 @@ -637,11 +637,11 @@ hgrepo = org_scm_instance._repo show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s', avail_revs, revs[0], targethead)) - c.update_msg = _('The following changes are available on %s:') % c.cs_branch_name + c.update_msg = _('The following additional changes are available on %s:') % c.cs_branch_name else: show = set() avail_revs = set() # drop revs[0] - c.update_msg = _('No changesets found for iterating on this pull request.') + c.update_msg = _('No additional changesets found for iterating on this pull request.') # TODO: handle branch heads that not are tip-most brevs = org_scm_instance._repo.revs('%s - %ld - %s', c.cs_branch_name, avail_revs, revs[0])
--- a/kallithea/templates/pullrequests/pullrequest_show.html Fri Aug 12 03:04:48 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Fri Aug 12 03:04:48 2016 +0200 @@ -212,7 +212,7 @@ %endfor </table> </div> - <div class="msg-div">${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")}</div> + <div class="msg-div">(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})</div> %endif <div class="msg-div">${c.update_msg_other}</div> </div>