mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4923 from nextcloud/backgroundjobs-wording 

Change cron wording to background jobs
This commit is contained in:
Lukas Reschke 2017-05-17 20:38:03 +02:00 committed by GitHub
parent 45fcfc3b0b 43cfad705c
commit 6e6327ec74
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/public/ILogger.php
View File

@ -132,7 +132,7 @@ interface ILogger {
*
* <code>
* $logger->logException($ex, [
* 'message' => 'Exception during cron job execution'
* 'message' => 'Exception during background job execution'
* ]);
* </code>
*

10
settings/templates/admin/server.php
View File

@ -155,7 +155,7 @@
</div>
<div class="section" id="backgroundjobs">
<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
<h2 class="inlineblock"><?php p($l->t('Background jobs'));?></h2>
<?php if ($_['cron_log']): ?>
<p class="cronlog inlineblock">
<?php if ($_['lastcron'] !== false):
@ -164,17 +164,17 @@
if (time() - $_['lastcron'] <= 3600): ?>
<span class="status success"></span>
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
<?php p($l->t("Last job ran %s.", [$relative_time]));?>
</span>
<?php else: ?>
<span class="status error"></span>
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
</span>
<?php endif;
else: ?>
<span class="status error"></span>
<?php p($l->t("Cron was not executed yet!"));
<?php p($l->t("Background job didn’t run yet!"));
endif; ?>
</p>
<?php endif; ?>
@ -208,7 +208,7 @@
print_unescaped('disabled');
}?>>
<label for="backgroundjobs_cron">Cron</label><br/>
<em><?php p($l->t("Use system's cron service to call the cron.php file every 15 minutes.")); ?>
<em><?php p($l->t("Use system cron service to call the cron.php file every 15 minutes.")); ?>
<?php if($_['cli_based_cron_possible']) {
p($l->t('The cron.php needs to be executed by the system user "%s".', [$_['cli_based_cron_user']]));
} else {