# HG changeset patch # User Mads Kiilerich # Date 1470963888 -7200 # Node ID 833488c0a20a840a502fabac33a2ef32fdd79791 # Parent 12919ffab34c748a861e6be6a73d18c9066e74df pullrequests: put iteration advice in parens - it is not that essential diff -r 12919ffab34c -r 833488c0a20a kallithea/controllers/pullrequests.py --- 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]) diff -r 12919ffab34c -r 833488c0a20a kallithea/templates/pullrequests/pullrequest_show.html --- 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 -
${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")}
+
(${_("Pull request iterations do not change content once created. Select a revision and save to make a new iteration.")})
%endif
${c.update_msg_other}