From 666311ab88c0ffc5a18a466557c43e40f96dd2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 29 Jan 2023 15:16:18 +0100
Subject: [PATCH] Fix

---
 conf/config.yml |  2 +-
 manifest.json   | 10 ----------
 scripts/install |  8 +++-----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/conf/config.yml b/conf/config.yml
index 2c6298c..60e30e4 100644
--- a/conf/config.yml
+++ b/conf/config.yml
@@ -4,7 +4,7 @@ parameters:
   title: GitList
 
   # Locale configuration
-  locale: __LANGUAGE__
+  locale: en
 
   # Theme
   theme: default
diff --git a/manifest.json b/manifest.json
index 991ac8b..c7971e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,16 +37,6 @@
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
-            },
-            {
-                "name": "language",
-                "type": "string",
-                "ask": {
-                    "en": "Choose the application language",
-                    "fr": "Choisissez la langue de l'application"
-                },
-                "choices": ["fr", "en"],
-                "default": "fr"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index b1c3b9f..cd35948 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,7 +27,6 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
-language=$YNH_APP_ARG_LANGUAGE
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -43,6 +42,8 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
 
+datadir=/home/yunohost.app/$app
+
 # Register (book) web path
 ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
@@ -53,10 +54,10 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
 ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -100,9 +101,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Creating a data directory..." --weight=1
 
-datadir=/home/yunohost.app/$app
-ynh_app_setting_set --app=$app --key=datadir --value=$datadir
-
 mkdir -p $datadir
 
 chmod 750 "$datadir"