PEP 292 style, $-strings are used by the translation service everywhere now.

No more %-strings.  Kill off all __i18n_templates__ hacks.

40 files changed, 1 insertions, 66 deletions

diff --git a/Mailman/bin/add_members.py b/Mailman/bin/add_members.py
index 70c6358a9..6aac2ad71 100644
--- a/Mailman/bin/add_members.py
+++ b/Mailman/bin/add_members.py
@@ -36,7 +36,6 @@ from Mailman.initialize import initialize
 from Mailman.interfaces import DeliveryMode
 
 _ = i18n._
-__i18n_templates__ = True
 
 
 
diff --git a/Mailman/bin/arch.py b/Mailman/bin/arch.py
index 14f3b576f..7e39e5290 100644
--- a/Mailman/bin/arch.py
+++ b/Mailman/bin/arch.py
@@ -33,7 +33,6 @@ from Mailman.configuration import config
 from Mailman.initialize import initialize
 
 _ = i18n._
-__i18n_templates__ = True
 
 
 
diff --git a/Mailman/bin/bounces.py b/Mailman/bin/bounces.py
index 3e6ea7322..ac4ea43e3 100644
--- a/Mailman/bin/bounces.py
+++ b/Mailman/bin/bounces.py
@@ -32,8 +32,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/bumpdigests.py b/Mailman/bin/bumpdigests.py
index 4345c25a6..fd8e8d460 100644
--- a/Mailman/bin/bumpdigests.py
+++ b/Mailman/bin/bumpdigests.py
@@ -28,8 +28,6 @@ from Mailman.i18n import _
 import signal
 signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/change_pw.py b/Mailman/bin/change_pw.py
index 8e1c633bf..72c673963 100644
--- a/Mailman/bin/change_pw.py
+++ b/Mailman/bin/change_pw.py
@@ -30,8 +30,6 @@ from Mailman import i18n
 from Mailman.configuration import config
 
 _ = i18n._
-__i18n_templates__ = True
-
 SPACE = ' '
 
 
diff --git a/Mailman/bin/check_perms.py b/Mailman/bin/check_perms.py
index 128a86cec..efa4f0886 100644
--- a/Mailman/bin/check_perms.py
+++ b/Mailman/bin/check_perms.py
@@ -28,8 +28,6 @@ from Mailman import Version
 from Mailman.configuration import config
 from Mailman.i18n import _
 
-__i18n_templates__ = True
-
 
 # XXX Need to check the archives/private/*/database/* files
 
diff --git a/Mailman/bin/checkdbs.py b/Mailman/bin/checkdbs.py
index 184c30946..6c887539e 100644
--- a/Mailman/bin/checkdbs.py
+++ b/Mailman/bin/checkdbs.py
@@ -30,7 +30,6 @@ from Mailman.app.requests import handle_request
 from Mailman.configuration import config
 
 _ = i18n._
-__i18n_templates__ = True
 
 # Work around known problems with some RedHat cron daemons
 import signal
diff --git a/Mailman/bin/cleanarch.py b/Mailman/bin/cleanarch.py
index e4b95950f..7fec04373 100644
--- a/Mailman/bin/cleanarch.py
+++ b/Mailman/bin/cleanarch.py
@@ -25,7 +25,6 @@ import optparse
 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
diff --git a/Mailman/bin/config_list.py b/Mailman/bin/config_list.py
index b3f420c80..75e8f573a 100644
--- a/Mailman/bin/config_list.py
+++ b/Mailman/bin/config_list.py
@@ -28,7 +28,6 @@ from Mailman import i18n
 from Mailman.configuration import config
 
 _ = i18n._
-__i18n_templates__ = True
 
 NL = '\n'
 nonasciipat = re.compile(r'[\x80-\xff]')
diff --git a/Mailman/bin/confirm.py b/Mailman/bin/confirm.py
index 170b92300..ff4a83708 100644
--- a/Mailman/bin/confirm.py
+++ b/Mailman/bin/confirm.py
@@ -32,8 +32,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/disabled.py b/Mailman/bin/disabled.py
index ac2f158f6..26c001f4a 100644
--- a/Mailman/bin/disabled.py
+++ b/Mailman/bin/disabled.py
@@ -29,7 +29,6 @@ from Mailman.Bouncer import _BounceInfo
 from Mailman.configuration import config
 from Mailman.i18n import _
 
-__i18n_templates__ = True
 
 # Work around known problems with some RedHat cron daemons
 import signal
diff --git a/Mailman/bin/dumpdb.py b/Mailman/bin/dumpdb.py
index 0b69b868f..21db632b3 100644
--- a/Mailman/bin/dumpdb.py
+++ b/Mailman/bin/dumpdb.py
@@ -27,7 +27,6 @@ from Mailman import Version
 from Mailman.configuration import config
 from Mailman.i18n import _
 
-__i18n_templates__ = True
 
 COMMASPACE = ', '
 
diff --git a/Mailman/bin/export.py b/Mailman/bin/export.py
index fe43d6811..dccedaa55 100644
--- a/Mailman/bin/export.py
+++ b/Mailman/bin/export.py
@@ -37,8 +37,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 SPACE           = ' '
 
 TYPES = {
diff --git a/Mailman/bin/find_member.py b/Mailman/bin/find_member.py
index 4dae2e5f9..a0c198214 100644
--- a/Mailman/bin/find_member.py
+++ b/Mailman/bin/find_member.py
@@ -26,8 +26,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 
 
-__i18n_templates__ = True
-
 AS_MEMBER   = 0x01
 AS_OWNER    = 0x02
 
diff --git a/Mailman/bin/gate_news.py b/Mailman/bin/gate_news.py
index 16e8b16bb..968491df1 100644
--- a/Mailman/bin/gate_news.py
+++ b/Mailman/bin/gate_news.py
@@ -49,8 +49,6 @@ log = None
 class _ContinueLoop(Exception):
     pass
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/genaliases.py b/Mailman/bin/genaliases.py
index cf810905c..5bb985e71 100644
--- a/Mailman/bin/genaliases.py
+++ b/Mailman/bin/genaliases.py
@@ -26,8 +26,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/import.py b/Mailman/bin/import.py
index 0d49963bd..276c2a299 100644
--- a/Mailman/bin/import.py
+++ b/Mailman/bin/import.py
@@ -35,7 +35,6 @@ from Mailman.MailList import MailList
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
 
 OPTS = None
 
diff --git a/Mailman/bin/inject.py b/Mailman/bin/inject.py
index a3b4a372e..45f3be54d 100644
--- a/Mailman/bin/inject.py
+++ b/Mailman/bin/inject.py
@@ -25,8 +25,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.inject import inject
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/join.py b/Mailman/bin/join.py
index 329037c10..2f868a372 100644
--- a/Mailman/bin/join.py
+++ b/Mailman/bin/join.py
@@ -32,8 +32,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/leave.py b/Mailman/bin/leave.py
index d9091cee4..d3a990e57 100644
--- a/Mailman/bin/leave.py
+++ b/Mailman/bin/leave.py
@@ -32,8 +32,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/list_lists.py b/Mailman/bin/list_lists.py
index 438461042..37077057f 100644
--- a/Mailman/bin/list_lists.py
+++ b/Mailman/bin/list_lists.py
@@ -23,8 +23,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/list_members.py b/Mailman/bin/list_members.py
index 6738157e4..05138f2ad 100644
--- a/Mailman/bin/list_members.py
+++ b/Mailman/bin/list_members.py
@@ -28,7 +28,6 @@ from Mailman.i18n import _
 from Mailman.initialize import initialize
 from Mailman.interfaces import DeliveryStatus
 
-__i18n_templates__ = True
 
 ENC = sys.getdefaultencoding()
 COMMASPACE = ', '
diff --git a/Mailman/bin/list_owners.py b/Mailman/bin/list_owners.py
index fe273a000..c73da5e30 100644
--- a/Mailman/bin/list_owners.py
+++ b/Mailman/bin/list_owners.py
@@ -25,9 +25,6 @@ from Mailman.i18n import _
 from Mailman.initialize import initialize
 
 
-__i18n_templates__ = True
-
-
 
 def parseargs():
     parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
diff --git a/Mailman/bin/mailmanctl.py b/Mailman/bin/mailmanctl.py
index 40e7e7beb..3be5d1849 100644
--- a/Mailman/bin/mailmanctl.py
+++ b/Mailman/bin/mailmanctl.py
@@ -34,7 +34,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
 
 COMMASPACE = ', '
 DOT = '.'
diff --git a/Mailman/bin/make_instance.py b/Mailman/bin/make_instance.py
index 82a54a9d1..26e799470 100644
--- a/Mailman/bin/make_instance.py
+++ b/Mailman/bin/make_instance.py
@@ -33,7 +33,7 @@ from Mailman import Defaults
 from Mailman.Version import MAILMAN_VERSION
 from Mailman.i18n import _
 
-__i18n_templates__ = True
+
 SPACE = ' '
 DATA_DIR = os.path.dirname(Mailman.data.__file__)
 
diff --git a/Mailman/bin/mmsitepass.py b/Mailman/bin/mmsitepass.py
index 2d95b5d63..df32cfe23 100644
--- a/Mailman/bin/mmsitepass.py
+++ b/Mailman/bin/mmsitepass.py
@@ -26,8 +26,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/newlist.py b/Mailman/bin/newlist.py
index 7bafc4430..f63e46724 100644
--- a/Mailman/bin/newlist.py
+++ b/Mailman/bin/newlist.py
@@ -33,7 +33,6 @@ from Mailman.configuration import config
 from Mailman.initialize import initialize
 
 _ = i18n._
-__i18n_templates__ = True
 
 
 
diff --git a/Mailman/bin/nightly_gzip.py b/Mailman/bin/nightly_gzip.py
index 729fdf3ad..30131fd61 100644
--- a/Mailman/bin/nightly_gzip.py
+++ b/Mailman/bin/nightly_gzip.py
@@ -30,8 +30,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/owner.py b/Mailman/bin/owner.py
index cd3aea6ae..498c77e22 100644
--- a/Mailman/bin/owner.py
+++ b/Mailman/bin/owner.py
@@ -35,8 +35,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/post.py b/Mailman/bin/post.py
index 0ca392ad5..a560133c5 100644
--- a/Mailman/bin/post.py
+++ b/Mailman/bin/post.py
@@ -35,8 +35,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/qrunner.py b/Mailman/bin/qrunner.py
index d62ad3a24..91ecb2ca3 100644
--- a/Mailman/bin/qrunner.py
+++ b/Mailman/bin/qrunner.py
@@ -26,7 +26,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
 
 COMMASPACE = ', '
 QRUNNER_SHORTCUTS = {}
diff --git a/Mailman/bin/request.py b/Mailman/bin/request.py
index 1b1e3c6c8..478337976 100644
--- a/Mailman/bin/request.py
+++ b/Mailman/bin/request.py
@@ -32,8 +32,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def main():
diff --git a/Mailman/bin/rmlist.py b/Mailman/bin/rmlist.py
index b6110507b..c61df2a85 100644
--- a/Mailman/bin/rmlist.py
+++ b/Mailman/bin/rmlist.py
@@ -29,9 +29,6 @@ from Mailman.i18n import _
 from Mailman.initialize import initialize
 
 
-__i18n_templates__ = True
-
-
 
 def parseargs():
     parser = optparse.OptionParser(version=Version.MAILMAN_VERSION,
diff --git a/Mailman/bin/senddigests.py b/Mailman/bin/senddigests.py
index 4b0d3b3bd..99a7734cf 100644
--- a/Mailman/bin/senddigests.py
+++ b/Mailman/bin/senddigests.py
@@ -28,8 +28,6 @@ from Mailman.initialize import initialize
 import signal
 signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/set_members.py b/Mailman/bin/set_members.py
index 334287fcc..66f0e62b3 100644
--- a/Mailman/bin/set_members.py
+++ b/Mailman/bin/set_members.py
@@ -32,7 +32,6 @@ from Mailman.interfaces import DeliveryMode
 
 
 _ = i18n._
-__i18n_templates__ = True
 
 DELIVERY_MODES = {
     'regular':  DeliveryMode.regular,
diff --git a/Mailman/bin/testall.py b/Mailman/bin/testall.py
index b722e427c..5e27f1838 100644
--- a/Mailman/bin/testall.py
+++ b/Mailman/bin/testall.py
@@ -38,7 +38,6 @@ from Mailman.i18n import _
 from Mailman.initialize import initialize_1, initialize_2
 
 basedir = None
-__i18n_templates__ = True
 
 
 
diff --git a/Mailman/bin/unshunt.py b/Mailman/bin/unshunt.py
index b4352694a..115942301 100644
--- a/Mailman/bin/unshunt.py
+++ b/Mailman/bin/unshunt.py
@@ -23,8 +23,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.queue import Switchboard
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/update.py b/Mailman/bin/update.py
index 5ab165fad..08caf37f7 100644
--- a/Mailman/bin/update.py
+++ b/Mailman/bin/update.py
@@ -40,7 +40,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
 
 FRESH = 0
 NOTFRESH = -1
diff --git a/Mailman/bin/version.py b/Mailman/bin/version.py
index c50de1b2b..917d1d9e6 100644
--- a/Mailman/bin/version.py
+++ b/Mailman/bin/version.py
@@ -20,8 +20,6 @@ import optparse
 from Mailman import Version
 from Mailman.i18n import _
 
-__i18n_templates__ = True
-
 
 
 def parseargs():
diff --git a/Mailman/bin/withlist.py b/Mailman/bin/withlist.py
index 03cc4be59..3b76d0fe2 100644
--- a/Mailman/bin/withlist.py
+++ b/Mailman/bin/withlist.py
@@ -26,8 +26,6 @@ from Mailman.configuration import config
 from Mailman.i18n import _
 from Mailman.initialize import initialize
 
-__i18n_templates__ = True
-
 LAST_MLIST  = None
 VERBOSE     = True