Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vorschlag: Status Meldungen Übersicht #46

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Vorschlag: Status Meldungen Übersicht #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f2cf9d
Edit Messages
Wiwaltill Sep 28, 2021
7309253
Added overview header messages
Wiwaltill Sep 28, 2021
33fb8e4
Added overview.header_details
Wiwaltill Oct 3, 2021
49eb148
Update header_detail message
Wiwaltill Oct 3, 2021
2bdca99
Update header_detail message
Wiwaltill Oct 3, 2021
0d01ff1
Merge branch 'SchulIT:master' into Wiwaltill-patch-3
Wiwaltill Apr 23, 2022
9d2fd83
Merge branch 'SchulIT:master' into Wiwaltill-patch-3
Wiwaltill Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/status/device.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="row">
<div class="col">
<div class="bs-callout bs-callout-{% if status.problemCount == 0 %}success{% else %}danger{% endif %}">
<h4>{{ 'status.overview.header_details'|trans({'%target%': device.name }) }}</h4>
<h4>{{ 'status.overview.header_details1'|trans({'%target%': device.name }) }}</h4>
<p>
{{ 'status.overview.problems'|trans({ '%count%': status.problemCount })|raw }}
</p>
Expand All @@ -31,7 +31,7 @@

<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.maintenanceCount == 0 %}success{% else %}warning{% endif %}">
<h4>{{ 'status.overview.header_details'|trans({'%target%': device.name }) }}</h4>
<h4>{{ 'status.overview.header_details2'|trans({'%target%': device.name }) }}</h4>
<p>
{{ 'status.overview.maintenance'|trans({ '%count%': status.maintenanceCount })|raw }}
</p>
Expand Down Expand Up @@ -85,4 +85,4 @@
</div>
</div>
{% endfor %}
{% endblock %}
{% endblock %}
8 changes: 4 additions & 4 deletions templates/status/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="row">
<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.problemCount == 0 %}success{% else %}danger{% endif %}">
<h4>{{ 'status.overview.header'|trans }}</h4>
<h4>{{ 'status.overview.header1'|trans }}</h4>
<p>
{{ 'status.overview.problems'|trans({'%count%': status.problemCount })|raw }}
</p>
Expand All @@ -24,7 +24,7 @@

<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.maintenanceCount == 0 %}success{% else %}warning{% endif %}">
<h4>{{ 'status.overview.header'|trans }}</h4>
<h4>{{ 'status.overview.header2'|trans }}</h4>
<p>
{{ 'status.overview.maintenance'|trans({ '%count%': status.maintenanceCount })|raw }}
</p>
Expand All @@ -33,7 +33,7 @@

<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.announcementCount == 0 %}success{% else %}info{% endif %}">
<h4>{{ 'status.overview.header'|trans }}</h4>
<h4>{{ 'status.overview.header3'|trans }}</h4>
<p>
{{ 'status.overview.announcements'|trans({ '%count%': status.announcementCount })|raw }}
</p>
Expand Down Expand Up @@ -100,4 +100,4 @@
</div>
{% endfor %}
</div>
{% endblock %}
{% endblock %}
6 changes: 3 additions & 3 deletions templates/status/room.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="row">
<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.problemCount == 0 %}success{% else %}danger{% endif %}">
<h4>{{ 'status.overview.header_details'|trans({'%target%': room.name }) }}</h4>
<h4>{{ 'status.overview.header_details1'|trans({'%target%': room.name }) }}</h4>
<p>
{{ 'status.overview.problems'|trans({ '%count%': status.problemCount })|raw }}
</p>
Expand All @@ -24,7 +24,7 @@

<div class="col">
<div class="m-0 bs-callout bs-callout-{% if status.maintenanceCount == 0 %}success{% else %}warning{% endif %}">
<h4>{{ 'status.overview.header_details'|trans({'%target%': room.name }) }}</h4>
<h4>{{ 'status.overview.header_details2'|trans({'%target%': room.name }) }}</h4>
<p>
{{ 'status.overview.maintenance'|trans({ '%count%': status.maintenanceCount })|raw }}
</p>
Expand Down Expand Up @@ -105,4 +105,4 @@
</div>
{% endfor %}

{% endblock %}
{% endblock %}
8 changes: 6 additions & 2 deletions translations/messages.de.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,12 @@ status:
overview: Zurück zur Gesamt-Übersicht
room: Zurück zur Raum-Übersicht
overview:
header: Zusammenfassung
header_details: "Zusammenfassung für %target%"
header1: Probleme
header2: Wartungsarbeiten
header3: Ankündigungen
header_details1: "Probleme für %target%"
header_details2: "Wartungsarbeiten für %target%"
header_details3: "Ankündigungen für %target%"
problems: "{0} Aktuell gibt es <strong>0</strong> Probleme.|{1} Aktuell gibt es <strong>1</strong> Problem.|]1,Inf[ Aktuell gibt es <strong>%count%</strong> Probleme."
announcements: "{0} Aktuell gibt es <strong>0</strong> Ankündigungen.|{1} Aktuell gibt es <strong>1</strong> Ankündigung.|]1,Inf[ Aktuell gibt es <strong>%count%</strong> Ankündigungen."
maintenance: "{0} Aktuell gibt es <strong>0</strong> Wartungsarbeiten.|{1} Aktuell gibt es <strong>1</strong> Wartungsarbeit.|]1,Inf[ Aktuell gibt es <strong>%count%</strong> Wartungsarbeiten."
Expand Down