# HG changeset patch
# User mortenp
# Date 1181507586 -36000
# Node ID fd821d26f56be078960b0951ec3414ed49f35e75
# Parent  5ebd172c989c4ab4c68600b29e625a06b0292bae
Moved English listtexts and install all languages (Ansgar Burchardt)

diff -r 5ebd172c989c -r fd821d26f56b ChangeLog
--- a/ChangeLog	Mon Jun 11 06:31:41 2007 +1000
+++ b/ChangeLog	Mon Jun 11 06:33:06 2007 +1000
@@ -1,3 +1,4 @@
+ o Moved English listtexts and install all languages (Ansgar Burchardt)
  o Added encoding headers for German listtexts (Ansgar Burchardt)
  o Fixed missing exit()s in case of failed execl() calls (Ansgar Burchardt)
  o Changed Message-ID headers to include FQDN (Ansgar Burchardt)
diff -r 5ebd172c989c -r fd821d26f56b Makefile.am
--- a/Makefile.am	Mon Jun 11 06:31:41 2007 +1000
+++ b/Makefile.am	Mon Jun 11 06:33:06 2007 +1000
@@ -2,8 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 EXTRA_DIST = include VERSION LICENSE UPGRADE src/log_error.c FAQ \
-	     TUNABLES README.access contrib man listtexts/cz listtexts/da \
-	     listtexts/de listtexts/es listtexts/fr listtexts/it listtexts/nl \
+	     TUNABLES README.access contrib man \
 	     README.exim4 README.sendmail README.security README.qmail
 CLEANFILES = *~ mlmmj-*.tar.*
 
diff -r 5ebd172c989c -r fd821d26f56b listtexts/Makefile.am
--- a/listtexts/Makefile.am	Mon Jun 11 06:31:41 2007 +1000
+++ b/listtexts/Makefile.am	Mon Jun 11 06:33:06 2007 +1000
@@ -1,10 +1,3 @@
 ## Process this file with automake to produce Makefile.in
 
-dist_textlib_DATA = access bounce-probe listhelp listfaq moderation notifysub \
-	notifysub-digest notifysub-nomail notifyunsub notifyunsub-digest \
-	notifyunsub-nomail notintocc sub-confirm sub-confirm-digest \
-	sub-confirm-nomail sub-deny-digest sub-deny-nomail sub-ok \
-	sub-ok-digest sub-ok-nomail subonlypost unsub-confirm \
-	unsub-confirm-digest unsub-confirm-nomail \
-	unsub-ok unsub-ok-digest unsub-ok-nomail listsubs sub-subscribed \
-	unsub-notsubscribed digest submod-moderator submod-requester
+nobase_dist_textlib_DATA = ??/????*
diff -r 5ebd172c989c -r fd821d26f56b src/mlmmj-make-ml.sh.in
--- a/src/mlmmj-make-ml.sh.in	Mon Jun 11 06:31:41 2007 +1000
+++ b/src/mlmmj-make-ml.sh.in	Mon Jun 11 06:33:06 2007 +1000
@@ -89,13 +89,22 @@
 fi
 echo "$OWNER" > "$LISTDIR"/"control/owner"
 
-TEXTPATHDEF=@textlibdir@
+(
+	cd "@textlibdir@"
+	echo
+	echo "For the list texts you can choose between the following languages or"
+	echo "give a absolute path to a directory containing the texts."
+	echo
+	echo "Available languages:"
+	ls
+
+	TEXTPATHDEF=en
 echo -n "The path to texts for the list? [$TEXTPATHDEF] : "
 read TEXTPATHIN
 if [ -z "$TEXTPATHIN" ] ; then
-	TEXTPATH=$TEXTPATHDEF
+		TEXTPATH="$TEXTPATHDEF"
 else
-	TEXTPATH=$TEXTPATHIN
+		TEXTPATH="$TEXTPATHIN"
 fi
 if [ ! -d "$TEXTPATH" ]; then
 	echo
@@ -106,6 +115,7 @@
 else
         cp "$TEXTPATH"/* "$LISTDIR"/"text"
 fi
+)
 
 LISTADDRESS="$LISTNAME@$FQDN"
 echo "$LISTADDRESS" > "$LISTDIR"/control/"listaddress"