diff --git a/README.md b/README.md index 2230b78..210e8df 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Grocy is a web-based self-hosted groceries & household management solution for y ## Configuration Default login - user: **admin** - password: **admin** + * user: **admin** + * password: **admin** ## Documentation diff --git a/README_fr.md b/README_fr.md index 3bdc065..08f09ca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,8 +24,8 @@ Grocy is a web-based self-hosted groceries & household management solution for y ## Configuration Connexion par défaut - utilisateur : **admin** - mot de passe : **admin** + * utilisateur : **admin** + * mot de passe : **admin** ## Documentation diff --git a/manifest.json b/manifest.json index 25f3e77..72be1a0 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.0.0" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -25,10 +25,6 @@ "install": [{ "name": "domain", "type": "domain", - "help": { - "en": "Grocy needs to be installed in its own root domain or subdomain.", - "fr": "Grocy doit être installé dans son propre domaine racine ou sous-domaine." - }, "example": "grocy.example.com" }, { @@ -44,10 +40,6 @@ { "name": "is_public", "type": "boolean", - "help": { - "en": "If enabled, Grocy will be accessible by people who do not have an account. This can be changed later via the webadmin.", - "fr": "Si cette case est cochée, Grocy sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, "default": true } ] diff --git a/scripts/install b/scripts/install index c0f0fb2..0e41654 100644 --- a/scripts/install +++ b/scripts/install @@ -85,9 +85,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # MODIFY A CONFIG FILE #================================================= -cp -a ../conf/config-dist.php "$final_path/data/config.php" - -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/data/config.php" +ynh_add_config --template="../conf/config-dist.php" --destination="$final_path/data/config.php" #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index b233f3b..b67a01c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -115,10 +115,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # MODIFY A CONFIG FILE #================================================= -cp -a ../conf/config-dist.php "$final_path/data/config.php" - -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/data/config.php" - +ynh_add_config --template="../conf/config-dist.php" --destination="$final_path/data/config.php" #================================================= # SECURE FILES AND DIRECTORIES