------------------------------------------------------------
revno: 6594
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 3.0
timestamp: Mon 2008-02-18 21:24:46 -0500
message:
PEP 292 style, $-strings are used by the translation service everywhere now.
No more %-strings. Kill off all __i18n_templates__ hacks.
modified:
Mailman/MTA/Manual.py
Mailman/app/membership.py
Mailman/app/moderator.py
Mailman/app/registrar.py
Mailman/app/styles.py
Mailman/bin/add_members.py
Mailman/bin/arch.py
Mailman/bin/bounces.py
Mailman/bin/bumpdigests.py
Mailman/bin/change_pw.py
Mailman/bin/check_perms.py
Mailman/bin/checkdbs.py
Mailman/bin/cleanarch.py
Mailman/bin/config_list.py
Mailman/bin/confirm.py
Mailman/bin/disabled.py
Mailman/bin/dumpdb.py
Mailman/bin/export.py
Mailman/bin/find_member.py
Mailman/bin/gate_news.py
Mailman/bin/genaliases.py
Mailman/bin/import.py
Mailman/bin/inject.py
Mailman/bin/join.py
Mailman/bin/leave.py
Mailman/bin/list_lists.py
Mailman/bin/list_members.py
Mailman/bin/list_owners.py
Mailman/bin/mailmanctl.py
Mailman/bin/make_instance.py
Mailman/bin/mmsitepass.py
Mailman/bin/newlist.py
Mailman/bin/nightly_gzip.py
Mailman/bin/owner.py
Mailman/bin/post.py
Mailman/bin/qrunner.py
Mailman/bin/request.py
Mailman/bin/rmlist.py
Mailman/bin/senddigests.py
Mailman/bin/set_members.py
Mailman/bin/testall.py
Mailman/bin/unshunt.py
Mailman/bin/update.py
Mailman/bin/version.py
Mailman/bin/withlist.py
Mailman/chains/hold.py
Mailman/i18n.py
Mailman/pipeline/acknowledge.py
Mailman/pipeline/replybot.py
Mailman/pipeline/scrubber.py
Mailman/pipeline/to_digest.py
=== modified file 'Mailman/MTA/Manual.py'
--- a/Mailman/MTA/Manual.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/MTA/Manual.py 2008-02-19 02:24:46 +0000
@@ -29,8 +29,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
# no-ops for interface compliance
=== modified file 'Mailman/app/membership.py'
--- a/Mailman/app/membership.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/app/membership.py 2008-02-19 02:24:46 +0000
@@ -29,7 +29,6 @@
from Mailman.interfaces import DeliveryMode, MemberRole
_ = i18n._
-__i18n_templates__ = True
=== modified file 'Mailman/app/moderator.py'
--- a/Mailman/app/moderator.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/app/moderator.py 2008-02-19 02:24:46 +0000
@@ -43,7 +43,6 @@
from Mailman.queue import Switchboard
_ = i18n._
-__i18n_templates__ = True
vlog = logging.getLogger('mailman.vette')
slog = logging.getLogger('mailman.subscribe')
=== modified file 'Mailman/app/registrar.py'
--- a/Mailman/app/registrar.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/app/registrar.py 2008-02-19 02:24:46 +0000
@@ -34,8 +34,6 @@
from Mailman.i18n import _
from Mailman.interfaces import IDomain, IPendable, IRegistrar
-__i18n_templates__ = True
-
class PendableRegistration(dict):
=== modified file 'Mailman/app/styles.py'
--- a/Mailman/app/styles.py 2008-02-18 04:34:09 +0000
+++ b/Mailman/app/styles.py 2008-02-19 02:24:46 +0000
@@ -37,8 +37,6 @@
from Mailman.interfaces import (
Action, IStyle, IStyleManager, NewsModeration, Personalization)
-__i18n_templates__ = True
-
class DefaultStyle:
=== modified file 'Mailman/bin/add_members.py'
--- a/Mailman/bin/add_members.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/add_members.py 2008-02-19 02:24:46 +0000
@@ -36,7 +36,6 @@
from Mailman.interfaces import DeliveryMode
_ = i18n._
-__i18n_templates__ = True
=== modified file 'Mailman/bin/arch.py'
--- a/Mailman/bin/arch.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/arch.py 2008-02-19 02:24:46 +0000
@@ -33,7 +33,6 @@
from Mailman.initialize import initialize
_ = i18n._
-__i18n_templates__ = True
=== modified file 'Mailman/bin/bounces.py'
--- a/Mailman/bin/bounces.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/bounces.py 2008-02-19 02:24:46 +0000
@@ -32,8 +32,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/bumpdigests.py'
--- a/Mailman/bin/bumpdigests.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/bumpdigests.py 2008-02-19 02:24:46 +0000
@@ -28,8 +28,6 @@
import signal
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/change_pw.py'
--- a/Mailman/bin/change_pw.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/change_pw.py 2008-02-19 02:24:46 +0000
@@ -30,8 +30,6 @@
from Mailman.configuration import config
_ = i18n._
-__i18n_templates__ = True
-
SPACE = ' '
=== modified file 'Mailman/bin/check_perms.py'
--- a/Mailman/bin/check_perms.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/check_perms.py 2008-02-19 02:24:46 +0000
@@ -28,8 +28,6 @@
from Mailman.configuration import config
from Mailman.i18n import _
-__i18n_templates__ = True
-
# XXX Need to check the archives/private/*/database/* files
=== modified file 'Mailman/bin/checkdbs.py'
--- a/Mailman/bin/checkdbs.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/checkdbs.py 2008-02-19 02:24:46 +0000
@@ -30,7 +30,6 @@
from Mailman.configuration import config
_ = i18n._
-__i18n_templates__ = True
# Work around known problems with some RedHat cron daemons
import signal
=== modified file 'Mailman/bin/cleanarch.py'
--- a/Mailman/bin/cleanarch.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/cleanarch.py 2008-02-19 02:24:46 +0000
@@ -25,7 +25,6 @@
from Mailman import Version
from Mailman.i18n import _
-__i18n_templates = True
cre = re.compile(mailbox.UnixMailbox._fromlinepattern)
# From RFC 2822, a header field name must contain only characters from 33-126
=== modified file 'Mailman/bin/config_list.py'
--- a/Mailman/bin/config_list.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/config_list.py 2008-02-19 02:24:46 +0000
@@ -28,7 +28,6 @@
from Mailman.configuration import config
_ = i18n._
-__i18n_templates__ = True
NL = '\n'
nonasciipat = re.compile(r'[\x80-\xff]')
=== modified file 'Mailman/bin/confirm.py'
--- a/Mailman/bin/confirm.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/confirm.py 2008-02-19 02:24:46 +0000
@@ -32,8 +32,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/disabled.py'
--- a/Mailman/bin/disabled.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/disabled.py 2008-02-19 02:24:46 +0000
@@ -29,7 +29,6 @@
from Mailman.configuration import config
from Mailman.i18n import _
-__i18n_templates__ = True
# Work around known problems with some RedHat cron daemons
import signal
=== modified file 'Mailman/bin/dumpdb.py'
--- a/Mailman/bin/dumpdb.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/dumpdb.py 2008-02-19 02:24:46 +0000
@@ -27,7 +27,6 @@
from Mailman.configuration import config
from Mailman.i18n import _
-__i18n_templates__ = True
COMMASPACE = ', '
=== modified file 'Mailman/bin/export.py'
--- a/Mailman/bin/export.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/export.py 2008-02-19 02:24:46 +0000
@@ -37,8 +37,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
SPACE = ' '
TYPES = {
=== modified file 'Mailman/bin/find_member.py'
--- a/Mailman/bin/find_member.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/find_member.py 2008-02-19 02:24:46 +0000
@@ -26,8 +26,6 @@
from Mailman.i18n import _
-__i18n_templates__ = True
-
AS_MEMBER = 0x01
AS_OWNER = 0x02
=== modified file 'Mailman/bin/gate_news.py'
--- a/Mailman/bin/gate_news.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/gate_news.py 2008-02-19 02:24:46 +0000
@@ -49,8 +49,6 @@
class _ContinueLoop(Exception):
pass
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/genaliases.py'
--- a/Mailman/bin/genaliases.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/genaliases.py 2008-02-19 02:24:46 +0000
@@ -26,8 +26,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/import.py'
--- a/Mailman/bin/import.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/import.py 2008-02-19 02:24:46 +0000
@@ -35,7 +35,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
OPTS = None
=== modified file 'Mailman/bin/inject.py'
--- a/Mailman/bin/inject.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/inject.py 2008-02-19 02:24:46 +0000
@@ -25,8 +25,6 @@
from Mailman.i18n import _
from Mailman.inject import inject
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/join.py'
--- a/Mailman/bin/join.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/join.py 2008-02-19 02:24:46 +0000
@@ -32,8 +32,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/leave.py'
--- a/Mailman/bin/leave.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/leave.py 2008-02-19 02:24:46 +0000
@@ -32,8 +32,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/list_lists.py'
--- a/Mailman/bin/list_lists.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/list_lists.py 2008-02-19 02:24:46 +0000
@@ -23,8 +23,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/list_members.py'
--- a/Mailman/bin/list_members.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/list_members.py 2008-02-19 02:24:46 +0000
@@ -28,7 +28,6 @@
from Mailman.initialize import initialize
from Mailman.interfaces import DeliveryStatus
-__i18n_templates__ = True
ENC = sys.getdefaultencoding()
COMMASPACE = ', '
=== modified file 'Mailman/bin/list_owners.py'
--- a/Mailman/bin/list_owners.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/list_owners.py 2008-02-19 02:24:46 +0000
@@ -25,9 +25,6 @@
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
-
def parseargs():
parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
=== modified file 'Mailman/bin/mailmanctl.py'
--- a/Mailman/bin/mailmanctl.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/mailmanctl.py 2008-02-19 02:24:46 +0000
@@ -34,7 +34,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
COMMASPACE = ', '
DOT = '.'
=== modified file 'Mailman/bin/make_instance.py'
--- a/Mailman/bin/make_instance.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/make_instance.py 2008-02-19 02:24:46 +0000
@@ -33,7 +33,7 @@
from Mailman.Version import MAILMAN_VERSION
from Mailman.i18n import _
-__i18n_templates__ = True
+
SPACE = ' '
DATA_DIR = os.path.dirname(Mailman.data.__file__)
=== modified file 'Mailman/bin/mmsitepass.py'
--- a/Mailman/bin/mmsitepass.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/mmsitepass.py 2008-02-19 02:24:46 +0000
@@ -26,8 +26,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/newlist.py'
--- a/Mailman/bin/newlist.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/newlist.py 2008-02-19 02:24:46 +0000
@@ -33,7 +33,6 @@
from Mailman.initialize import initialize
_ = i18n._
-__i18n_templates__ = True
=== modified file 'Mailman/bin/nightly_gzip.py'
--- a/Mailman/bin/nightly_gzip.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/nightly_gzip.py 2008-02-19 02:24:46 +0000
@@ -30,8 +30,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/owner.py'
--- a/Mailman/bin/owner.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/owner.py 2008-02-19 02:24:46 +0000
@@ -35,8 +35,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/post.py'
--- a/Mailman/bin/post.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/post.py 2008-02-19 02:24:46 +0000
@@ -35,8 +35,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/qrunner.py'
--- a/Mailman/bin/qrunner.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/qrunner.py 2008-02-19 02:24:46 +0000
@@ -26,7 +26,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
COMMASPACE = ', '
QRUNNER_SHORTCUTS = {}
=== modified file 'Mailman/bin/request.py'
--- a/Mailman/bin/request.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/request.py 2008-02-19 02:24:46 +0000
@@ -32,8 +32,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def main():
=== modified file 'Mailman/bin/rmlist.py'
--- a/Mailman/bin/rmlist.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/rmlist.py 2008-02-19 02:24:46 +0000
@@ -29,9 +29,6 @@
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
-
def parseargs():
parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
=== modified file 'Mailman/bin/senddigests.py'
--- a/Mailman/bin/senddigests.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/senddigests.py 2008-02-19 02:24:46 +0000
@@ -28,8 +28,6 @@
import signal
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/set_members.py'
--- a/Mailman/bin/set_members.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/set_members.py 2008-02-19 02:24:46 +0000
@@ -32,7 +32,6 @@
_ = i18n._
-__i18n_templates__ = True
DELIVERY_MODES = {
'regular': DeliveryMode.regular,
=== modified file 'Mailman/bin/testall.py'
--- a/Mailman/bin/testall.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/testall.py 2008-02-19 02:24:46 +0000
@@ -38,7 +38,6 @@
from Mailman.initialize import initialize_1, initialize_2
basedir = None
-__i18n_templates__ = True
=== modified file 'Mailman/bin/unshunt.py'
--- a/Mailman/bin/unshunt.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/unshunt.py 2008-02-19 02:24:46 +0000
@@ -23,8 +23,6 @@
from Mailman.i18n import _
from Mailman.queue import Switchboard
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/update.py'
--- a/Mailman/bin/update.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/update.py 2008-02-19 02:24:46 +0000
@@ -40,7 +40,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
FRESH = 0
NOTFRESH = -1
=== modified file 'Mailman/bin/version.py'
--- a/Mailman/bin/version.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/version.py 2008-02-19 02:24:46 +0000
@@ -20,8 +20,6 @@
from Mailman import Version
from Mailman.i18n import _
-__i18n_templates__ = True
-
def parseargs():
=== modified file 'Mailman/bin/withlist.py'
--- a/Mailman/bin/withlist.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/bin/withlist.py 2008-02-19 02:24:46 +0000
@@ -26,8 +26,6 @@
from Mailman.i18n import _
from Mailman.initialize import initialize
-__i18n_templates__ = True
-
LAST_MLIST = None
VERBOSE = True
=== modified file 'Mailman/chains/hold.py'
--- a/Mailman/chains/hold.py 2008-01-31 04:58:52 +0000
+++ b/Mailman/chains/hold.py 2008-02-19 02:24:46 +0000
@@ -21,7 +21,6 @@
__all__ = ['HoldChain']
__metaclass__ = type
-__i18n_templates__ = True
import logging
=== modified file 'Mailman/i18n.py'
--- a/Mailman/i18n.py 2008-02-08 04:01:48 +0000
+++ b/Mailman/i18n.py 2008-02-19 02:24:46 +0000
@@ -94,29 +94,24 @@
def _(s):
if s == '':
return u''
- assert s
- # Do translation of the given string into the current language, and do
- # Ping-string interpolation into the resulting string.
+ assert s, 'Cannot translate: %s' % s
+ # Do translation of the given string into the current language, and do PEP
+ # 292 style $-string interpolation into the resulting string.
#
# This lets you write something like:
#
# now = time.ctime(time.time())
- # print _('The current time is: %(now)s')
+ # print _('The current time is: $now')
#
# and have it Just Work. Note that the lookup order for keys in the
# original string is 1) locals dictionary, 2) globals dictionary.
#
- # We inspect the frame's globals to see if __i18n_templates__ is set. If
- # so, we use string.Template style $-variables instead of more traditional
- # %-strings.
- #
- # Get the frame of the caller
+ # Get the frame of the caller.
frame = sys._getframe(1)
# A `safe' dictionary is used so we won't get an exception if there's a
# missing key in the dictionary.
d = frame.f_globals.copy()
d.update(frame.f_locals)
- use_templates = d.get('__i18n_templates__', False)
# Mailman must be unicode safe internally (i.e. all strings inside Mailman
# must be unicodes). The translation service is one boundary to the
# outside world, so to honor this constraint, make sure that all strings
@@ -127,11 +122,7 @@
for k, v in d.items():
if isinstance(v, str):
d[k] = unicode(v, charset, 'replace')
- # Are we using $-strings or %-strings?
- if use_templates:
- translated_string = Template(tns).safe_substitute(attrdict(d))
- else:
- translated_string = SafeDict(d, charset=charset).interpolate(tns)
+ translated_string = Template(tns).safe_substitute(attrdict(d))
if isinstance(translated_string, str):
translated_string = unicode(translated_string, charset)
return translated_string
=== modified file 'Mailman/pipeline/acknowledge.py'
--- a/Mailman/pipeline/acknowledge.py 2008-02-17 22:34:21 +0000
+++ b/Mailman/pipeline/acknowledge.py 2008-02-19 02:24:46 +0000
@@ -33,8 +33,6 @@
from Mailman.i18n import _
from Mailman.interfaces import IHandler
-__i18n_templates__ = True
-
class Acknowledge:
=== modified file 'Mailman/pipeline/replybot.py'
--- a/Mailman/pipeline/replybot.py 2008-02-17 22:34:21 +0000
+++ b/Mailman/pipeline/replybot.py 2008-02-19 02:24:46 +0000
@@ -33,9 +33,8 @@
from Mailman.i18n import _
from Mailman.interfaces import IHandler
+
log = logging.getLogger('mailman.error')
-
-__i18n_templates__ = True
NODELTA = datetime.timedelta()
=== modified file 'Mailman/pipeline/scrubber.py'
--- a/Mailman/pipeline/scrubber.py 2008-02-17 22:34:21 +0000
+++ b/Mailman/pipeline/scrubber.py 2008-02-19 02:24:46 +0000
@@ -203,8 +203,8 @@
filename = Utils.oneline(filename, lcset)
replace_payload_by_text(part, _("""\
An embedded and charset-unspecified text was scrubbed...
-Name: %(filename)s
-URL: %(url)s
+Name: $filename
+URL: $url
"""), lcset)
elif ctype == 'text/html' and isinstance(sanitize, int):
if sanitize == 0:
@@ -225,7 +225,7 @@
url = save_attachment(mlist, part, dir, filter_html=False)
replace_payload_by_text(part, _("""\
An HTML attachment was scrubbed...
-URL: %(url)s
+URL: $url
"""), lcset)
else:
# HTML-escape it and store it as an attachment, but make it
@@ -246,7 +246,7 @@
url = save_attachment(mlist, part, dir, filter_html=False)
replace_payload_by_text(part, _("""\
An HTML attachment was scrubbed...
-URL: %(url)s
+URL: $url
"""), lcset)
elif ctype == 'message/rfc822':
# This part contains a submessage, so it too needs scrubbing
@@ -258,11 +258,11 @@
size = len(str(submsg))
replace_payload_by_text(part, _("""\
An embedded message was scrubbed...
-From: %(who)s
-Subject: %(subject)s
-Date: %(date)s
-Size: %(size)s
-URL: %(url)s
+From: $who
+Subject: $subject
+Date: $date
+Size: $size
+URL: $url
"""), lcset)
# If the message isn't a multipart, then we'll strip it out as an
# attachment that would have to be separately downloaded. Pipermail
@@ -286,11 +286,11 @@
filename = Utils.oneline(filename, lcset)
replace_payload_by_text(part, _("""\
A non-text attachment was scrubbed...
-Name: %(filename)s
-Type: %(ctype)s
-Size: %(size)d bytes
-Desc: %(desc)s
-URL: %(url)s
+Name: $filename
+Type: $ctype
+Size: $size bytes
+Desc: $desc
+URL: $url
"""), lcset)
outer = False
# We still have to sanitize multipart messages to flat text because
@@ -321,7 +321,7 @@
# All parts should be scrubbed to text/plain by now.
partctype = part.get_content_type()
if partctype <> 'text/plain':
- text.append(_('Skipped content of type %(partctype)s\n'))
+ text.append(_('Skipped content of type $partctype\n'))
continue
try:
t = part.get_payload(decode=True) or ''
=== modified file 'Mailman/pipeline/to_digest.py'
--- a/Mailman/pipeline/to_digest.py 2008-02-17 22:34:21 +0000
+++ b/Mailman/pipeline/to_digest.py 2008-02-19 02:24:46 +0000
@@ -60,8 +60,8 @@
from Mailman.interfaces import DeliveryMode, DeliveryStatus, IHandler
from Mailman.queue import Switchboard
+
_ = i18n._
-__i18n_templates__ = True
UEMPTYSTRING = u''
EMPTYSTRING = ''
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
