← Back to branch summary

~launchpad-pqm/mailman/2.1

« back to all changes in this revision

Viewing changes to Mailman/Cgi/subscribe.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2009-10-21 01:06:17 UTC
  • mfrom: (975.1.1 mailman.2112)
  • Revision ID: launchpad@pqm.canonical.com-20091021010617-prbs2ay6nhxx515v
[rs=flacoste] Upgrade Mailman to upstream 2.1.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Cgi/subscribe.py
1
 
# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
 
1
# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
2
2
#
3
3
# This program is free software; you can redistribute it and/or
4
4
# modify it under the terms of the GNU General Public License
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 
16
# USA.
16
17
 
17
18
"""Process subscription or roster requests from listinfo form."""
18
19
 
204
205
        if privacy_results:
205
206
            results = privacy_results
206
207
        else:
207
 
            # We need to interpolate into x
208
 
            x = _(x)
 
208
            # We need to interpolate into x.__str__()
 
209
            x = _(str(x))
209
210
            results = _("""\
210
211
Your subscription request was deferred because %(x)s.  Your request has been
211
212
forwarded to the list moderator.  You will receive email informing you of the