Merge pull request #127 from pfadfinden/125-date-calendar

Fix dateformat in calendar
pfadfinden · Mar 18, 2024 · 2e94699 · 2e94699
2 parents 78e8a2c + cbcc97f
commit 2e94699
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Resources/Private/Partials/Calendarize/Event/Detail.html b/Resources/Private/Partials/Calendarize/Event/Detail.html
@@ -38,9 +38,9 @@ <h3 class="bdp-cal__detail__event__information__data__section__heading__title bd
                             <h3 class="bdp-cal__detail__event__information__data__section__heading__title">{f:translate(key: 'date')}</h3>
                         </div>
                         <div class="bdp-cal__detail__event__information__data__section__content">
-                            <strong>{index.startDate -> f:format.date(format: settings.dateFormat)}
+                            <strong>{index.startDate -> f:format.date(format: '{f:translate(key: \'dateFormat\')}')}
                             <f:if condition="{index.startDate -> f:format.date(format: 'd.m.Y')} != {index.endDate -> f:format.date(format: 'd.m.Y')}">
-                                    - {index.endDate -> f:format.date(format: settings.dateFormat)}
+                                    - {index.endDate -> f:format.date(format: '{f:translate(key: \'dateFormat\')}')}
                             </f:if>
                             </strong>
                         </div>
@@ -55,7 +55,7 @@ <h3 class="bdp-cal__detail__event__information__data__section__heading__title">{
                                     <f:translate key="all_day" />
                                 </f:then>
                                 <f:else>
-                                    <f:format.date format="{settings.timeFormat}">{index.startDateComplete}</f:format.date>
+                                    <f:format.date format="{f:translate(key: 'timeFormat')}">{index.startDateComplete}</f:format.date>
                                     <f:if condition="{index.openEndTime}">
                                         <f:then>
                                             <f:if condition="{index.startDate -> f:format.date(format: 'd.m.Y')} == {index.endDate -> f:format.date(format: 'd.m.Y')}">
@@ -67,7 +67,7 @@ <h3 class="bdp-cal__detail__event__information__data__section__heading__title">{
                                             <f:if condition="{index.startDate -> f:format.date(format: 'd.m.Y')} == {index.endDate -> f:format.date(format: 'd.m.Y')}">
                                                 -
                                             </f:if>
-                                            <f:format.date format="{settings.timeFormat}">{index.endDateComplete}</f:format.date>
+                                            <f:format.date format="{f:translate(key: 'timeFormat')}">{index.endDateComplete}</f:format.date>
                                         </f:else>
                                     </f:if>
                                 </f:else>

diff --git a/Resources/Private/Partials/Calendarize/Event/ListItem.html b/Resources/Private/Partials/Calendarize/Event/ListItem.html
@@ -3,17 +3,17 @@
 <f:alias map="{event: index.originalObject}">
     <div class="bdp-cal__event-list__events__event bdp-cal__event-list__events__event--state-{index.state}">
         <div class="bdp-cal__event-list__events__event__date">
-            {index.startDate -> f:format.date(format: settings.dateFormat)}
+            {index.startDate -> f:format.date(format: '{f:translate(key: \'dateFormat\')}')}
             <f:if condition="{index.startDate -> f:format.date(format: 'd.m.Y')} != {index.endDate -> f:format.date(format: 'd.m.Y')}">
-                    - {index.endDate -> f:format.date(format: settings.dateFormat)}
+                    - {index.endDate -> f:format.date(format: '{f:translate(key: \'dateFormat\')}')}
             </f:if>
             <f:if condition="!{index.allDay}">
-                <f:format.date format="{settings.timeFormat}">{index.startDateComplete}</f:format.date>
+                <f:format.date format="{f:translate(key: 'timeFormat')}">{index.startDateComplete}</f:format.date>
                 <f:if condition="!{index.openEndTime}">
                     <f:if condition="{index.startDate -> f:format.date(format: 'd.m.Y')} == {index.endDate -> f:format.date(format: 'd.m.Y')}">
                         -
                     </f:if>
-                    <f:format.date format="{settings.timeFormat}">{index.endDateComplete}</f:format.date>
+                    <f:format.date format="{f:translate(key: 'timeFormat')}">{index.endDateComplete}</f:format.date>
                 </f:if>
             </f:if>
         </div>