diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 12:45:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-02 12:45:34 +0200 |
| commit | 615ed729b5b54f2f143d10136619b5c4519b353b (patch) | |
| tree | eb58b67e72ff01865333685b2b43101da30caf56 | |
| parent | 28da7581633059377f6f88e91e112d0c008501b8 (diff) | |
| parent | 5faa12db4c4c02010e99c65e473024c018928603 (diff) | |
| download | forums-615ed729b5b54f2f143d10136619b5c4519b353b.tar forums-615ed729b5b54f2f143d10136619b5c4519b353b.tar.gz forums-615ed729b5b54f2f143d10136619b5c4519b353b.tar.bz2 forums-615ed729b5b54f2f143d10136619b5c4519b353b.tar.xz forums-615ed729b5b54f2f143d10136619b5c4519b353b.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14123] Fix typo
[ticket/14123] Remove redundant help messages
[ticket/14123] Add descriptive help to the CLI help output
| -rw-r--r-- | phpBB/language/en/cli.php | 9 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/cron/run.php | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index e529fc0bde..9aa8b7fcc2 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -54,9 +54,9 @@ $lang = array_merge($lang, array( 'CLI_DESCRIPTION_DELETE_CONFIG' => 'Deletes a configuration option', 'CLI_DESCRIPTION_DISABLE_EXTENSION' => 'Disables the specified extension.', 'CLI_DESCRIPTION_ENABLE_EXTENSION' => 'Enables the specified extension.', - 'CLI_DESCRIPTION_FIND_MIGRATIONS' => 'Finds migrations that are not depended on.', + 'CLI_DESCRIPTION_FIND_MIGRATIONS' => 'Finds migrations that are not depended upon.', 'CLI_DESCRIPTION_GET_CONFIG' => 'Gets a configuration option’s value', - 'CLI_DESCRIPTION_INCREMENT_CONFIG' => 'Increments a configuration option’s value', + 'CLI_DESCRIPTION_INCREMENT_CONFIG' => 'Increments a configuration option’s integer value', 'CLI_DESCRIPTION_LIST_EXTENSIONS' => 'Lists all extensions in the database and on the filesystem.', 'CLI_DESCRIPTION_OPTION_ENV' => 'The Environment name.', @@ -111,3 +111,8 @@ $lang = array_merge($lang, array( 'CLI_THUMBNAIL_NOTHING_TO_GENERATE' => 'No thumbnails to generate.', 'CLI_THUMBNAIL_NOTHING_TO_DELETE' => 'No thumbnails to delete.', )); + +// Additional help for commands. +$lang = array_merge($lang, array( + 'CLI_HELP_CRON_RUN' => $lang['CLI_DESCRIPTION_CRON_RUN'] . ' Optionally you can specify a cron task name to run only the specified cron task.', +)); diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php index 72ad1205ef..a9648fcd41 100644 --- a/phpBB/phpbb/console/command/cron/run.php +++ b/phpBB/phpbb/console/command/cron/run.php @@ -50,6 +50,7 @@ class run extends \phpbb\console\command\command $this ->setName('cron:run') ->setDescription($this->user->lang('CLI_DESCRIPTION_CRON_RUN')) + ->setHelp($this->user->lang('CLI_HELP_CRON_RUN')) ->addArgument('name', InputArgument::OPTIONAL, $this->user->lang('CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1')) ; } |