Moved English listtexts and install all languages (Ansgar Burchardt)

diff --git a/ChangeLog b/ChangeLog
index 58cfdead65ecdbafd0bc2354c7c1f607113bd7a8..96ef9fe37ef411d55c17ac137667b08790cc6c10 100644 (file)
--- 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 0fe90a34058ce9b093c65507e179747f08ca0852..17fc4c703e4a1d49058e42c954d8eafbd498fa6a 100644 (file)
--- 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 2a8886fa01472f5c09820b905659ef9e5565da7a..3c26c0cdb5145d8d721e33955722683d7862bfc3 100644 (file)
--- 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 e3d454397a12ee3d5180cce10ea76a5467a56c3c..da9062348026a3b37b8efea144d27c305b30f855 100755 (executable)
--- 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"