diff options
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Cgi/listinfo.py | 9 | ||||
| -rwxr-xr-x | Mailman/Cgi/subscribe.py | 2 | ||||
| -rwxr-xr-x | Mailman/Defaults.py.in | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py index 91f5b6bb..bab460b6 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -21,6 +21,7 @@ # No lock needed in this script, because we don't change data. import os +import re import cgi import time @@ -245,12 +246,14 @@ def list_listinfo(mlist, lang): replacements['<mm-fullname-box>'] = mlist.FormatBox('fullname', size=30) # If reCAPTCHA is enabled, display its user interface if mm_cfg.RECAPTCHA_SITE_KEY: + rlang = re.sub('_', '-', lang) replacements['<mm-recaptcha-ui>'] = ( """<tr><td> </td><td> - <script src="https://www.google.com/recaptcha/api.js"></script> + <script src="https://www.google.com/recaptcha/api.js?hl=%s"> + </script> <div class="g-recaptcha" data-sitekey="%s"></div> </td></tr>""" - % mm_cfg.RECAPTCHA_SITE_KEY) + % (rlang, mm_cfg.RECAPTCHA_SITE_KEY)) else: replacements['<mm-recaptcha-ui>'] = '' diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index a53efefd..301d1733 100755 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 3446aa8d..4406a1f3 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -133,7 +133,7 @@ SUBSCRIBE_FORM_MIN_TIME = seconds(5) # Use Google reCAPTCHA to protect the subscription form from spam bots. The # following must be set to a pair of keys issued by the reCAPTCHA service at -# https://www.google.com/recaptcha/ +# https://www.google.com/recaptcha/admin RECAPTCHA_SITE_KEY = None RECAPTCHA_SECRET_KEY = None |