aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2018-01-30 08:21:50 -0800
committerMark Sapiro <mark@msapiro.net>2018-01-30 08:21:50 -0800
commite578864709ed56d4f4c3d46ba2516d494fdfecd1 (patch)
tree7567918f2a7034f3e33eab2a3821c29adfeae6f5 /Mailman
parentc89ba589e3a2e1931b7edd3d4c9dfef20df6a600 (diff)
downloadmailman2-e578864709ed56d4f4c3d46ba2516d494fdfecd1.tar.gz
mailman2-e578864709ed56d4f4c3d46ba2516d494fdfecd1.tar.xz
mailman2-e578864709ed56d4f4c3d46ba2516d494fdfecd1.zip
Corrected i18n from rev. 1738 and updated message catalogs.
Diffstat (limited to 'Mailman')
-rwxr-xr-xMailman/Cgi/subscribe.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 301d1733..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: