1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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
This commit is contained in:
Tristan Darricau
2016-04-12 11:27:03 +02:00
2 changed files with 18 additions and 10 deletions

View File

@@ -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)
{