diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-04-10 10:30:15 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-04-10 10:30:15 +0200 |
| commit | 9163cc28647e9936fe9c9e390871f9130d2bf40b (patch) | |
| tree | 1d42148a5f41e7127738c6a958cfc5fc0c542f3a | |
| parent | 4e8981ee372e16caa1ebf1b36c877e06ed75bf3a (diff) | |
| download | forums-9163cc28647e9936fe9c9e390871f9130d2bf40b.tar forums-9163cc28647e9936fe9c9e390871f9130d2bf40b.tar.gz forums-9163cc28647e9936fe9c9e390871f9130d2bf40b.tar.bz2 forums-9163cc28647e9936fe9c9e390871f9130d2bf40b.tar.xz forums-9163cc28647e9936fe9c9e390871f9130d2bf40b.zip | |
[ticket/14589] Add error messages for failable installer requirements
PHPBB3-14589
| -rw-r--r-- | phpBB/language/en/install.php | 22 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/requirements/task/check_filesystem.php | 8 |
2 files changed, 19 insertions, 11 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 9a727be649..738b8af648 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -90,15 +90,19 @@ $lang = array_merge($lang, array( // Requirements translation $lang = array_merge($lang, array( // Filesystem requirements - 'FILE_NOT_EXISTS' => 'File not exists', - 'FILE_NOT_EXISTS_EXPLAIN' => 'To be able to install phpBB the %1$s file needs to exist.', - 'FILE_NOT_WRITABLE' => 'File not writable', - 'FILE_NOT_WRITABLE_EXPLAIN' => 'To be able to install phpBB the %1$s file needs to be writable.', - - 'DIRECTORY_NOT_EXISTS' => 'Directory not exists', - 'DIRECTORY_NOT_EXISTS_EXPLAIN' => 'To be able to install phpBB the %1$s directory needs to exist.', - 'DIRECTORY_NOT_WRITABLE' => 'Directory not writable', - 'DIRECTORY_NOT_WRITABLE_EXPLAIN' => 'To be able to install phpBB the %1$s directory needs to be writable.', + 'FILE_NOT_EXISTS' => 'File not exists', + 'FILE_NOT_EXISTS_EXPLAIN' => 'To be able to install phpBB the %1$s file needs to exist.', + 'FILE_NOT_EXISTS_EXPLAIN_OPTIONAL' => 'It is recommended that the %1$s file exists for a better forum user experience.', + 'FILE_NOT_WRITABLE' => 'File not writable', + 'FILE_NOT_WRITABLE_EXPLAIN' => 'To be able to install phpBB the %1$s file needs to be writable.', + 'FILE_NOT_WRITABLE_EXPLAIN_OPTIONAL' => 'It is recommended that the %1$s file be writable for a better forum user experience.', + + 'DIRECTORY_NOT_EXISTS' => 'Directory not exists', + 'DIRECTORY_NOT_EXISTS_EXPLAIN' => 'To be able to install phpBB the %1$s directory needs to exist.', + 'DIRECTORY_NOT_EXISTS_EXPLAIN_OPTIONAL' => 'It is recommended that the %1$s directory exists for a better forum user experience.', + 'DIRECTORY_NOT_WRITABLE' => 'Directory not writable', + 'DIRECTORY_NOT_WRITABLE_EXPLAIN' => 'To be able to install phpBB the %1$s directory needs to be writable.', + 'DIRECTORY_NOT_WRITABLE_EXPLAIN_OPTIONAL' => 'It is recommended that the %1$s directory be writable for a better forum user experience.', // Server requirements 'PHP_VERSION_REQD' => 'PHP version', diff --git a/phpBB/phpbb/install/module/requirements/task/check_filesystem.php b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php index 2aec3915e0..868af39433 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_filesystem.php +++ b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php @@ -177,7 +177,9 @@ class check_filesystem extends \phpbb\install\task_base if (!($exists && $writable)) { $title = ($exists) ? 'FILE_NOT_WRITABLE' : 'FILE_NOT_EXISTS'; - $description = array($title . '_EXPLAIN', $file); + $lang_suffix = '_EXPLAIN'; + $lang_suffix .= ($failable) ? '_OPTIONAL' : ''; + $description = array($title . $lang_suffix, $file); if ($failable) { @@ -244,7 +246,9 @@ class check_filesystem extends \phpbb\install\task_base if (!($exists && $writable)) { $title = ($exists) ? 'DIRECTORY_NOT_WRITABLE' : 'DIRECTORY_NOT_EXISTS'; - $description = array($title . '_EXPLAIN', $dir); + $lang_suffix = '_EXPLAIN'; + $lang_suffix .= ($failable) ? '_OPTIONAL' : ''; + $description = array($title . $lang_suffix, $dir); if ($failable) { |