From 8dc2f26f958763099d8489e47c56c7d842f6e365 Mon Sep 17 00:00:00 2001
From: Djip007 <djip.perois@free.fr>
Date: Fri, 15 Jan 2016 00:22:31 +0100
Subject: [PATCH] correction issues : - $domain variable issue #3 - Language
 configuration #4

---
 manifest.json   |  9 +++++++++
 scripts/install | 24 +++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index a44d6d7..d162dd2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -57,6 +57,15 @@
                 },
                 "choices": ["Yes", "No"],
                 "default": "Yes"
+			},
+			{
+               "name": "lang",
+                "ask": {
+                    "en": "Select default language",
+                    "fr": "Definir la langue par defaut"
+                },
+                "choices": ["English", "Francais"],
+                "default": "English"
 			}
         ]
     }
diff --git a/scripts/install b/scripts/install
index 63963d3..ac228ae 100644
--- a/scripts/install
+++ b/scripts/install
@@ -8,6 +8,7 @@ app=rainloop
 	is_public=$3
 	password=$4
 	ldap=$5
+	lang=$6
 
 # Removal of trailing /
 	if [ $path = "/" ]
@@ -54,13 +55,18 @@ app=rainloop
 	sudo mkdir -p $rainloop_path/data/_data_/_default_/configs/
 	application_file=$rainloop_path/data/_data_/_default_/configs/application.ini
 
-	# Set lang
-	if [ $(echo $LANG | cut -c1-2) == "fr" ]
-	then
-		lang=fr
-	else
-		lang=en
-	fi
+	# Set lang => define from install manifest
+	case "$lang" in
+        Francais)
+            lang="fr"
+            ;;
+        English)
+            lang="en"
+            ;;
+        *)
+            lang="en"
+	esac
+	
 	
 	# Set plugins
 	plugins="ynh-login-mapping"
@@ -85,8 +91,8 @@ app=rainloop
 
 	# get list of ldap domains
 	alldomains=`ldapsearch -LLL -x -b ou=domains,dc=yunohost,dc=org -s one "objectclass=top" virtualdomain | grep -v "dn:" | sed "s/virtualdomain://" `
-	for domain in $alldomains ; do
-		sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$domain.ini
+	for ldomain in $alldomains ; do
+		sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$ldomain.ini
 	done
 	sudo cp ../conf/data/domains/disabled $rainloop_path/data/_data_/_default_/domains/disabled