Update: translation, formatting

fsbraun · Jan 11, 2022 · 085f321 · 085f321
1 parent 47e413b
commit 085f321
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/src/automations/locale/de_DE/LC_MESSAGES/django.mo b/src/automations/locale/de_DE/LC_MESSAGES/django.mo
diff --git a/src/automations/locale/de_DE/LC_MESSAGES/django.po b/src/automations/locale/de_DE/LC_MESSAGES/django.po
@@ -109,8 +109,8 @@ msgstr ""
 
 #: templates/automations/history.html:9
 
-msgid "Automation id"
-msgstr "Automatisierungs-ID"
+msgid "Automation id:"
+msgstr "Automatisierungs-ID:"
 
 #: templates/automations/history.html:10
 msgid "Updated:"

diff --git a/src/automations/templates/automations/history.html b/src/automations/templates/automations/history.html
@@ -6,7 +6,7 @@ <h1 class="card-header">
             <small>{{ automation.automation_class }}</small>
         </h1>
         <ul class="list-group list-group-flush">
-            <li class="list-group-item">{% trans "Automation id" %} {{ automation.id }}</li>
+            <li class="list-group-item">{% trans "Automation id:" %} {{ automation.id }}</li>
             <li class="list-group-item">{% trans "Updated:" %} {{ automation.updated }}</li>
             <li class="list-group-item">{% trans "Paused until:" %} {{ automation.paused_until }}</li>
             <li class="list-group-item">{% trans "Created:" %} {{ automation.created }}</li>

diff --git a/src/automations/templates/automations/includes/history_item.html b/src/automations/templates/automations/includes/history_item.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% spaceless %}
     <div class="card mb-3">
         {% with node=task.get_node %}
-            <h4 class="card-header{% if "Error" in task.message %} bg-danger{% elif "OK" in task.message %} bg-success{% else %} bg-warning{% endif %}">{{ task.status }} = flow.{{ task.get_node.node_name }}()
+            <h4 class="card-header{% if "Error" in task.message %} bg-danger{% elif "OK" in task.message %} bg-success{% else %} bg-warning{% endif %}">{{ task.status }} = flow.{{ node.node_name }}()
                 <small>{% if task.finished %}{{ task.finished }}{% else %}{% trans "running" %}{% endif %}</small></h4>
             {% if node.description %}<p>{{ node.description }}</p>{% endif %}
             {% if task.message == "OK" and task.result %}
@@ -17,10 +17,11 @@ <h4 class="card-header{% if "Error" in task.message %} bg-danger{% elif "OK" in
             {% endif %}
             {% if node.modifiers %}
                 <div class="card-footer">
-                    <ul class="list-inline">
+                    <ul class="list-inline mb-0">
+                        <li class="list-inline-item">{% trans "Modifiers" %}:</li>
                         {% for key in node.modifiers %}
                             <li class="list-inline-item"><kbd>{{ key }}</kbd>
-                                {% if key == "Wait" %}{{ task.autmation.paused_until }}{% endif %}
+                                {% if key == "Wait" %} <small>({% trans "until" %} {{ task.automation.paused_until }})</small>{% endif %}
                             </li>
                         {% endfor %}
                     </ul>

diff --git a/src/django_automations.egg-info/SOURCES.txt b/src/django_automations.egg-info/SOURCES.txt
@@ -41,23 +41,29 @@ src/automations/migrations/0004_auto_20210511_1042.py
 src/automations/migrations/0005_automationmodel_key.py
 src/automations/migrations/0006_auto_20211121_1357.py
 src/automations/migrations/__init__.py
+src/automations/templates/base.html
 src/automations/templates/automations/base.html
 src/automations/templates/automations/dashboard.html
+src/automations/templates/automations/error_report.html
 src/automations/templates/automations/form_view.html
 src/automations/templates/automations/history.html
 src/automations/templates/automations/preformatted_traceback.html
 src/automations/templates/automations/task_list.html
 src/automations/templates/automations/traceback.html
 src/automations/templates/automations/includes/dashboard.html
+src/automations/templates/automations/includes/dashboard_error.html
 src/automations/templates/automations/includes/dashboard_item.html
 src/automations/templates/automations/includes/form_view.html
+src/automations/templates/automations/includes/history.html
+src/automations/templates/automations/includes/history_item.html
 src/automations/templates/automations/includes/task_item.html
 src/automations/templates/automations/includes/task_list.html
 src/automations/templatetags/atm_tags.py
 src/automations/tests/__init__.py
 src/automations/tests/methods.py
 src/automations/tests/models.py
 src/automations/tests/test_automations.py
+src/automations/tests/urls.py
 src/django_automations.egg-info/PKG-INFO
 src/django_automations.egg-info/SOURCES.txt
 src/django_automations.egg-info/dependency_links.txt