diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-01-31 02:36:18 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-01-31 02:36:18 +0900 |
| commit | 0627aae9ef10fb96adaaa0a27e10f314bf7ee61b (patch) | |
| tree | 572e969ba3cbc90b046620914efcea65dca402f7 /Mailman/Cgi | |
| parent | 035c36229d803161b9e5a29c3fabd0ddf9dd4917 (diff) | |
| parent | e578864709ed56d4f4c3d46ba2516d494fdfecd1 (diff) | |
| download | mailman2-0627aae9ef10fb96adaaa0a27e10f314bf7ee61b.tar.gz mailman2-0627aae9ef10fb96adaaa0a27e10f314bf7ee61b.tar.xz mailman2-0627aae9ef10fb96adaaa0a27e10f314bf7ee61b.zip | |
merge lp:mailman/2.1 rev 1740
Diffstat (limited to 'Mailman/Cgi')
| -rwxr-xr-x | Mailman/Cgi/subscribe.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index f2ed8149..3977268c 100755 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -38,6 +38,7 @@ from Mailman.Logging.Syslog import syslog SLASH = '/' ERRORSEP = '\n\n<p>' +COMMASPACE = ', ' # Set up i18n _ = i18n._ @@ -148,10 +149,11 @@ def process_form(mlist, doc, cgidata, lang): captcha_response = json.load(httpresp) httpresp.close() if not captcha_response['success']: - results.append(_('reCAPTCHA validation failed: %s') % - ', '.join(captcha_response['error-codes'])) + e_codes = COMMASPACE.join(captcha_response['error-codes']) + results.append(_('reCAPTCHA validation failed: %(e_codes)s')) except urllib2.URLError as e: - results.append(_('reCAPTCHA could not be validated: %s') % e.reason) + e_reason = e.reason + results.append(_('reCAPTCHA could not be validated: %(e_reason)s')) # Are we checking the hidden data? if mm_cfg.SUBSCRIBE_FORM_SECRET: |