# HG changeset patch # User Mads Kiilerich # Date 1370993795 -7200 # Node ID b58ed6d608cce92131405cfea0484aa02ca69366 # Parent 6aa83fecf669c4b673bc9b9af42ed617f85f5b79 Use space after , in lists diff -r 6aa83fecf669 -r b58ed6d608cc rhodecode/lib/base.py --- 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. diff -r 6aa83fecf669 -r b58ed6d608cc rhodecode/lib/paster_commands/repo_scan.py --- 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', diff -r 6aa83fecf669 -r b58ed6d608cc rhodecode/lib/vcs/utils/helpers.py --- 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) diff -r 6aa83fecf669 -r b58ed6d608cc rhodecode/templates/pullrequests/pullrequest_show.html --- 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 @@
% if len(c.pull_request_pending_reviewers) > 0: -
${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
+
${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
%else:
${_('Pull request was reviewed by all reviewers')}
%endif