diff options
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/admin.py | 19 | ||||
| -rw-r--r-- | Mailman/Cgi/options.py | 7 |
2 files changed, 19 insertions, 7 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 984904a7..f44e01db 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -47,7 +47,8 @@ from Mailman.CSRFcheck import csrf_check # Set up i18n _ = i18n._ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) -D_ = i18n.D_ +def D_(s): + return s NL = '\n' OPTCOLUMNS = 11 @@ -1483,9 +1484,12 @@ def change_options(mlist, category, subcat, cgidata, doc): else: mlist.InviteNewMember(userdesc, invitation) else: + _ = D_ + whence = _('admin mass sub') + _ = i18n._ mlist.ApprovedAddMember(userdesc, send_welcome_msg, send_admin_notif, invitation, - whence=D_('admin mass sub')) + whence=whence) except Errors.MMAlreadyAMember: subscribe_errors.append((safeentry, _('Already a member'))) except Errors.MMBadEmailError: @@ -1538,8 +1542,11 @@ def change_options(mlist, category, subcat, cgidata, doc): unsubscribe_success = [] for addr in names: try: + _ = D_ + whence = _('admin mass unsub') + _ = i18n._ mlist.ApprovedDeleteMember( - addr, whence=D_('admin mass unsub'), + addr, whence=whence, admin_notif=send_unsub_notifications, userack=userack) unsubscribe_success.append(Utils.websafe(addr)) @@ -1646,8 +1653,10 @@ def change_options(mlist, category, subcat, cgidata, doc): quser = urllib.quote(user) if cgidata.has_key('%s_unsub' % quser): try: - mlist.ApprovedDeleteMember(user, - whence=D_('member mgt page')) + _ = D_ + whence=_('member mgt page') + _ = i18n._ + mlist.ApprovedDeleteMember(user, whence=whence) removes.append(user) except Errors.NotAMemberError: errors.append((user, _('Not subscribed'))) diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index d563d253..c2a84ecb 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -45,7 +45,8 @@ DIGRE = re.compile( # Set up i18n _ = i18n._ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) -D_ = i18n.D_ +def D_(s): + return s try: True, False @@ -582,9 +583,10 @@ address. Upon confirmation, any other mailing list containing the address mlist.Lock() needapproval = False try: + _ = D_ try: mlist.DeleteMember( - user, D_('via the member options page'), userack=1) + user, _('via the member options page'), userack=1) except Errors.MMNeedApproval: needapproval = True except Errors.NotAMemberError: @@ -596,6 +598,7 @@ address. Upon confirmation, any other mailing list containing the address pass mlist.Save() finally: + _ = i18n._ mlist.Unlock() # Now throw up some results page, with appropriate links. We can't # drop them back into their options page, because that's gone now! |