diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-08-22 11:59:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-08-22 11:59:26 +0200 |
| commit | 5f4726e607691c831c3dcbd388b14ed506a1c5de (patch) | |
| tree | 05011396f989b1ed0b9e01ecb81c4d2b47f2ba4e | |
| parent | 3dd5712504a3e61faaad6a6b13eec289526ff8c5 (diff) | |
| parent | d2ed2c4e1e87a8cf84454d04190a44e78a832d04 (diff) | |
| download | forums-5f4726e607691c831c3dcbd388b14ed506a1c5de.tar forums-5f4726e607691c831c3dcbd388b14ed506a1c5de.tar.gz forums-5f4726e607691c831c3dcbd388b14ed506a1c5de.tar.bz2 forums-5f4726e607691c831c3dcbd388b14ed506a1c5de.tar.xz forums-5f4726e607691c831c3dcbd388b14ed506a1c5de.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13003] Add missing language keys
| -rw-r--r-- | phpBB/language/en/cli.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/extension/show.php | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index eb0f5bb357..0e7dc39b95 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -73,6 +73,9 @@ $lang = array_merge($lang, array( 'CLI_EXTENSION_PURGE_FAILURE' => 'Could not purge extension %s', 'CLI_EXTENSION_PURGE_SUCCESS' => 'Successfully purged extension %s', 'CLI_EXTENSION_NOT_FOUND' => 'No extensions were found.', + 'CLI_EXTENSIONS_AVAILABLE' => 'Available', + 'CLI_EXTENSIONS_DISABLED' => 'Disabled', + 'CLI_EXTENSIONS_ENABLED' => 'Enabled', 'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS' => 'Successfully recalculated all email hashes.', )); diff --git a/phpBB/phpbb/console/command/extension/show.php b/phpBB/phpbb/console/command/extension/show.php index 6ce9607098..f9322034d7 100644 --- a/phpBB/phpbb/console/command/extension/show.php +++ b/phpBB/phpbb/console/command/extension/show.php @@ -37,22 +37,22 @@ class show extends command } $enabled = array_keys($this->manager->all_enabled()); - $this->print_extension_list($output, 'Enabled', $enabled); + $this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_ENABLED') . $this->user->lang('COLON'), $enabled); $output->writeln(''); $disabled = array_keys($this->manager->all_disabled()); - $this->print_extension_list($output, 'Disabled', $disabled); + $this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_DISABLED') . $this->user->lang('COLON'), $disabled); $output->writeln(''); $purged = array_diff($all, $enabled, $disabled); - $this->print_extension_list($output, 'Available', $purged); + $this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_AVAILABLE') . $this->user->lang('COLON'), $purged); } protected function print_extension_list(OutputInterface $output, $type, array $extensions) { - $output->writeln("<info>$type:</info>"); + $output->writeln("<info>$type</info>"); foreach ($extensions as $extension) { |