diff options
author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-18 06:44:53 +0900 |
---|---|---|
committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-06-18 06:44:53 +0900 |
commit | 5800a4e0bbe034297cfe85a28965cf7f6af3e304 (patch) | |
tree | 4c05525b107dcdce08aee5f9a2d345f3b926edf1 /Mailman/Cgi/options.py | |
parent | 444648032c9ff3d852874896b5d44f4c5f1eda53 (diff) | |
parent | 6a069d6f6648a8a4736fdf5b8141af9368cf3456 (diff) | |
download | mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.tar.gz mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.tar.xz mailman2-5800a4e0bbe034297cfe85a28965cf7f6af3e304.zip |
merge lp:mailman/2.1 up to 1777
Diffstat (limited to '')
-rw-r--r-- | Mailman/Cgi/options.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 4f128baf..c2a84ecb 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -45,6 +45,8 @@ DIGRE = re.compile( # Set up i18n _ = i18n._ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) +def D_(s): + return s try: True, False @@ -581,9 +583,10 @@ address. Upon confirmation, any other mailing list containing the address mlist.Lock() needapproval = False try: + _ = D_ try: mlist.DeleteMember( - user, 'via the member options page', userack=1) + user, _('via the member options page'), userack=1) except Errors.MMNeedApproval: needapproval = True except Errors.NotAMemberError: @@ -595,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! |