From: mortenp <none@none>
Date: Sun, 10 Jun 2007 20:33:06 +0000 (+1000)
Subject: Moved English listtexts and install all languages (Ansgar Burchardt)
X-Git-Tag: RELEASE_1_2_15_RC1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92800135d3dea8a357dc8ccc5158016de483d9ee;p=thirdparty%2Fmlmmj.git

Moved English listtexts and install all languages (Ansgar Burchardt)
---

diff --git a/ChangeLog b/ChangeLog
index 58cfdead..96ef9fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/Makefile.am b/Makefile.am
index 0fe90a34..17fc4c70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 --git a/listtexts/Makefile.am b/listtexts/Makefile.am
index 2a8886fa..3c26c0cd 100644
--- a/listtexts/Makefile.am
+++ b/listtexts/Makefile.am
@@ -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 --git a/src/mlmmj-make-ml.sh.in b/src/mlmmj-make-ml.sh.in
index e3d45439..da906234 100755
--- a/src/mlmmj-make-ml.sh.in
+++ b/src/mlmmj-make-ml.sh.in
@@ -89,23 +89,33 @@ if [ -z "$OWNER" ]; then
 fi
 echo "$OWNER" > "$LISTDIR"/"control/owner"
 
-TEXTPATHDEF=@textlibdir@
-echo -n "The path to texts for the list? [$TEXTPATHDEF] : "
-read TEXTPATHIN
-if [ -z "$TEXTPATHIN" ] ; then
-	TEXTPATH=$TEXTPATHDEF
-else
-	TEXTPATH=$TEXTPATHIN
-fi
-if [ ! -d "$TEXTPATH" ]; then
+(
+	cd "@textlibdir@"
 	echo
-        echo "**NOTE** Could not copy the texts for the list"
-        echo "Please manually copy the files from the listtexts/ directory"
-        echo "in the source distribution of mlmmj."
-	sleep 2
-else
-        cp "$TEXTPATH"/* "$LISTDIR"/"text"
-fi
+	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"
+	else
+		TEXTPATH="$TEXTPATHIN"
+	fi
+	if [ ! -d "$TEXTPATH" ]; then
+		echo
+		echo "**NOTE** Could not copy the texts for the list"
+		echo "Please manually copy the files from the listtexts/ directory"
+		echo "in the source distribution of mlmmj."
+		sleep 2
+	else
+		cp "$TEXTPATH"/* "$LISTDIR"/"text"
+	fi
+)
 
 LISTADDRESS="$LISTNAME@$FQDN"
 echo "$LISTADDRESS" > "$LISTDIR"/control/"listaddress"