Fixed some twig deprecations

OpenConext · Dec 7, 2023 · aaf12e6 · aaf12e6
1 parent d2b2bc9
commit aaf12e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/templates/form/fields.html.twig b/templates/form/fields.html.twig
@@ -7,7 +7,7 @@
 {%- endblock form_group_class %}
 
 {% block anchor_widget %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if label is empty %}
             {% set label = name|humanize %}
         {% endif %}
@@ -16,11 +16,11 @@
                 <span class="glyphicon glyphicon-{{ icon }}"{% if icon_inverted|default(false) %} style="color: white;"{% endif %}></span>
             {% endif %}
             {{ label|trans({}, translation_domain) }}</a>
-    {% endspaceless %}
+    {% endapply %}
 {% endblock anchor_widget %}
 
 {% block anchor_row %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if button_offset is defined and button_offset is not empty %}
             {% set attr = attr|merge({'for': id, 'class': button_offset }) %}
             <div class="form-group">
@@ -32,7 +32,7 @@
                 {{ form_widget(form) }}
             </div>
         {% endif %}
-    {% endspaceless %}
+    {% endapply %}
 {% endblock anchor_row %}
 
 {% block ra_role_at_institution_widget %}
@@ -55,12 +55,12 @@
 {% endblock button_group_row %}
 
 {%- block otp_widget -%}
-    {% spaceless %}
+    {% apply spaceless %}
         <div class="col-sm-9">
             <div class="input-group">
                 <span class="input-group-addon"><i class="fa fa-key"></i></span>
                 <input type="text" class="form-control" {{ block('widget_attributes') }}>
             </div>
         </div>
-    {% endspaceless %}
+    {% endapply %}
 {%- endblock otp_widget -%}
diff --git a/templates/registration/partial/registration_email_sent.html.twig b/templates/registration/partial/registration_email_sent.html.twig
@@ -12,7 +12,7 @@
 
 <p>
     {{ 'ss.registration.registration_email_sent.label.expiration_date'
-        |trans({'%expirationDate%': expirationDate|localizeddate('full', 'none', locale)}) }}
+        |trans({'%expirationDate%': expirationDate|format_date('full', 'none', locale)}) }}
 </p>
 
 <div class="row">

diff --git a/templates/second_factor/list.html.twig b/templates/second_factor/list.html.twig
@@ -31,7 +31,7 @@
     {% endif %}
     </div>
 
-    {% include 'registration/partial:crud_list.html.twig' %}
+    {% include 'registration/partial/crud_list.html.twig' %}
 
 {% endblock %}
 
@@ -62,7 +62,7 @@
                             <td>{{ secondFactor.secondFactorIdentifier }}</td>
                             {% if state == 'verified' %}
                             <td>
-                                {{ expirationHelper.expiresAt(secondFactor.registrationRequestedAt)|format_datetime('full', 'none', locale) }}
+                                {{ expirationHelper.expiresAt(secondFactor.registrationRequestedAt)|format_date('full', 'none', locale) }}
                                 {% if expirationHelper.hasExpired(secondFactor.registrationRequestedAt) %}
                                     {% set hasExpired = true %}
                                     <span class="label label-danger">{{ 'ss.second_factor_list.header.expired_warning'|trans }}</span>