aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-30 19:51:11 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-30 19:51:11 +0200
commit4d80d90f7300f9dca96b5c72be5c3b66ce598791 (patch)
treeff8803ca276bfcc4f20d08eac26a846063c5b9cb
parenta8e412e2b74f7300c29ac0f30184b41f86cd6f20 (diff)
downloadforums-4d80d90f7300f9dca96b5c72be5c3b66ce598791.tar
forums-4d80d90f7300f9dca96b5c72be5c3b66ce598791.tar.gz
forums-4d80d90f7300f9dca96b5c72be5c3b66ce598791.tar.bz2
forums-4d80d90f7300f9dca96b5c72be5c3b66ce598791.tar.xz
forums-4d80d90f7300f9dca96b5c72be5c3b66ce598791.zip
[ticket/12597] Improve language for cron:run command.
PHPBB3-12597
-rw-r--r--phpBB/language/en/acp/common.php6
-rw-r--r--phpBB/phpbb/console/command/cron/run.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index c3bf60f642..72c9e32ef3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -221,14 +221,14 @@ $lang = array_merge($lang, array(
'BACK' => 'Back',
- 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all available cron tasks.',
+ 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.',
'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run',
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CRON_LOCK_ERROR' => 'Could not obtain cron lock.',
- 'CRON_NO_SUCH_TASK' => 'No such cron task',
- 'CRON_NO_TASK' => 'No task to be run',
+ 'CRON_NO_SUCH_TASK' => 'Could not find cron task ā€œ%sā€.',
+ 'CRON_NO_TASK' => 'No cron tasks need to be run right now.',
'DEACTIVATE' => 'Deactivate',
'DIRECTORY_DOES_NOT_EXIST' => 'The entered path ā€œ%sā€ does not exist.',
diff --git a/phpBB/phpbb/console/command/cron/run.php b/phpBB/phpbb/console/command/cron/run.php
index f76fb30e3b..1029a2e085 100644
--- a/phpBB/phpbb/console/command/cron/run.php
+++ b/phpBB/phpbb/console/command/cron/run.php
@@ -3,7 +3,7 @@
*
* This file is part of the phpBB Forum Software package.
*
-* @copyright (c) phpBB Limited
+* @copyright (c) phpBB Limited
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
@@ -67,7 +67,7 @@ class run extends \phpbb\console\command\command
* and the exit status is set to 1.
* If the verbose option is specified, each start of a task is printed.
* Otherwise there is no output.
- * If an argument is given to the command, only the task whose name matches the
+ * If an argument is given to the command, only the task whose name matches the
* argument will be started. If verbose option is specified,
* an info message containing the name of the task is printed.
* If no task matches the argument given, an error message is printed
@@ -169,7 +169,7 @@ class run extends \phpbb\console\command\command
}
else
{
- $output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK') . '</error>');
+ $output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK', $task_name) . '</error>');
return 2;
}
}