[Pkg-mailman-hackers] Pkg-mailman commit - rev 168 - branches/pkg-split/core/debian

[Bernd S. Brentrup]

Author: bsb
Date: 2004-06-01 12:17:13 -0600 (Tue, 01 Jun 2004)
New Revision: 168

Modified:
   branches/pkg-split/core/debian/mailman.config
   branches/pkg-split/core/debian/mailman.postinst
Log:
The mailman/site_languages template is no longer used.


Modified: branches/pkg-split/core/debian/mailman.config
===================================================================
--- branches/pkg-split/core/debian/mailman.config	2004-06-01 18:12:20 UTC (rev 167)
+++ branches/pkg-split/core/debian/mailman.config	2004-06-01 18:17:13 UTC (rev 168)
@@ -114,9 +114,18 @@
     db.set('mailman/email_host', default_email_host)
     db_input(MEDIUM, 'mailman/email_host')
 
-    site_languages = db.get('mailman/site_languages')
-    langs = site_languages.split(', ')
-    if len(langs) > 1 and default_server_language not in langs:
+    try:
+        from Mailman.Defaults import LC_DESCRIPTIONS
+        langs = LC_DESCRIPTIONS.keys()
+        langs.sort()
+        site_languages = ', '.join(langs)
+    except ImportError:
+        site_languages = 'en'
+        langs = ['en']
+
+    if len(langs) == 1:
+        default_server_language = langs[0]
+    elif len(langs) > 1 and default_server_language not in langs:
         default_server_language = ''
     db.subst('mailman/default_server_language', 'site_languages', site_languages)
     db.set('mailman/default_server_language', default_server_language)

Modified: branches/pkg-split/core/debian/mailman.postinst
===================================================================
--- branches/pkg-split/core/debian/mailman.postinst	2004-06-01 18:12:20 UTC (rev 167)
+++ branches/pkg-split/core/debian/mailman.postinst	2004-06-01 18:17:13 UTC (rev 168)
@@ -443,6 +443,7 @@
     else:
         create_mm_cfg()
     update_cron()
+    db.stop()
     fix_perms()
     update_lists()