summaryrefslogtreecommitdiff
path: root/src/mailman/config
diff options
context:
space:
mode:
authorBarry Warsaw2011-03-16 15:17:17 -0400
committerBarry Warsaw2011-03-16 15:17:17 -0400
commit4943fba2eb4d812c20dbae1a61ce5e3b56d9a4d7 (patch)
treeef32d56c3721081ea31090a3f249c9b4a01af6a0 /src/mailman/config
parent2c562fd0191b0af04511dad2b0d0ae57b31198e7 (diff)
parent99c83c30436c5d6e4704374a37a4ad38e0a5a0aa (diff)
downloadmailman-4943fba2eb4d812c20dbae1a61ce5e3b56d9a4d7.tar.gz
mailman-4943fba2eb4d812c20dbae1a61ce5e3b56d9a4d7.tar.zst
mailman-4943fba2eb4d812c20dbae1a61ce5e3b56d9a4d7.zip
Another step in the removal of the mailman.Utils module. This removes
Utils.maketext() and Utils.findtext() in favor of better implementations in mailman.utilities.i18n. We're nearly there!
Diffstat (limited to 'src/mailman/config')
-rw-r--r--src/mailman/config/config.py6
-rw-r--r--src/mailman/config/schema.cfg6
2 files changed, 12 insertions, 0 deletions
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index 4cfb6b5a5..636b9ef9e 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -34,6 +34,8 @@ from string import Template
from zope.component import getUtility
from zope.interface import Interface, implements
+import mailman.templates
+
from mailman import version
from mailman.interfaces.languages import ILanguageManager
from mailman.styles.manager import StyleManager
@@ -176,6 +178,10 @@ class Configuration:
pipermail_public_dir = category.pipermail_public_dir,
queue_dir = category.queue_dir,
var_dir = var_dir,
+ template_dir = (
+ os.path.dirname(mailman.templates.__file__)
+ if category.template_dir == ':source:'
+ else category.template_dir),
# Files.
creator_pw_file = category.creator_pw_file,
lock_file = category.lock_file,
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index f789d28f9..09f575459 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -103,6 +103,12 @@ pipermail_public_dir: $var_dir/archives/public
# Directory for private Pipermail archiver artifacts.
pipermail_private_dir: $var_dir/archives/private
#
+# Where Mailman looks for its templates. This can either be a file system
+# path or the special symbol ':source:' to locate them within the source tree
+# (specifically, inside the mailman.templates package directory).
+#
+template_dir: :source:
+#
# There are also a number of paths to specific file locations that can be
# defined. For these, the directory containing the file must already exist,
# or be one of the directories created by Mailman as per above.