diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-04-12 11:27:03 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-04-12 11:27:03 +0200 |
| commit | 560bee1be41b2c8ef37eebd4d1304e3fc03a383b (patch) | |
| tree | f2581ba525ab04d5e68917bfc34032e02bf21df7 /phpBB/phpbb | |
| parent | 336f5b49a7f392ea6e979ef188ffda3caa6271b3 (diff) | |
| parent | 972255247bce8ea547483e4a22ed75bf4f6c2f42 (diff) | |
| download | forums-560bee1be41b2c8ef37eebd4d1304e3fc03a383b.tar forums-560bee1be41b2c8ef37eebd4d1304e3fc03a383b.tar.gz forums-560bee1be41b2c8ef37eebd4d1304e3fc03a383b.tar.bz2 forums-560bee1be41b2c8ef37eebd4d1304e3fc03a383b.tar.xz forums-560bee1be41b2c8ef37eebd4d1304e3fc03a383b.zip | |
Merge pull request #4284 from CHItA/ticket/14589
[ticket/14589] Add error messages for failable installer requirements
* CHItA/ticket/14589:
[ticket/14589] Fix grammatical errors in language strings
[ticket/14589] Add error messages for failable installer requirements
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/install/module/requirements/task/check_filesystem.php | 8 |
1 files changed, 6 insertions, 2 deletions
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) { |