kallithea Changeset - 833488c0a20a

Changeset - 833488c0a20a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-08-12 03:04:48
madski@unity3d.com

pullrequests: put iteration advice in parens - it is not that essential

2 files changed with 3 insertions and 3 deletions:

kallithea/controllers/pullrequests.py

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -637,11 +637,11 @@ class PullrequestsController(BaseRepoCon @@
                             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])

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -212,7 +212,7 @@ ${self.repo_context_bar('showpullrequest @@
                   %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>

0 comments (0 inline, 0 general)