mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-05 16:33:34 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [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
commit 94853ba2dd
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/language/en/install.php
View File

@ -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.',
'FILE_NOT_EXISTS' => 'File does not exist',
'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 exist for a better forum user experience.',
'FILE_NOT_WRITABLE' => 'File is 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_WRITABLE' => 'Directory not writable',
'DIRECTORY_NOT_WRITABLE_EXPLAIN' => 'To be able to install phpBB the %1$s directory needs to be writable.',
'DIRECTORY_NOT_EXISTS' => 'Directory does not exist',
'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 exist for a better forum user experience.',
'DIRECTORY_NOT_WRITABLE' => 'Directory is 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',

8
phpBB/phpbb/install/module/requirements/task/check_filesystem.php
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)
{