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/ListAdmin.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 'Mailman/ListAdmin.py')
| -rwxr-xr-x | Mailman/ListAdmin.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py index 877aa5c4..8825760a 100755 --- a/Mailman/ListAdmin.py +++ b/Mailman/ListAdmin.py @@ -45,6 +45,8 @@ from Mailman.Logging.Syslog import syslog from Mailman import i18n _ = i18n._ +def D_(s): + return s # Request types requiring admin approval IGN = 0 @@ -435,8 +437,11 @@ class ListAdmin: # subscribe assert value == mm_cfg.SUBSCRIBE try: + _ = D_ + whence = _('via admin approval') + _ = i18n._ userdesc = UserDesc(addr, fullname, password, digest, lang) - self.ApprovedAddMember(userdesc, whence='via admin approval') + self.ApprovedAddMember(userdesc, whence=whence) except Errors.MMAlreadyAMember: # User has already been subscribed, after sending the request pass |