Skip to content

Commit

Permalink
Merge branch 'main' into feature/further-environment-docs-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@Darwinkel
Darwinkel authored Aug 23, 2023
2 parents 0dcb4cd + ed5c51f commit 7b211d5
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 115 deletions.
19 changes: 10 additions & 9 deletions rocky/rocky/locale/nl/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-21 09:43+0000\n"
"POT-Creation-Date: 2023-08-23 08:59+0000\n"
"PO-Revision-Date: 2023-08-11 07:29+0000\n"
"Last-Translator: Patrick <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/openkat/nl-kat-"
Expand Down Expand Up @@ -4647,8 +4647,7 @@ msgstr "Selecteer je taal"
#, python-format
msgid ""
"Current language is %(current_language)s. Choose your preferred language."
msgstr ""
"De huidige taal is %(current_language)s. Kies de taal van uw voorkeur."
msgstr "De huidige taal is %(current_language)s. Kies de taal van uw voorkeur."

#: rocky/templates/partials/list_filters.html
msgid "Hide filter options"
Expand Down Expand Up @@ -5028,7 +5027,8 @@ msgstr "Ja, stel in"
msgid ""
"An overview of the boefje task, the input OOI and the RAW data it generated."
msgstr ""
"Een overzicht van de boefje-taak, de invoer OOI en de RAW-gegevens die het heeft gegenereerd."
"Een overzicht van de boefje-taak, de invoer OOI en de RAW-gegevens die het "
"heeft gegenereerd."

#: rocky/templates/tasks/boefje_task_detail.html
#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
Expand Down Expand Up @@ -5063,14 +5063,14 @@ msgstr "Inputobject"
msgid "No input OOI"
msgstr "Geen input object"

#: rocky/templates/tasks/boefjes.html
msgid "Download task data"
msgstr "Download taakgegevens"

#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
msgid "Reschedule"
msgstr "Opnieuw plannen"

#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
msgid "Download task data"
msgstr "Download taakgegevens"

#: rocky/templates/tasks/normalizers.html
msgid "There are no tasks for normalizers"
msgstr "Er zijn geen taken voor normalizers"
Expand Down Expand Up @@ -5387,7 +5387,8 @@ msgstr "Vrijwaringsniveau ingesteld."
msgid ""
"Can not parse observed_at parameter, falling back to showing current object"
msgstr ""
"Kan de parameter observed_at niet ontleden, terugvallen op het weergeven van het huidige object"
"Kan de parameter observed_at niet ontleden, terugvallen op het weergeven van "
"het huidige object"

#: rocky/views/mixins.py
msgid "All"
Expand Down
13 changes: 6 additions & 7 deletions rocky/rocky/locale/pap/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-21 09:43+0000\n"
"POT-Creation-Date: 2023-08-23 08:59+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -4639,8 +4639,7 @@ msgstr "Selekshoná bo idioma"
#, python-format
msgid ""
"Current language is %(current_language)s. Choose your preferred language."
msgstr ""
"Idioma aktual ta %(current_language)s. Escoge bo idioma preferí."
msgstr "Idioma aktual ta %(current_language)s. Escoge bo idioma preferí."

#: rocky/templates/partials/list_filters.html
msgid "Hide filter options"
Expand Down Expand Up @@ -5055,14 +5054,14 @@ msgstr "Opheto di entrada"
msgid "No input OOI"
msgstr "No tin entrada OOI"

#: rocky/templates/tasks/boefjes.html
msgid "Download task data"
msgstr "Descarga datonan di tarea"

#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
msgid "Reschedule"
msgstr "Kambia fecha"

#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
msgid "Download task data"
msgstr "Descarga datonan di tarea"

#: rocky/templates/tasks/normalizers.html
msgid "There are no tasks for normalizers"
msgstr "No tin tareanan pa normalizers"
Expand Down
102 changes: 51 additions & 51 deletions rocky/rocky/templates/tasks/boefjes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<h1>{% translate "Boefjes" %}</h1>
{% include "tasks/partials/task_filter.html" %}

{% if not object_list %}
<p class="emphasized">{% translate "There are no tasks for boefjes" %}</p>
{% else %}
Expand All @@ -23,66 +24,65 @@ <h1>{% translate "Boefjes" %}</h1>
<caption>{% translate "List of tasks for " %}{{ organization.name }}</caption>
<thead>
<tr>
<th scope="col">{% translate "Boefje" %}</th>
<th scope="col">{% translate "Status" %}</th>
<th scope="col">{% translate "Created date" %}</th>
<th scope="col">{% translate "Input Object" %}</th>
<th scope="col">{% translate "Details" %}</th>
<th scope="col">{% translate "Boefje" %}</th>
<th scope="col">{% translate "Status" %}</th>
<th scope="col">{% translate "Created date" %}</th>
<th scope="col">{% translate "Input Object" %}</th>
<th scope="col">{% translate "Details" %}</th>
</tr>
</thead>
<tbody>
{% for task in object_list %}
<tr id="{{ task.id }}">
<td>
<a href="{% url 'plugin_detail' organization_code=organization.code plugin_type='boefje' plugin_id=task.p_item.data.boefje.id %}">{{ task.p_item.data.boefje.id }}</a>
</td>
{% if task.status.value == "completed" %}
<td class="confirmation">
<span class="icon ti-check"></span>{{ task.status.value|capfirst }}
</td>
{% elif task.status.value == "failed" %}
<td class="warning">
<span class="icon ti-circle-x"></span>{{ task.status.value|capfirst }}
</td>
{% else %}
<td>
{{ task.status.value|capfirst }}
</td>
{% endif %}
<td>{{ task.created_at }}</td>
{% if task.p_item.data.input_ooi %}
<td>
<a href="{% ooi_url "ooi_detail" task.p_item.data.input_ooi organization.code %}">{{ task.p_item.data.input_ooi }}</a>
</td>
{% else %}
<td>{% translate "No input OOI" %}</td>
{% endif %}
<td class="actions action-buttons" >
<button type="button"
class="expando-button normalizer-list-table-row"
data-icon-open-class="icon ti-chevron-down"
data-icon-close-class="icon ti-chevron-up"
data-close-label="{% translate "Close details" %}">
{% translate "Open details" %}
</button>
</td>
<td>
<a href="{% url 'plugin_detail' organization_code=organization.code plugin_type='boefje' plugin_id=task.p_item.data.boefje.id %}">{{ task.p_item.data.boefje.id }}</a>
</td>
{% if task.status.value == "completed" %}
<td class="confirmation">
<span class="icon ti-check"></span>{{ task.status.value|capfirst }}
</td>
{% elif task.status.value == "failed" %}
<td class="warning">
<span class="icon ti-circle-x"></span>{{ task.status.value|capfirst }}
</td>
{% else %}
<td>{{ task.status.value|capfirst }}</td>
{% endif %}
<td>{{ task.created_at }}</td>
{% if task.p_item.data.input_ooi %}
<td>
<a href="{% ooi_url "ooi_detail" task.p_item.data.input_ooi organization.code %}">{{ task.p_item.data.input_ooi }}</a>
</td>
{% else %}
<td>{% translate "No input OOI" %}</td>
{% endif %}
<td class="actions action-buttons">
<button type="button"
class="expando-button normalizer-list-table-row"
data-icon-open-class="icon ti-chevron-down"
data-icon-close-class="icon ti-chevron-up"
data-close-label="{% translate "Close details" %}">
{% translate "Open details" %}
</button>
</td>
</tr>
<tr class="expando-row">
<td colspan="7">
<td colspan="7">
<section>
<div class="button-container">
{% if task.status.value in "completed,failed" %}
<a class="button" href="{% url 'bytes_raw' organization_code=organization.code boefje_meta_id=task.id %}"><span class="icon ti-download"></span>{% translate "Download meta and raw data" %}</a>
{% else %}
<a class="button" href="{% url 'download_task_meta' organization_code=organization.code task_id=task.id %}"><span class="icon ti-download"></span>{% translate "Download task data" %}</a>
{% endif %}
{% if task.status.value == "completed" %}
{% include "partials/single_action_form.html" with btn_text=_("Reschedule") btn_class="ghost" btn_icon="icon ti-refresh" action="reschedule_task" key="task_id" value=task.id %}
{% endif %}
</div>
<div class="button-container">
{% if task.status.value in "completed,failed" %}
<a class="button"
href="{% url 'bytes_raw' organization_code=organization.code boefje_meta_id=task.id %}"><span class="icon ti-download"></span>{% translate "Download meta and raw data" %}</a>
{% include "partials/single_action_form.html" with btn_text=_("Reschedule") btn_class="ghost" btn_icon="icon ti-refresh" action="reschedule_task" key="task_id" value=task.id %}

{% else %}
<a class="button"
href="{% url 'download_task_meta' organization_code=organization.code task_id=task.id %}"><span class="icon ti-download"></span>{% translate "Download task data" %}</a>
{% endif %}
</div>
</section>
</td>
</tr>
</td>
</tr>
{% endfor %}
</tbody>
</table>
Expand Down
Loading

0 comments on commit 7b211d5

Please sign in to comment.