From df7f50e2f0b65237c93a3c83cd6cd819fbb66249 Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:34:05 +0200 Subject: [PATCH 1/8] Update manifest.json --- manifest.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 54f1a21..db2d7be 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,16 @@ }, "example": "/jappix", "default": "/jappix" - } + }, + { + "name": "language", + "ask": { + "en": "Choose the language of the Jappix", + "fr": "Choissisez la langue du Jappix" + }, + "example": "en", + "default": "en" + } ] } } From 1d68ea0a1278f455e6eb7ccd49a5ccce40b58aea Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:38:45 +0200 Subject: [PATCH 2/8] Update install --- scripts/install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/install b/scripts/install index d5e2e1a..011bf9d 100644 --- a/scripts/install +++ b/scripts/install @@ -3,6 +3,7 @@ # Retrieve arguments domain=$1 path=$2 +language=$3 # Check domain/path availability sudo yunohost app checkurl $domain$path -a jappix @@ -29,6 +30,12 @@ if [ -z "$path" ]; then path="/" fi +ls $final_path/lang/$language > /dev/null 2>&1 +if [ $? != 0 ]; +then + language="en" +fi + sudo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf From 8e3528ae1506da2fac4b478b98cad0b60e0aceea Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:41:59 +0200 Subject: [PATCH 3/8] Update main.xml --- conf/main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/main.xml b/conf/main.xml index 9dbd7eb..a956031 100644 --- a/conf/main.xml +++ b/conf/main.xml @@ -5,7 +5,7 @@ - fr + CHANGELANG YunoJappix on off From 4133369f65e31f7923d81503396fd15f2ce2b19b Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:42:41 +0200 Subject: [PATCH 4/8] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 011bf9d..2ddcde5 100644 --- a/scripts/install +++ b/scripts/install @@ -42,6 +42,7 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/main.xml sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/hosts.xml sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/main.xml +sudo sed -i "s@CHANGELANG@$language@g" $final_path/store/conf/main.xml sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/hosts.xml # Reload Nginx and regenerate SSOwat conf From 81ecc4040ff4300adc1d9767b6b65a55de94e8b2 Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:44:46 +0200 Subject: [PATCH 5/8] Update upgrade --- scripts/upgrade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e9e2b79..cdae215 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,6 +3,12 @@ # Retrieve arguments domain=$(sudo yunohost app setting jappix domain) path=$(sudo yunohost app setting jappix path) +language=$(sudo yunohost app setting jappix language) + +if [[ "$language" = "" ]]; +then + language="en" +fi # Remove trailing "/" for next commands From 4f275d62bfce08862d0029d7decc9fbee2894220 Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:45:18 +0200 Subject: [PATCH 6/8] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 2ddcde5..aab17d4 100644 --- a/scripts/install +++ b/scripts/install @@ -30,7 +30,7 @@ if [ -z "$path" ]; then path="/" fi -ls $final_path/lang/$language > /dev/null 2>&1 +sudo ls $final_path/lang/$language > /dev/null 2>&1 if [ $? != 0 ]; then language="en" From 464c89348c2768497c7b693c9a38d52a4e280904 Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:45:33 +0200 Subject: [PATCH 7/8] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index cdae215..20c569d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,6 +36,7 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/main.xml sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/hosts.xml sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/main.xml +sudo sed -i "s@CHANGELANG@$language@g" $final_path/store/conf/main.xml sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/hosts.xml # Reload Nginx and regenerate SSOwat conf From de54d826d0f9cd598c520ab03d4f523d9429bd88 Mon Sep 17 00:00:00 2001 From: abeudin Date: Wed, 18 Jun 2014 11:46:29 +0200 Subject: [PATCH 8/8] Update install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index aab17d4..036fb30 100644 --- a/scripts/install +++ b/scripts/install @@ -36,6 +36,8 @@ then language="en" fi +sudo yunohost app setting jappix language -v $language + sudo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf