1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/rainloop_ynh.git synced 2024-09-03 20:16:18 +02:00

Merge pull request #9 from Djip007/master

correction issues :
This commit is contained in:
Djip007 2016-01-24 22:30:15 +01:00
commit b7f8bd356b
2 changed files with 24 additions and 9 deletions

View file

@ -57,6 +57,15 @@
}, },
"choices": ["Yes", "No"], "choices": ["Yes", "No"],
"default": "Yes" "default": "Yes"
},
{
"name": "lang",
"ask": {
"en": "Select default language",
"fr": "Definir la langue par defaut"
},
"choices": ["English", "Francais"],
"default": "English"
} }
] ]
} }

View file

@ -8,6 +8,7 @@ app=rainloop
is_public=$3 is_public=$3
password=$4 password=$4
ldap=$5 ldap=$5
lang=$6
# Removal of trailing / # Removal of trailing /
if [ $path = "/" ] if [ $path = "/" ]
@ -54,13 +55,18 @@ app=rainloop
sudo mkdir -p $rainloop_path/data/_data_/_default_/configs/ sudo mkdir -p $rainloop_path/data/_data_/_default_/configs/
application_file=$rainloop_path/data/_data_/_default_/configs/application.ini application_file=$rainloop_path/data/_data_/_default_/configs/application.ini
# Set lang # Set lang => define from install manifest
if [ $(echo $LANG | cut -c1-2) == "fr" ] case "$lang" in
then Francais)
lang=fr lang="fr"
else ;;
lang=en English)
fi lang="en"
;;
*)
lang="en"
esac
# Set plugins # Set plugins
plugins="ynh-login-mapping" plugins="ynh-login-mapping"
@ -85,8 +91,8 @@ app=rainloop
# get list of ldap domains # 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://" ` 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 for ldomain in $alldomains ; do
sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$domain.ini sudo cp ../conf/data/domains/domain.tld.ini $rainloop_path/data/_data_/_default_/domains/$ldomain.ini
done done
sudo cp ../conf/data/domains/disabled $rainloop_path/data/_data_/_default_/domains/disabled sudo cp ../conf/data/domains/disabled $rainloop_path/data/_data_/_default_/domains/disabled