From 4758a0d904a12d6be21972fa432ad89ed9c1a768 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Thu, 22 Jan 2015 16:09:03 -0800 Subject: A number of changes from the unofficial 2.2 branch have been backported to the 2.1 branch for release with 2.1.19. The 2.2 branch is now no different from the 2.1 branch and will no longer be maintained. --- Mailman/Commands/cmd_confirm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Mailman/Commands') diff --git a/Mailman/Commands/cmd_confirm.py b/Mailman/Commands/cmd_confirm.py index a3accf64..379d23c2 100644 --- a/Mailman/Commands/cmd_confirm.py +++ b/Mailman/Commands/cmd_confirm.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2011 by the Free Software Foundation, Inc. +# Copyright (C) 2002-2015 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 @@ -49,9 +49,9 @@ def process(res, args): days = int(mm_cfg.PENDING_REQUEST_LIFE / mm_cfg.days(1) + 0.5) res.results.append(_("""\ Invalid confirmation string. Note that confirmation strings expire -approximately %(days)s days after the initial subscription request. If your -confirmation has expired, please try to re-submit your original request or -message.""")) +approximately %(days)s days after the initial request. They also expire if +the request has already been handled in some way. If your confirmation has +expired, please try to re-submit your original request or message.""")) except Errors.MMNeedApproval: res.results.append(_("""\ Your request has been forwarded to the list moderator for approval.""")) -- cgit v1.2.3