|
|
e7a395 |
diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py
|
|
|
e7a395 |
index c4f21e4..0a8395b 100644
|
|
|
e7a395 |
--- a/Mailman/MTA/Postfix.py
|
|
|
e7a395 |
+++ b/Mailman/MTA/Postfix.py
|
|
|
e7a395 |
@@ -362,9 +362,9 @@ def checkperms(state):
|
|
|
e7a395 |
if stat and (stat[ST_MODE] & targetmode) <> targetmode:
|
|
|
e7a395 |
state.ERRORS += 1
|
|
|
e7a395 |
octmode = oct(stat[ST_MODE])
|
|
|
e7a395 |
- print _('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
|
|
|
e7a395 |
+ print C_('%(dbfile)s permissions must be 066x (got %(octmode)s)'),
|
|
|
e7a395 |
if state.FIX:
|
|
|
e7a395 |
- print _('(fixing)')
|
|
|
e7a395 |
+ print C_('(fixing)')
|
|
|
e7a395 |
os.chmod(dbfile, stat[ST_MODE] | targetmode)
|
|
|
e7a395 |
else:
|
|
|
e7a395 |
print
|
|
|
e7a395 |
diff --git a/bin/change_pw b/bin/change_pw
|
|
|
e7a395 |
index 35be13d..b9a36de 100644
|
|
|
e7a395 |
--- a/bin/change_pw
|
|
|
e7a395 |
+++ b/bin/change_pw
|
|
|
e7a395 |
@@ -187,8 +187,8 @@ def main():
|
|
|
e7a395 |
adminurl = mlist.GetScriptURL('admin', absolute=1)
|
|
|
e7a395 |
msg = Message.UserNotification(
|
|
|
e7a395 |
mlist.owner[:], Utils.get_site_email(),
|
|
|
e7a395 |
- _('Your new %(listname)s list password'),
|
|
|
e7a395 |
- _('''\
|
|
|
e7a395 |
+ C_('Your new %(listname)s list password'),
|
|
|
e7a395 |
+ C_('''\
|
|
|
e7a395 |
The site administrator at %(hostname)s has changed the password for your
|
|
|
e7a395 |
mailing list %(listname)s. It is now
|
|
|
e7a395 |
|
|
|
e7a395 |
diff --git a/bin/check_perms b/bin/check_perms
|
|
|
e7a395 |
index f0c6795..5ef3306 100755
|
|
|
e7a395 |
--- a/bin/check_perms
|
|
|
e7a395 |
+++ b/bin/check_perms
|
|
|
e7a395 |
@@ -221,7 +221,7 @@ def checkarchives():
|
|
|
e7a395 |
# In addition, on a multiuser system you may want to hide the private
|
|
|
e7a395 |
# archives so other users can't read them.
|
|
|
e7a395 |
if mode & S_IXOTH:
|
|
|
e7a395 |
- print _("""\
|
|
|
e7a395 |
+ print C_("""\
|
|
|
e7a395 |
Warning: Private archive directory is other-executable (o+x).
|
|
|
e7a395 |
This could allow other users on your system to read private archives.
|
|
|
e7a395 |
If you're on a shared multiuser system, you should consult the
|
|
|
e7a395 |
diff --git a/bin/clone_member b/bin/clone_member
|
|
|
e7a395 |
index d9ff224..b262aab 100755
|
|
|
e7a395 |
--- a/bin/clone_member
|
|
|
e7a395 |
+++ b/bin/clone_member
|
|
|
e7a395 |
@@ -133,7 +133,7 @@ def dolist(mlist, options):
|
|
|
e7a395 |
pattern = mlist.GetBannedPattern(options.toaddr)
|
|
|
e7a395 |
if pattern:
|
|
|
e7a395 |
if not options.quiet:
|
|
|
e7a395 |
- print ' ', _('Banned address (matched %(pattern)s)')
|
|
|
e7a395 |
+ print ' ', C_('Banned address (matched %(pattern)s)')
|
|
|
e7a395 |
return
|
|
|
e7a395 |
|
|
|
e7a395 |
# Now change the membership address
|
|
|
e7a395 |
diff --git a/bin/fix_url.py b/bin/fix_url.py
|
|
|
e7a395 |
index 6523ce2..d4840be 100644
|
|
|
e7a395 |
--- a/bin/fix_url.py
|
|
|
e7a395 |
+++ b/bin/fix_url.py
|
|
|
e7a395 |
@@ -72,7 +72,7 @@ def fix_url(mlist, *args):
|
|
|
e7a395 |
# Make sure list is locked.
|
|
|
e7a395 |
if not mlist.Locked():
|
|
|
e7a395 |
if verbose:
|
|
|
e7a395 |
- print _('Locking list')
|
|
|
e7a395 |
+ print C_('Locking list')
|
|
|
e7a395 |
mlist.Lock()
|
|
|
e7a395 |
if urlhost:
|
|
|
e7a395 |
web_page_url = mm_cfg.DEFAULT_URL_PATTERN % urlhost
|
|
|
e7a395 |
diff --git a/bin/genaliases b/bin/genaliases
|
|
|
e7a395 |
index 29e5b5a..d6b9f07 100644
|
|
|
e7a395 |
--- a/bin/genaliases
|
|
|
e7a395 |
+++ b/bin/genaliases
|
|
|
e7a395 |
@@ -81,7 +81,7 @@ def main():
|
|
|
e7a395 |
|
|
|
e7a395 |
if not mm_cfg.MTA:
|
|
|
e7a395 |
mta = repr(mm_cfg.MTA)
|
|
|
e7a395 |
- usage(2, _(
|
|
|
e7a395 |
+ usage(2, C_(
|
|
|
e7a395 |
"genaliases can't do anything useful with mm_cfg.MTA = %(mta)s."
|
|
|
e7a395 |
))
|
|
|
e7a395 |
|
|
|
e7a395 |
diff --git a/bin/newlist b/bin/newlist
|
|
|
e7a395 |
index 7000396..e52f340 100755
|
|
|
e7a395 |
--- a/bin/newlist
|
|
|
e7a395 |
+++ b/bin/newlist
|
|
|
e7a395 |
@@ -248,7 +248,7 @@ def main():
|
|
|
e7a395 |
try:
|
|
|
e7a395 |
msg = Message.UserNotification(
|
|
|
e7a395 |
owner_mail, siteowner,
|
|
|
e7a395 |
- _('Your new mailing list: %(listname)s'),
|
|
|
e7a395 |
+ C_('Your new mailing list: %(listname)s'),
|
|
|
e7a395 |
text, mlist.preferred_language)
|
|
|
e7a395 |
msg.send(mlist)
|
|
|
e7a395 |
finally:
|
|
|
e7a395 |
diff --git a/bin/reset_pw.py b/bin/reset_pw.py
|
|
|
e7a395 |
index e829aef..b71d532 100644
|
|
|
e7a395 |
--- a/bin/reset_pw.py
|
|
|
e7a395 |
+++ b/bin/reset_pw.py
|
|
|
e7a395 |
@@ -38,7 +38,7 @@ import getopt
|
|
|
e7a395 |
|
|
|
e7a395 |
import paths
|
|
|
e7a395 |
from Mailman import Utils
|
|
|
e7a395 |
-from Mailman.i18n import _
|
|
|
e7a395 |
+from Mailman.i18n import C_
|
|
|
e7a395 |
|
|
|
e7a395 |
|
|
|
e7a395 |
try:
|
|
|
e7a395 |
@@ -54,7 +54,7 @@ def usage(code, msg=''):
|
|
|
e7a395 |
fd = sys.stderr
|
|
|
e7a395 |
else:
|
|
|
e7a395 |
fd = sys.stdout
|
|
|
e7a395 |
- print >> fd, _(__doc__.replace('%', '%%'))
|
|
|
e7a395 |
+ print >> fd, C_(__doc__.replace('%', '%%'))
|
|
|
e7a395 |
if msg:
|
|
|
e7a395 |
print >> fd, msg
|
|
|
e7a395 |
sys.exit(code)
|
|
|
e7a395 |
@@ -74,13 +74,13 @@ def reset_pw(mlist, *args):
|
|
|
e7a395 |
|
|
|
e7a395 |
listname = mlist.internal_name()
|
|
|
e7a395 |
if verbose:
|
|
|
e7a395 |
- print _('Changing passwords for list: %(listname)s')
|
|
|
e7a395 |
+ print C_('Changing passwords for list: %(listname)s')
|
|
|
e7a395 |
|
|
|
e7a395 |
for member in mlist.getMembers():
|
|
|
e7a395 |
randompw = Utils.MakeRandomPassword()
|
|
|
e7a395 |
mlist.setMemberPassword(member, randompw)
|
|
|
e7a395 |
if verbose:
|
|
|
e7a395 |
- print _('New password for member %(member)40s: %(randompw)s')
|
|
|
e7a395 |
+ print C_('New password for member %(member)40s: %(randompw)s')
|
|
|
e7a395 |
|
|
|
e7a395 |
mlist.Save()
|
|
|
e7a395 |
|
|
|
e7a395 |
diff --git a/bin/sync_members b/bin/sync_members
|
|
|
e7a395 |
index d302243..26a5e58 100755
|
|
|
e7a395 |
--- a/bin/sync_members
|
|
|
e7a395 |
+++ b/bin/sync_members
|
|
|
e7a395 |
@@ -261,7 +261,7 @@ def main():
|
|
|
e7a395 |
except Errors.MMAlreadyAMember:
|
|
|
e7a395 |
pass
|
|
|
e7a395 |
except Errors.MembershipIsBanned, pattern:
|
|
|
e7a395 |
- print ('%s:' % addr), _('Banned address (matched %(pattern)s)')
|
|
|
e7a395 |
+ print ('%s:' % addr), C_('Banned address (matched %(pattern)s)')
|
|
|
e7a395 |
|
|
|
e7a395 |
for laddr, addr in addrs.items():
|
|
|
e7a395 |
# Should be a member, otherwise our test above is broken
|
|
|
e7a395 |
diff --git a/bin/update b/bin/update
|
|
|
e7a395 |
index 0ac5ffe..b584342 100755
|
|
|
e7a395 |
--- a/bin/update
|
|
|
e7a395 |
+++ b/bin/update
|
|
|
e7a395 |
@@ -452,7 +452,7 @@ def update_qfiles():
|
|
|
e7a395 |
except EnvironmentError, e:
|
|
|
e7a395 |
if e.errno <> errno.ENOTDIR:
|
|
|
e7a395 |
raise
|
|
|
e7a395 |
- print _('Warning! Not a directory: %(dirpath)s')
|
|
|
e7a395 |
+ print C_('Warning! Not a directory: %(dirpath)s')
|
|
|
e7a395 |
|
|
|
e7a395 |
|
|
|
e7a395 |
|
|
|
e7a395 |
@@ -541,7 +541,7 @@ def dequeue(filebase):
|
|
|
e7a395 |
msg = data = None
|
|
|
e7a395 |
except EOFError:
|
|
|
e7a395 |
# For some reason the pckfile was empty. Just delete it.
|
|
|
e7a395 |
- print _('Warning! Deleting empty .pck file: %(pckfile)s')
|
|
|
e7a395 |
+ print C_('Warning! Deleting empty .pck file: %(pckfile)s')
|
|
|
e7a395 |
os.unlink(pckfile)
|
|
|
e7a395 |
finally:
|
|
|
e7a395 |
if msgfp:
|