mirror of
https://github.com/moodle/moodle.git
synced 2025-01-29 19:50:14 +01:00
Merge branch 'MDL-74857-dev' of https://github.com/izendegi/moodle
This commit is contained in:
commit
fc3bb1dc50
@ -2080,7 +2080,7 @@ class core_admin_renderer extends plugin_renderer_base {
|
||||
$errorline = true;
|
||||
} else {
|
||||
if ($status) { //Handle ok result (ok)
|
||||
$status = get_string('ok');
|
||||
$status = get_string('statusok');
|
||||
} else {
|
||||
if ($environment_result->getLevel() == 'optional') {//Handle check result (warning)
|
||||
$status = get_string('check');
|
||||
|
@ -202,7 +202,7 @@ abstract class backup_cron_automated_helper {
|
||||
$message .= get_string('summary') . "\n";
|
||||
$message .= "==================================================\n";
|
||||
$message .= ' ' . get_string('courses') . ': ' . array_sum($count) . "\n";
|
||||
$message .= ' ' . get_string('ok') . ': ' . $count[self::BACKUP_STATUS_OK] . "\n";
|
||||
$message .= ' ' . get_string('statusok') . ': ' . $count[self::BACKUP_STATUS_OK] . "\n";
|
||||
$message .= ' ' . get_string('skipped') . ': ' . $count[self::BACKUP_STATUS_SKIPPED] . "\n";
|
||||
$message .= ' ' . get_string('error') . ': ' . $count[self::BACKUP_STATUS_ERROR] . "\n";
|
||||
$message .= ' ' . get_string('unfinished') . ': ' . $count[self::BACKUP_STATUS_UNFINISHED] . "\n";
|
||||
|
@ -79,7 +79,7 @@ if ($mform->is_cancelled()) {
|
||||
$line = array();
|
||||
$line[] = $item['component'];
|
||||
$line[] = $item['item'];
|
||||
$line[] = ($item['error']===false) ? get_string('ok') : '<div class="notifyproblem">'.$item['error'].'</div>';
|
||||
$line[] = ($item['error'] === false) ? get_string('statusok') : '<div class="notifyproblem">'.$item['error'].'</div>';
|
||||
$data[] = $line;
|
||||
}
|
||||
|
||||
|
@ -1320,7 +1320,7 @@ class core_plugin_manager {
|
||||
return false;
|
||||
}
|
||||
|
||||
$ok = get_string('ok', 'core');
|
||||
$ok = get_string('statusok', 'core');
|
||||
|
||||
// Let admins know they can expect more verbose output.
|
||||
$silent or $this->mtrace(get_string('packagesdebug', 'core_plugin'), PHP_EOL, DEBUG_NORMAL);
|
||||
|
@ -40,7 +40,7 @@ admin_externalpage_setup('reportbackups', '', null, '', array('pagelayout'=>'rep
|
||||
|
||||
$strftimedatetime = get_string('strftimerecent');
|
||||
$strerror = get_string('error');
|
||||
$strok = get_string('ok');
|
||||
$strok = get_string('statusok');
|
||||
$strunfinished = get_string('unfinished');
|
||||
$strskipped = get_string('skipped');
|
||||
$strwarning = get_string('warning');
|
||||
|
Loading…
x
Reference in New Issue
Block a user