1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/getsimple_ynh.git synced 2024-09-03 18:36:25 +02:00

Merge remote-tracking branch 'origin/testing' into upgrade

This commit is contained in:
yalh76 2022-07-27 23:07:06 +02:00
commit 86f804d590
3 changed files with 16 additions and 6 deletions

View file

@ -71,7 +71,7 @@ define('GSDONOTPING', 1);
# Set PHP locale # Set PHP locale
# http://php.net/manual/en/function.setlocale.php # http://php.net/manual/en/function.setlocale.php
etlocale(LC_ALL, 'en_US'); etlocale(LC_ALL, '__LANGUAGE__');
# Define default timezone of server, accepts php timezone string # Define default timezone of server, accepts php timezone string
# valid timeszones can be found here http://www.php.net/manual/en/timezones.php # valid timeszones can be found here http://www.php.net/manual/en/timezones.php

View file

@ -44,6 +44,16 @@
"name": "is_public", "name": "is_public",
"type": "boolean", "type": "boolean",
"default": true "default": true
},
{
"name": "language",
"type": "string",
"ask": {
"en": "Choose the application language",
"fr": "Choisissez la langue de l'application"
},
"choices": ["de_DE", "en_US", "fr_FR", "nl_NL"],
"default": "fr_FR"
} }
] ]
} }

View file

@ -27,7 +27,7 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
language=en_US language=$YNH_APP_ARG_LANGUAGE
timezone="$(cat /etc/timezone)" timezone="$(cat /etc/timezone)"
phpversion=$YNH_PHP_VERSION phpversion=$YNH_PHP_VERSION
@ -102,12 +102,12 @@ ynh_add_fpm_config
#================================================= #=================================================
# ADD A CONFIGURATION # ADD A CONFIGURATION
#================================================= #=================================================
# ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_script_progression --message="Adding a configuration file..." --weight=1
# ynh_add_config --template="../conf/temp.gsconfig.php" --destination="$final_path/gsconfig.php" ynh_add_config --template="../conf/temp.gsconfig.php" --destination="$final_path/temp.gsconfig.php"
# chmod 655 "$final_path/gsconfig.php" # chmod 655 "$final_path/temp.gsconfig.php"
# chown $app:$app "$final_path/gsconfig.php" # chown $app:$app "$final_path/temp.gsconfig.php"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT