Merge pull request phpbb#4284 from CHItA/ticket/14589

Nicofuma · Nicofuma · commit 560bee1be41b · 2016-04-12T11:27:03.000+02:00
[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
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
@@ -90,15 +90,19 @@
 // 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 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 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',
diff --git a/phpBB/phpbb/install/module/requirements/task/check_filesystem.php b/phpBB/phpbb/install/module/requirements/task/check_filesystem.php
@@ -177,7 +177,9 @@ protected function check_file($file, $failable = false)
 		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 @@ protected function check_dir($dir, $failable = false)
 		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)
 			{

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,9 @@ protected function check_file($file, $failable = false)`
`177`	`177`	`if (!($exists && $writable))`
`178`	`178`	`{`
`179`	`179`	`$title = ($exists) ? 'FILE_NOT_WRITABLE' : 'FILE_NOT_EXISTS';`
`180`		`- $description = array($title . '_EXPLAIN', $file);`
	`180`	`+ $lang_suffix = '_EXPLAIN';`
	`181`	`+ $lang_suffix .= ($failable) ? '_OPTIONAL' : '';`
	`182`	`+ $description = array($title . $lang_suffix, $file);`
`181`	`183`
`182`	`184`	`if ($failable)`
`183`	`185`	`{`
`@@ -244,7 +246,9 @@ protected function check_dir($dir, $failable = false)`
`244`	`246`	`if (!($exists && $writable))`
`245`	`247`	`{`
`246`	`248`	`$title = ($exists) ? 'DIRECTORY_NOT_WRITABLE' : 'DIRECTORY_NOT_EXISTS';`
`247`		`- $description = array($title . '_EXPLAIN', $dir);`
	`249`	`+ $lang_suffix = '_EXPLAIN';`
	`250`	`+ $lang_suffix .= ($failable) ? '_OPTIONAL' : '';`
	`251`	`+ $description = array($title . $lang_suffix, $dir);`
`248`	`252`
`249`	`253`	`if ($failable)`
`250`	`254`	`{`