[Pkg-mailman-hackers] Pkg-mailman commit - rev 54 - trunk/debian

[Laszlo Boszormenyi]

Author: gcs-guest
Date: 2004-04-12 14:46:57 -0600 (Mon, 12 Apr 2004)
New Revision: 54

Modified:
   trunk/debian/changelog
   trunk/debian/config
   trunk/debian/mm_cfg.py
   trunk/debian/postinst
   trunk/debian/templates
Log:
DEFAULT_SERVER_LANGUAGE support based on the enabled languages.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-04-11 21:00:09 UTC (rev 53)
+++ trunk/debian/changelog	2004-04-12 20:46:57 UTC (rev 54)
@@ -7,6 +7,8 @@
     (bsb, closes: #242945).
   * Fix Woody FTBFS, reported and solution provided by Andreas Barth
     <aba@not.so.argh.org>, (by GCS, closes: #243209).
+  * Ask for the language used by Mailman from the enabled languages
+    (by GCS, closes: #224319).
 
  -- Siggy Brentrup <bsb@debian.org>  Sat, 10 Apr 2004 12:46:59 +0200
 

Modified: trunk/debian/config
===================================================================
--- trunk/debian/config	2004-04-11 21:00:09 UTC (rev 53)
+++ trunk/debian/config	2004-04-12 20:46:57 UTC (rev 54)
@@ -83,6 +83,11 @@
 fi
 
 db_input high mailman/site_languages || true
+# Let the db go, and ask the user, so we won't get back a stale setting
+db_go || true
+db_get mailman/site_languages && selected_languages=${RET}
+db_subst mailman/default_server_language site_languages "${selected_languages}"
+db_input high mailman/default_server_language || true
 
 if [ -f "${crontab}" ]; then
   COMMENT=`awk '/^.*gate_news/ { print substr($1,1,1) } ' < ${crontab}`

Modified: trunk/debian/mm_cfg.py
===================================================================
--- trunk/debian/mm_cfg.py	2004-04-11 21:00:09 UTC (rev 53)
+++ trunk/debian/mm_cfg.py	2004-04-12 20:46:57 UTC (rev 54)
@@ -71,6 +71,10 @@
 add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)
 
 #-------------------------------------------------------------
+# The default language for this server.
+DEFAULT_SERVER_LANGUAGE='en'
+
+#-------------------------------------------------------------
 # Iirc this was used in pre 2.1, leave it for now
 USE_ENVELOPE_SENDER    = 0              # Still used?
 

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2004-04-11 21:00:09 UTC (rev 53)
+++ trunk/debian/postinst	2004-04-12 20:46:57 UTC (rev 54)
@@ -120,6 +120,12 @@
       done
       echo " done." >&2
     done
+    db_get mailman/default_server_language || true
+    if [ ${RET} ]; then
+      default_server_language=${RET}
+      sed -e s/DEFAULT_SERVER_LANGUAGE=\'..\'/DEFAULT_SERVER_LANGUAGE=\'${default_server_language}\'/ ${mm_etc}/mm_cfg.py > ${mm_etc}/mm_cfg.py.$$
+      mv -f ${mm_etc}/mm_cfg.py.$$ ${mm_etc}/mm_cfg.py
+    fi
     # Done with site language stuff
 
     # Don't forget the qmail specific stuff (but why support non-free?)

Modified: trunk/debian/templates
===================================================================
--- trunk/debian/templates	2004-04-11 21:00:09 UTC (rev 53)
+++ trunk/debian/templates	2004-04-12 20:46:57 UTC (rev 54)
@@ -39,3 +39,10 @@
  To create the list, run "newlist mailman" and follow the instructions
  on-screen.  Note that you also need to start mailman after that,
  using /etc/init.d/mailman start.
+
+Template: mailman/default_server_language
+Type: select
+Choices: ${site_languages}
+Description: Which language should be the default for Mailman?
+ The web page will be shown in this language, and in general, Mailman
+ will use this language to communicate with the user.