Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/docker-compose_ve…
Browse files Browse the repository at this point in the history
…rsion_is_obsolete
  • Loading branch information
originalsouth committed Mar 26, 2024
2 parents b27238f + 0a1c870 commit 4dfde15
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rocky/rocky/locale/django.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5177,7 +5177,7 @@ msgid "graph"
msgstr ""

#: rocky/templates/partials/explanations.html
msgid "Clearance level inheritance"
msgid "Clearance level inheritance:"
msgstr ""

#: rocky/templates/partials/explanations.html
Expand Down
2 changes: 1 addition & 1 deletion rocky/rocky/templates/partials/explanations.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% spaceless %}
<div class="horizontal-scroll">
<h2>{% translate "Clearance level inheritance" %}</h2>
<h2>{% translate "Clearance level inheritance:" %}</h2>
{% if clearance_level_inheritance %}
<table id="clearance_level_inheritance">
<thead>
Expand Down
2 changes: 2 additions & 0 deletions rocky/rocky/templates/scan_profiles/scan_profile_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ <h1 rf-selector="clearance-header">{% translate "Clearance level" %}:</h1>
Boefje is run manually for this object again. Objects with a clearance level higher than "L0" will be scanned automatically by Boefjes with
corresponding scan levels.
{% endblocktranslate %}
{% include "partials/explanations.html" %}

</p>
{% elif ooi.scan_profile.scan_profile_type == "inherited" %}
{% include "partials/explanations.html" %}
Expand Down

0 comments on commit 4dfde15

Please sign in to comment.