From 8e684f76e5d599917b52ddfd0ea1d58e31222487 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 29 Nov 2017 09:50:40 +0100 Subject: Allow `{lang}` as a placeholder in the skeleton directory Signed-off-by: Joas Schilling --- config/config.sample.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/config.sample.php b/config/config.sample.php index 022b807a881..59fb1d13610 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -242,6 +242,9 @@ $CONFIG = array( * The directory where the skeleton files are located. These files will be * copied to the data directory of new users. Leave empty to not copy any * skeleton files. + * ``{lang}`` can be used as a placeholder for the language of the user. + * If the directory does not exist, it falls back to non dialect (from ``de_DE`` + * to ``de``). If that does not exist either, it falls back to ``en`` * * Defaults to ``core/skeleton`` in the Nextcloud directory. */ -- cgit v1.2.3 From 8ffd4428bbe5791e5353bd9d60d0a3127adcb332 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 8 Dec 2017 12:28:41 +0100 Subject: Fallback to "default" and check if directory exists Signed-off-by: Morris Jobke --- config/config.sample.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.sample.php b/config/config.sample.php index 59fb1d13610..0e69264b0db 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -244,7 +244,7 @@ $CONFIG = array( * skeleton files. * ``{lang}`` can be used as a placeholder for the language of the user. * If the directory does not exist, it falls back to non dialect (from ``de_DE`` - * to ``de``). If that does not exist either, it falls back to ``en`` + * to ``de``). If that does not exist either, it falls back to ``default`` * * Defaults to ``core/skeleton`` in the Nextcloud directory. */ @@ -866,6 +866,7 @@ $CONFIG = array( /** * custom path for LibreOffice/OpenOffice binary * + * * Defaults to ``''`` (empty string) */ 'preview_libreoffice_path' => '/usr/bin/libreoffice', -- cgit v1.2.3