Mercurial > kallithea
changeset 3987:b58ed6d608cc
Use space after , in lists
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 12 Jun 2013 01:36:35 +0200 |
parents | 6aa83fecf669 |
children | 072a37c44f58 |
files | rhodecode/lib/base.py rhodecode/lib/paster_commands/repo_scan.py rhodecode/lib/vcs/utils/helpers.py rhodecode/templates/pullrequests/pullrequest_show.html |
diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/base.py Wed Jun 12 01:36:35 2013 +0200 +++ b/rhodecode/lib/base.py Wed Jun 12 01:36:35 2013 +0200 @@ -34,7 +34,7 @@ def _filter_proxy(ip): """ - HEADERS can have mutliple ips inside the left-most being the original + HEADERS can have multiple ips inside the left-most being the original client, and each successive proxy that passed the request adding the IP address where it received the request from.
--- a/rhodecode/lib/paster_commands/repo_scan.py Wed Jun 12 01:36:35 2013 +0200 +++ b/rhodecode/lib/paster_commands/repo_scan.py Wed Jun 12 01:36:35 2013 +0200 @@ -58,9 +58,9 @@ log.info('Now scanning root location for new repos...') added, removed = repo2db_mapper(ScmModel().repo_scan(), remove_obsolete=rm_obsolete) - added = ','.join(added) or '-' - removed = ','.join(removed) or '-' - log.info('Scan completed added:%s removed:%s' % (added, removed)) + added = ', '.join(added) or '-' + removed = ', '.join(removed) or '-' + log.info('Scan completed added: %s removed:%s' % (added, removed)) def update_parser(self): self.parser.add_option('--delete-obsolete',
--- a/rhodecode/lib/vcs/utils/helpers.py Wed Jun 12 01:36:35 2013 +0200 +++ b/rhodecode/lib/vcs/utils/helpers.py Wed Jun 12 01:36:35 2013 +0200 @@ -50,7 +50,7 @@ if scm[0] == explicit_alias: return scm raise VCSError('More than one [%s] scm found at given path %s' - % (','.join((x[0] for x in found_scms)), path)) + % (', '.join((x[0] for x in found_scms)), path)) if len(found_scms) is 0: raise VCSError('No scm found at given path %s' % path)
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Wed Jun 12 01:36:35 2013 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Wed Jun 12 01:36:35 2013 +0200 @@ -54,7 +54,7 @@ </div> <div class="input"> % if len(c.pull_request_pending_reviewers) > 0: - <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> + <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> %else: <div>${_('Pull request was reviewed by all reviewers')}</div> %endif