diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-05-16 14:05:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-05-16 14:05:24 +0200 |
| commit | 90cefcf0f40c80b05454de4961ac23f549e75a42 (patch) | |
| tree | ab0796a8682f4fbc0750d076a4fc8de175579499 /phpBB/phpbb | |
| parent | 7a28b7514a1ce70ada330c3e38c5836ab5d86abd (diff) | |
| parent | 1629e6aaf36092241eaf6c745af5c3b38f8182b3 (diff) | |
| download | forums-90cefcf0f40c80b05454de4961ac23f549e75a42.tar forums-90cefcf0f40c80b05454de4961ac23f549e75a42.tar.gz forums-90cefcf0f40c80b05454de4961ac23f549e75a42.tar.bz2 forums-90cefcf0f40c80b05454de4961ac23f549e75a42.tar.xz forums-90cefcf0f40c80b05454de4961ac23f549e75a42.zip | |
Merge pull request #4315 from Nicofuma/ticket/14628
[ticket/14628] Supports translatable error messages in the CLI installer
Diffstat (limited to 'phpBB/phpbb')
| -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) |