diff options
Diffstat (limited to 'src/mailman/bin')
27 files changed, 45 insertions, 49 deletions
diff --git a/src/mailman/bin/arch.py b/src/mailman/bin/arch.py index abf057c3f..d4231fa26 100644 --- a/src/mailman/bin/arch.py +++ b/src/mailman/bin/arch.py @@ -25,15 +25,13 @@ import optparse from locknix.lockfile import Lock -from mailman import i18n from mailman.Archiver.HyperArch import HyperArchive from mailman.Defaults import hours from mailman.configuration import config +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION -_ = i18n._ - def parseargs(): @@ -93,8 +91,6 @@ def main(): parser, opts, args = parseargs() initialize(opts.config) - i18n.set_language(config.DEFAULT_SERVER_LANGUAGE) - listname = args[0].lower().strip() if len(args) < 2: mbox = None @@ -108,7 +104,8 @@ def main(): if mbox is None: mbox = mlist.ArchiveFileName() - i18n.set_language(mlist.preferred_language) + # Set the default language to the list's preferred language. + _.default = mlist.preferred_language # Lay claim to the archive's lock file. This is so no other post can # mess up the archive while we're processing it. Try to pick a # suitably long period of time for the lock lifetime even though we diff --git a/src/mailman/bin/bumpdigests.py b/src/mailman/bin/bumpdigests.py index b1ed37a21..5cce668cb 100644 --- a/src/mailman/bin/bumpdigests.py +++ b/src/mailman/bin/bumpdigests.py @@ -21,7 +21,7 @@ import optparse from mailman import errors from mailman import MailList from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION # Work around known problems with some RedHat cron daemons diff --git a/src/mailman/bin/check_perms.py b/src/mailman/bin/check_perms.py index 4b75aa9f6..9937eb637 100644 --- a/src/mailman/bin/check_perms.py +++ b/src/mailman/bin/check_perms.py @@ -25,7 +25,7 @@ import optparse from stat import * from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/checkdbs.py b/src/mailman/bin/checkdbs.py index fd116522e..c8ab7b83b 100644 --- a/src/mailman/bin/checkdbs.py +++ b/src/mailman/bin/checkdbs.py @@ -24,15 +24,14 @@ from zope.component import getUtility from mailman import MailList from mailman import Utils -from mailman import i18n from mailman.app.requests import handle_request from mailman.configuration import config +from mailman.core.i18n import _ from mailman.email.message import UserNotification +from mailman.initialize import initialize from mailman.interfaces.requests import IRequests from mailman.version import MAILMAN_VERSION -_ = i18n._ - # Work around known problems with some RedHat cron daemons import signal signal.signal(signal.SIGCHLD, signal.SIG_DFL) @@ -153,9 +152,7 @@ def midnight(date=None): def main(): opts, args, parser = parseargs() - config.load(opts.config) - - i18n.set_language(config.DEFAULT_SERVER_LANGUAGE) + initialize(opts.config) for name in config.list_manager.names: # The list must be locked in order to open the requests database @@ -175,13 +172,14 @@ def main(): # This is the only place we've changed the list's database mlist.Save() if count: - i18n.set_language(mlist.preferred_language) + # Set the default language the the list's preferred language. + _.default = mlist.preferred_language realname = mlist.real_name discarded = auto_discard(mlist) if discarded: count = count - discarded - text = _( - 'Notice: $discarded old request(s) automatically expired.\n\n') + text = _('Notice: $discarded old request(s) ' + 'automatically expired.\n\n') else: text = '' if count: @@ -189,11 +187,13 @@ def main(): 'checkdbs.txt', {'count' : count, 'host_name': mlist.host_name, - 'adminDB' : mlist.GetScriptURL('admindb', absolute=1), + 'adminDB' : mlist.GetScriptURL('admindb', + absolute=1), 'real_name': realname, }, mlist=mlist) text += '\n' + pending_requests(mlist) - subject = _('$count $realname moderator request(s) waiting') + subject = _('$count $realname moderator ' + 'request(s) waiting') else: subject = _('$realname moderator request check result') msg = UserNotification(mlist.GetOwnerEmail(), diff --git a/src/mailman/bin/cleanarch.py b/src/mailman/bin/cleanarch.py index 325fad91a..d861b3bfc 100644 --- a/src/mailman/bin/cleanarch.py +++ b/src/mailman/bin/cleanarch.py @@ -22,7 +22,7 @@ import sys import mailbox import optparse -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/config_list.py b/src/mailman/bin/config_list.py index 89a9892cd..e2ed46ed3 100644 --- a/src/mailman/bin/config_list.py +++ b/src/mailman/bin/config_list.py @@ -22,12 +22,12 @@ import optparse from mailman import MailList from mailman import errors -from mailman import i18n from mailman.Utils import wrap from mailman.configuration import config +from mailman.core.i18n import _ +from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION -_ = i18n._ NL = '\n' nonasciipat = re.compile(r'[\x80-\xff]') @@ -101,7 +101,8 @@ def do_output(listname, outfile, parser): parser.error(_('No such list: $listname')) # Preamble for the config info. PEP 263 charset and capture time. charset = mlist.preferred_language.charset - i18n.set_language(mlist.preferred_language.code) + # Set the system's default language. + _.default = mlist.preferred_language.code if not charset: charset = 'us-ascii' when = time.ctime(time.time()) @@ -310,7 +311,7 @@ def do_input(listname, infile, checkonly, verbose, parser): def main(): parser, opts, args = parseargs() - config.load(opts.config) + initialize(opts.config) listname = args[0] # Sanity check diff --git a/src/mailman/bin/disabled.py b/src/mailman/bin/disabled.py index cc8eb2c69..1ff59ac5e 100644 --- a/src/mailman/bin/disabled.py +++ b/src/mailman/bin/disabled.py @@ -26,7 +26,7 @@ from mailman import Pending from mailman import loginit from mailman.Bouncer import _BounceInfo from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/dumpdb.py b/src/mailman/bin/dumpdb.py index 6657602e4..6c3ac5414 100644 --- a/src/mailman/bin/dumpdb.py +++ b/src/mailman/bin/dumpdb.py @@ -19,7 +19,7 @@ import pprint import cPickle from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.interact import interact from mailman.options import Options diff --git a/src/mailman/bin/export.py b/src/mailman/bin/export.py index d1992b4b4..ecd8ff3a9 100644 --- a/src/mailman/bin/export.py +++ b/src/mailman/bin/export.py @@ -29,7 +29,7 @@ from mailman import errors from mailman import MemberAdaptor from mailman.MailList import MailList from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/find_member.py b/src/mailman/bin/find_member.py index 0982724a0..2788c5e8f 100644 --- a/src/mailman/bin/find_member.py +++ b/src/mailman/bin/find_member.py @@ -22,7 +22,7 @@ import optparse from mailman import errors from mailman import MailList from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/gate_news.py b/src/mailman/bin/gate_news.py index eac30422d..2ca70a341 100644 --- a/src/mailman/bin/gate_news.py +++ b/src/mailman/bin/gate_news.py @@ -32,7 +32,7 @@ from mailman import Message from mailman import Utils from mailman import loginit from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.queue import Switchboard from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/genaliases.py b/src/mailman/bin/genaliases.py index 8fe37f543..d09dc2a22 100644 --- a/src/mailman/bin/genaliases.py +++ b/src/mailman/bin/genaliases.py @@ -24,7 +24,7 @@ __all__ = [ import sys from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.options import Options from mailman.utilities.modules import call_name diff --git a/src/mailman/bin/import.py b/src/mailman/bin/import.py index bc26e441b..6270faa15 100644 --- a/src/mailman/bin/import.py +++ b/src/mailman/bin/import.py @@ -30,7 +30,7 @@ from mailman import MemberAdaptor from mailman import Utils from mailman import passwords from mailman.MailList import MailList -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.interfaces.domain import BadDomainSpecificationError from mailman.version import MAILMAN_VERSION @@ -230,7 +230,7 @@ def create(all_listdata): 'pass_filename_extensions'): value = value.splitlines() if option == 'available_languages': - mlist.set_languages(*value) + mlist.os(*value) else: setattr(mlist, option, value) for member in list_roster: diff --git a/src/mailman/bin/list_members.py b/src/mailman/bin/list_members.py index e715bfdcb..a94eda4a5 100644 --- a/src/mailman/bin/list_members.py +++ b/src/mailman/bin/list_members.py @@ -21,8 +21,8 @@ from email.Utils import formataddr from zope.component import getUtility from mailman.core import errors +from mailman.core.i18n import _ from mailman.email.validate import is_valid -from mailman.i18n import _ from mailman.interfaces.listmanager import IListManager from mailman.interfaces.members import DeliveryStatus from mailman.interfaces.usermanager import IUserManager diff --git a/src/mailman/bin/list_owners.py b/src/mailman/bin/list_owners.py index b683dcae6..fef6926c1 100644 --- a/src/mailman/bin/list_owners.py +++ b/src/mailman/bin/list_owners.py @@ -21,7 +21,7 @@ import optparse from zope.component import getUtility from mailman.MailList import MailList -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.interfaces.listmanager import IListManager from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/mailman.py b/src/mailman/bin/mailman.py index c1b2931a4..d25ba2649 100644 --- a/src/mailman/bin/mailman.py +++ b/src/mailman/bin/mailman.py @@ -31,8 +31,8 @@ import argparse from zope.interface.verify import verifyObject from mailman.app.finder import find_components +from mailman.core.i18n import _ from mailman.core.initialize import initialize -from mailman.i18n import _ from mailman.interfaces.command import ICLISubCommand from mailman.version import MAILMAN_VERSION_FULL diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py index 910bad3e6..be1e24b2a 100644 --- a/src/mailman/bin/master.py +++ b/src/mailman/bin/master.py @@ -39,8 +39,8 @@ from locknix import lockfile from munepy import Enum from mailman.config import config +from mailman.core.i18n import _ from mailman.core.logging import reopen -from mailman.i18n import _ from mailman.options import Options diff --git a/src/mailman/bin/mmsitepass.py b/src/mailman/bin/mmsitepass.py index 132803fc9..3d1531196 100644 --- a/src/mailman/bin/mmsitepass.py +++ b/src/mailman/bin/mmsitepass.py @@ -22,7 +22,7 @@ import optparse from mailman import Utils from mailman import passwords from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/nightly_gzip.py b/src/mailman/bin/nightly_gzip.py index f886e5801..5fb04b0f7 100644 --- a/src/mailman/bin/nightly_gzip.py +++ b/src/mailman/bin/nightly_gzip.py @@ -26,7 +26,7 @@ except ImportError: from mailman import MailList from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/qrunner.py b/src/mailman/bin/qrunner.py index 73e701f16..3ecdeb441 100644 --- a/src/mailman/bin/qrunner.py +++ b/src/mailman/bin/qrunner.py @@ -30,8 +30,8 @@ import signal import logging from mailman.config import config +from mailman.core.i18n import _ from mailman.core.logging import reopen -from mailman.i18n import _ from mailman.options import Options from mailman.utilities.modules import find_name diff --git a/src/mailman/bin/senddigests.py b/src/mailman/bin/senddigests.py index fb057d6b9..31d91c1df 100644 --- a/src/mailman/bin/senddigests.py +++ b/src/mailman/bin/senddigests.py @@ -20,7 +20,7 @@ import sys import optparse from mailman import MailList -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/set_members.py b/src/mailman/bin/set_members.py index 001e5e1d3..c4a8060b4 100644 --- a/src/mailman/bin/set_members.py +++ b/src/mailman/bin/set_members.py @@ -22,20 +22,18 @@ from zope.component import getUtility from mailman import Message from mailman import Utils -from mailman import i18n from mailman import passwords from mailman.app.membership import add_member from mailman.app.notifications import ( send_admin_subscription_notice, send_welcome_message) from mailman.configuration import config +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.interfaces.members import DeliveryMode from mailman.interfaces.usermanager import IUserManager from mailman.version import MAILMAN_VERSION -_ = i18n._ - DELIVERY_MODES = { 'regular': DeliveryMode.regular, 'plain': DeliveryMode.plaintext_digests, @@ -155,7 +153,7 @@ def main(): delete_members = current_members - future_members change_members = current_members & future_members - with i18n.using_language(mlist.preferred_language): + with _.using(mlist.preferred_language): # Start by removing all the delete members. for address in delete_members: print _('deleting address: $address') diff --git a/src/mailman/bin/show_config.py b/src/mailman/bin/show_config.py index 8d26c5c97..61776ff68 100644 --- a/src/mailman/bin/show_config.py +++ b/src/mailman/bin/show_config.py @@ -21,7 +21,7 @@ import pprint import optparse from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.version import MAILMAN_VERSION diff --git a/src/mailman/bin/show_qfiles.py b/src/mailman/bin/show_qfiles.py index e4b64e0cd..81d576e3d 100644 --- a/src/mailman/bin/show_qfiles.py +++ b/src/mailman/bin/show_qfiles.py @@ -21,7 +21,7 @@ import sys from cPickle import load from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.options import Options diff --git a/src/mailman/bin/unshunt.py b/src/mailman/bin/unshunt.py index fc889377c..2a4558fd4 100644 --- a/src/mailman/bin/unshunt.py +++ b/src/mailman/bin/unshunt.py @@ -24,7 +24,7 @@ __all__ = [ import sys from mailman.config import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.options import Options diff --git a/src/mailman/bin/update.py b/src/mailman/bin/update.py index 34ea6cda3..bb2cc294a 100644 --- a/src/mailman/bin/update.py +++ b/src/mailman/bin/update.py @@ -37,7 +37,7 @@ from mailman.MemberAdaptor import BYBOUNCE, ENABLED from mailman.OldStyleMemberships import OldStyleMemberships from mailman.Queue.Switchboard import Switchboard from mailman.configuration import config -from mailman.i18n import _ +from mailman.core.i18n import _ from mailman.initialize import initialize from mailman.utilities.filesystem import makedirs diff --git a/src/mailman/bin/withlist.py b/src/mailman/bin/withlist.py index 2b236eaec..3c89ffc40 100644 --- a/src/mailman/bin/withlist.py +++ b/src/mailman/bin/withlist.py @@ -23,8 +23,8 @@ from zope.component import getUtility from mailman import interact from mailman.config import config +from mailman.core.i18n import _ from mailman.core.initialize import initialize -from mailman.i18n import _ from mailman.interfaces.listmanager import IListManager from mailman.version import MAILMAN_VERSION |