diff options
| author | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
| commit | 518b3843c0117f24b1b277a724169fb616604e4d (patch) | |
| tree | 01ab5cbe392ff3a8e851dae1be4eb3a8cf8ed439 /Mailman/Cgi/subscribe.py | |
| parent | 42fcf522d7818e9e1ee922d1a68824b0f6dcc83d (diff) | |
| parent | c0da6af58657b1fe5730d3dea0e78bc17dac490a (diff) | |
| download | mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.gz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.xz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.zip | |
Merged from upstream
Diffstat (limited to 'Mailman/Cgi/subscribe.py')
| -rw-r--r-- | Mailman/Cgi/subscribe.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index 3661dcde..80019581 100644 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2009 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 @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Process subscription or roster requests from listinfo form.""" @@ -204,8 +205,8 @@ your subscription.""") if privacy_results: results = privacy_results else: - # We need to interpolate into x - x = _(x) + # We need to interpolate into x.__str__() + x = _(str(x)) results = _("""\ Your subscription request was deferred because %(x)s. Your request has been forwarded to the list moderator. You will receive email informing you of the |