diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-05-05 17:05:17 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-05-05 17:05:17 +0200 |
| commit | 1629e6aaf36092241eaf6c745af5c3b38f8182b3 (patch) | |
| tree | afeff35faac7eed743ed1ef461ad7d4333a26a27 /phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | |
| parent | ef226138c88bd47924e3c665323bea8791cad375 (diff) | |
| download | forums-1629e6aaf36092241eaf6c745af5c3b38f8182b3.tar forums-1629e6aaf36092241eaf6c745af5c3b38f8182b3.tar.gz forums-1629e6aaf36092241eaf6c745af5c3b38f8182b3.tar.bz2 forums-1629e6aaf36092241eaf6c745af5c3b38f8182b3.tar.xz forums-1629e6aaf36092241eaf6c745af5c3b38f8182b3.zip | |
[ticket/14628] Supports translatable error messages in the CLI installer
PHPBB3-14628
Diffstat (limited to 'phpBB/phpbb/install/helper/iohandler/cli_iohandler.php')
| -rw-r--r-- | phpBB/phpbb/install/helper/iohandler/cli_iohandler.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php index 94550d2db0..2a41cb10ba 100644 --- a/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php +++ b/phpBB/phpbb/install/helper/iohandler/cli_iohandler.php @@ -124,13 +124,14 @@ class cli_iohandler extends iohandler_base public function add_error_message($error_title, $error_description = false) { $this->io->newLine(); + $message = $this->translate_message($error_title, $error_description); + $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); - if (strpos($error_title, '<br />') !== false) + if (strpos($message_string, '<br />') !== false) { - $error_title = strip_tags(str_replace('<br />', "\n", $error_title)); + $message_string = strip_tags(str_replace('<br />', "\n", $message_string)); } - $message = $this->translate_message($error_title, $error_description); - $message_string = $message['title'] . (!empty($message['description']) ? "\n" . $message['description'] : ''); + $this->io->error($message_string); if ($this->progress_bar !== null) |