diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-05-17 20:38:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 20:38:03 +0200 |
| commit | 6e6327ec74f5caa8dc73b836d8e251e5309f3087 (patch) | |
| tree | 23e4261970cd0535cad0c29eadc7b6460de4d379 | |
| parent | 45fcfc3b0ba6dba75197c016ad385fe7715fc207 (diff) | |
| parent | 43cfad705cddb57c6a79dc51a12d151e14533064 (diff) | |
| download | nextcloud-server-6e6327ec74f5caa8dc73b836d8e251e5309f3087.tar.gz nextcloud-server-6e6327ec74f5caa8dc73b836d8e251e5309f3087.zip | |
Merge pull request #4923 from nextcloud/backgroundjobs-wording
Change cron wording to background jobs
| -rw-r--r-- | lib/public/ILogger.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin/server.php | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/public/ILogger.php b/lib/public/ILogger.php index 5680ec781cb..2d1bf4b804d 100644 --- a/lib/public/ILogger.php +++ b/lib/public/ILogger.php @@ -132,7 +132,7 @@ interface ILogger { * * <code> * $logger->logException($ex, [ - * 'message' => 'Exception during cron job execution' + * 'message' => 'Exception during background job execution' * ]); * </code> * diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php index 391d100dcf7..8d00d37fe80 100644 --- a/settings/templates/admin/server.php +++ b/settings/templates/admin/server.php @@ -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 { |