diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-06-06 19:49:29 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-06 19:49:29 +0200 |
commit | fc4275ab2b414e184007a8791c7ee09537d5a827 (patch) | |
tree | 664167124c4b1e0613f8af4314c560e0f368a395 /phpBB/language/en/acp/common.php | |
parent | 69e50dffaed944c68bbfa88bf282dc765f580791 (diff) | |
parent | 5b51acf245fc1fbd454d394e8b44bf73d6439248 (diff) | |
download | forums-fc4275ab2b414e184007a8791c7ee09537d5a827.tar forums-fc4275ab2b414e184007a8791c7ee09537d5a827.tar.gz forums-fc4275ab2b414e184007a8791c7ee09537d5a827.tar.bz2 forums-fc4275ab2b414e184007a8791c7ee09537d5a827.tar.xz forums-fc4275ab2b414e184007a8791c7ee09537d5a827.zip |
Merge pull request #2543 from Nicofuma/ticket/12655
[ticket/12655] Run phpbbcli as a shell when --shell or -s is used
* Nicofuma/ticket/12655:
[ticket/12655] Set register_container_commands as public
[ticket/12655] Don't try to restore the definition in the help
[ticket/12655] Fix coding style
[ticket/12655] Make the --shell option available only for phpbbcli.php
[ticket/12655] Fix coding style in \phpbb\console\application
[ticket/12655] Set the arguments of \phpbb\console\application as required
[ticket/12655] Don't require acp/common again in the commands
[ticket/12655] Run the shell when --shell is used
Diffstat (limited to 'phpBB/language/en/acp/common.php')
-rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 12cdc28aa3..6ca1a985a5 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -227,6 +227,8 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.', 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', + 'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.', + 'COLOUR_SWATCH' => 'Web-safe colour swatch', 'CONFIG_UPDATED' => 'Configuration updated successfully.', 'CRON_LOCK_ERROR' => 'Could not obtain cron lock.', |