=== modified file 'src/mailman/utilities/i18n.py'
--- src/mailman/utilities/i18n.py	2011-05-08 03:35:18 +0000
+++ src/mailman/utilities/i18n.py	2011-05-25 19:51:28 +0000
@@ -63,9 +63,9 @@
     languages.reverse()
     # File system locations to search.
     paths = [config.TEMPLATE_DIR,
-             os.path.join(config.TEMPLATE_DIR, 'site')]
+             os.path.join(config.LIST_DATA_DIR,'templates','site')]
     if mailing_list is not None:
-        paths.append(os.path.join(config.TEMPLATE_DIR,
+        paths.append(os.path.join(config.LIST_DATA_DIR,'templates',
                                   mailing_list.host_name))
         paths.append(os.path.join(config.LIST_DATA_DIR,
                                   mailing_list.fqdn_listname))
@@ -90,10 +90,10 @@
       <var_dir>/lists/<fqdn_listname>/<language>
 
     * The domain-specific language directory
-      <template_dir>/<list-host-name>/<language>
+      <var_dir>/templates/<list-host-name>/<language>
 
     * The site-wide language directory
-      <template_dir>/site/<language>
+      <var_dir>/templates/site/<language>
 
     * The global default language directory
       <template_dir>/<language>
@@ -102,7 +102,7 @@
     templates at the desired level, or if you only use the default templates,
     you don't need to change anything.  NEVER modify files in
     <template_dir>/<language> since Mailman will overwrite these when you
-    upgrade.  Instead you can use <template_dir>/site.
+    upgrade.  Instead you can use <var_dir>/templates/site.
 
     The <language> path component is calculated as follows, in this order:
 
@@ -118,23 +118,23 @@
     in order:
 
     * <var_dir>/lists/test@example.com/it/foo.txt
-    * <template_dir>/example.com/it/foo.txt
-    * <template_dir>/site/it/foo.txt
+    * <var_dir>/templates/example.com/it/foo.txt
+    * <var_dir>/templates/site/it/foo.txt
     * <template_dir>/it/foo.txt
 
     * <var_dir>/lists/test@example.com/de/foo.txt
-    * <template_dir>/example.com/de/foo.txt
-    * <template_dir>/site/de/foo.txt
+    * <var_dir>/templates/example.com/de/foo.txt
+    * <var_dir>/templates/site/de/foo.txt
     * <template_dir>/de/foo.txt
 
     * <var_dir>/lists/test@example.com/fr/foo.txt
-    * <template_dir>/example.com/fr/foo.txt
-    * <template_dir>/site/fr/foo.txt
+    * <var_dir>/templates/example.com/fr/foo.txt
+    * <var_dir>/templates/site/fr/foo.txt
     * <template_dir>/fr/foo.txt
 
     * <var_dir>/lists/test@example.com/en/foo.txt
-    * <template_dir>/example.com/en/foo.txt
-    * <template_dir>/site/en/foo.txt
+    * <var_dir>/templates/example.com/en/foo.txt
+    * <var_dir>/templates/site/en/foo.txt
     * <template_dir>/en/foo.txt
 
     :param template_file: The name of the template file to search for.