MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5579 from StefanKelm/2.4 

tiny typo
pull/5585/head
Andras Iklody 2020-01-31 14:28:20 +01:00 committed by GitHub
parent 17918f916c 11ff5c63ee
commit c95ee30c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Elements/healthElements/db_schema_diagnostic.ctp
View File

@ -158,7 +158,7 @@
$updateLocked ? __('Updates are locked') : __('Updates are not locked'),
$updateLocked ? (
$updateFailNumberReached ?
__('Update are locked due to to many update fails') : sprintf(__('Update unlocked in %s'), h($humanReadableTime)))
__('Updates are locked due to to many update fails') : sprintf(__('Updates unlocked in %s'), h($humanReadableTime)))
: __('Updates are not locked'),
$updateLocked ? 'times' : 'check'
);

4
app/View/Servers/update_progress.ctp
View File

@ -29,9 +29,9 @@ if (isset($updateProgress['preTestSuccess']) && $updateProgress['preTestSuccess'
<div style="display:flex;flex-direction: row;justify-content: space-between;">
<span>
<?php if ($updateFailNumberReached): ?>
<h5 style="margin: 5px 0px; display: inline-block"><?php echo __('Update are locked due to to many update fails'); ?></h5>
<h5 style="margin: 5px 0px; display: inline-block"><?php echo __('Updates are locked due to to many update fails'); ?></h5>
<?php else: ?>
<h5 style="margin: 5px 0px; display: inline-block"><?php echo __('Update are locked due to an ongoing update process. Release lock only if you know what you are doing'); ?></h5>
<h5 style="margin: 5px 0px; display: inline-block"><?php echo __('Updates are locked due to an ongoing update process. Release lock only if you know what you are doing.'); ?></h5>
<i>(<?php echo sprintf(__('automatically unlock in %smin %ssec'), '<span id="unlock_remaining_time_min">-</span>', '<span id="unlock_remaining_time_sec">-</span>'); ?>)</i>
<?php endif; ?>
</span>