Fixed erroneous translation replacements
This commit is contained in:
parent
9fb6bd4d10
commit
9ffe739b24
|
@ -14,7 +14,7 @@
|
||||||
{{ f.input('name', __('general.name'), {
|
{{ f.input('name', __('general.name'), {
|
||||||
'required': true,
|
'required': true,
|
||||||
'required_icon': true,
|
'required_icon': true,
|
||||||
'value': f.formData('room', room ? general.name : ''),
|
'value': f.formData('room', room ? room.name : ''),
|
||||||
}) }}
|
}) }}
|
||||||
|
|
||||||
{{ f.input('dect', __('general.dect'), {
|
{{ f.input('dect', __('general.dect'), {
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
<td>
|
<td>
|
||||||
{{ m.icon('pin-map-fill') }}
|
{{ m.icon('pin-map-fill') }}
|
||||||
<a href="{{ url('/rooms', {'action': 'view', 'room_id': room.id}) }}">
|
<a href="{{ url('/rooms', {'action': 'view', 'room_id': room.id}) }}">
|
||||||
{{ general.name }}
|
{{ room.name }}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for room in rooms %}
|
{% for room in rooms %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ general.name }}</td>
|
<td>{{ room.name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
@ -66,7 +66,7 @@
|
||||||
<td>{{ shift.date.format(__('Y-m-d H:i')) }} - {{ shift.endDate.format(__('H:i')) }}</td>
|
<td>{{ shift.date.format(__('Y-m-d H:i')) }} - {{ shift.endDate.format(__('H:i')) }}</td>
|
||||||
<td>{{ shift.type }}</td>
|
<td>{{ shift.type }}</td>
|
||||||
<td>{{ shift.title }}{% if shift.subtitle %}<br><small>{{ shift.subtitle }}</small>{% endif %}</td>
|
<td>{{ shift.title }}{% if shift.subtitle %}<br><small>{{ shift.subtitle }}</small>{% endif %}</td>
|
||||||
<td>{{ shift.general.name }}</td>
|
<td>{{ shift.room.name }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -13,7 +13,7 @@ DTEND:{{ entry.shift.end.utc().format(dateFormat) }}
|
||||||
STATUS:CONFIRMED
|
STATUS:CONFIRMED
|
||||||
TRANSP:OPAQUE
|
TRANSP:OPAQUE
|
||||||
SUMMARY:{{ (entry.shift.shiftType.name ~ ' (' ~ entry.shift.title ~ ')') | replace(replacement) | raw }}
|
SUMMARY:{{ (entry.shift.shiftType.name ~ ' (' ~ entry.shift.title ~ ')') | replace(replacement) | raw }}
|
||||||
LOCATION:{{ entry.shift.general.name | replace(replacement) | raw }}
|
LOCATION:{{ entry.shift.room.name | replace(replacement) | raw }}
|
||||||
DESCRIPTION:{{
|
DESCRIPTION:{{
|
||||||
(
|
(
|
||||||
entry.shift.shiftType.description
|
entry.shift.shiftType.description
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
{{ name }}
|
{{ name }}
|
||||||
{{ title }}
|
{{ title }}
|
||||||
{{ start.format(__('Y-m-d H:i')) }} - {{ end.format(__('Y-m-d H:i')) }}
|
{{ start.format(__('Y-m-d H:i')) }} - {{ end.format(__('Y-m-d H:i')) }}
|
||||||
{{ general.name }}
|
{{ room.name }}
|
||||||
|
|
||||||
{% if start <= date() and not freeloaded %}
|
{% if start <= date() and not freeloaded %}
|
||||||
{{ __('notification.shift.deleted.worklog') }}
|
{{ __('notification.shift.deleted.worklog') }}
|
||||||
|
|
Loading…
Reference in New Issue