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

Merge pull request #4315 from Nicofuma/ticket/14628

Browse Source 
[ticket/14628] Supports translatable error messages in the CLI installer
This commit is contained in:
Marc Alexander 2016-05-16 14:05:24 +02:00
commit 90cefcf0f4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/install/helper/iohandler/cli_iohandler.php
View File

@ -124,13 +124,14 @@ class cli_iohandler extends iohandler_base
public function add_error_message($error_title, $error_description = false) public function add_error_message($error_title, $error_description = false)
{ {
$this->io->newLine(); $this->io->newLine();
if (strpos($error_title, '<br />') !== false)
{
$error_title = strip_tags(str_replace('<br />', "\n", $error_title));
}
$message = $this->translate_message($error_title, $error_description); $message = $this->translate_message($error_title, $error_description);
$message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : '');
if (strpos($message_string, '<br />') !== false)
{
$message_string = strip_tags(str_replace('<br />', "\n", $message_string));
}
$this->io->error($message_string); $this->io->error($message_string);
if ($this->progress_bar !== null) if ($this->progress_bar !== null)