Fixed erroneous translation replacements

resources/views/admin/rooms/edit.twig

@@ -14,7 +14,7 @@
                 {{ f.input('name', __('general.name'), {
                     'required': true,
                     'required_icon': true,
-                    'value': f.formData('room', room ? general.name : ''),
+                    'value': f.formData('room', room ? room.name : ''),
                 }) }}
 
                 {{ f.input('dect', __('general.dect'), {

resources/views/admin/rooms/index.twig

@@ -37,7 +37,7 @@
                                     <td>
                                         {{ m.icon('pin-map-fill') }}
                                         <a href="{{ url('/rooms', {'action': 'view', 'room_id': room.id}) }}">
-                                            {{ general.name }}
+                                            {{ room.name }}
                                         </a>
                                     </td>
 

resources/views/admin/schedule/load.twig

@@ -40,7 +40,7 @@
             <tbody>
             {% for room in rooms %}
                 <tr>
-                    <td>{{ general.name }}</td>
+                    <td>{{ room.name }}</td>
                 </tr>
             {% endfor %}
             </tbody>
@@ -66,7 +66,7 @@
                     <td>{{ shift.date.format(__('Y-m-d H:i')) }} - {{ shift.endDate.format(__('H:i')) }}</td>
                     <td>{{ shift.type }}</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>
             {% endfor %}
             </tbody>

resources/views/api/ical.twig

@@ -13,7 +13,7 @@ DTEND:{{ entry.shift.end.utc().format(dateFormat) }}
 STATUS:CONFIRMED
 TRANSP:OPAQUE
 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:{{
     (
         entry.shift.shiftType.description

resources/views/emails/worklog-from-shift.twig

@@ -8,7 +8,7 @@
 {{ name }}
 {{ title }}
 {{ start.format(__('Y-m-d H:i')) }} - {{ end.format(__('Y-m-d H:i')) }}
-{{ general.name }}
+{{ room.name }}
 
 {% if start <= date() and not freeloaded %}
 {{ __('notification.shift.deleted.worklog') }}