Added support for Django 5.2. (#200)

* Confirmed support for Django 5.2.

* Added <div> to errors template and moved 'invalid-feedback' to this element. 

* Added 'aria-describedby' to <fieldset>s.

Author: smithdc1

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next Release
 * Added Python 3.13 support. 
+* Added support for Django 5.2. This required the following template changes:
+  * Added `aria-describedby` to `<fieldset>` elements.
+  * Added a parent `<div>` for errors to allow them to be referenced by `aria-describedby`. This means error messages can now be read by screen reader users.
 
 ## 2024.10 (2024-10-05)
 * Added support for Django 5.1.

crispy_bootstrap5/templates/bootstrap5/field.html

@@ -11,7 +11,7 @@
     {% endif %}
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="{% if field|is_checkbox and form_show_labels %}form-check{% else %}mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
         {% if field.label and not field|is_checkbox and form_show_labels %}
-            {% if field.use_fieldset %}<fieldset{% if 'form-horizontal' in form_class %} class="row"{% endif %}>{% endif %}
+            {% if field.use_fieldset %}<fieldset{% if 'form-horizontal' in form_class %} class="row"{% endif %}{% if field.aria_describedby %} aria-describedby="{{ field.aria_describedby }}"{% endif %}>{% endif %}
             <{% if field.use_fieldset %}legend{% else %}label{% endif %}
                 {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label pt-0{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}

crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple_inline.html

@@ -4,7 +4,7 @@
     <div id="div_{{ field.auto_id }}" class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
 
         {% if field.label %}
-            <fieldset{% if 'form-horizontal' in form_class %} class="row"{% endif %}>
+            <fieldset{% if field.aria_describedby %} aria-describedby="{{ field.aria_describedby }}"{% endif %}{% if 'form-horizontal' in form_class %} class="row"{% endif %}>
             <legend for="{{ field.id_for_label }}"  class="{{ label_class }}{% if 'form-horizontal' in form_class %} col-form-label pt-0{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
             </legend>

crispy_bootstrap5/templates/bootstrap5/layout/field_errors.html

@@ -1,5 +1,12 @@
 {% if form_show_errors and field.errors %}
+    {% if field.errors.field_id %}
+        {# Django 5.2+ #}
+        <div id="{{field.errors.field_id}}_error" class="invalid-feedback">
+    {% else %}
+        <div id="{{field.auto_id}}_error" class="invalid-feedback">
+    {% endif %}
     {% for error in field.errors %}
-        <span id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="invalid-feedback"><strong>{{ error }}</strong></span>
+        <span id="error_{{ forloop.counter }}_{{ field.auto_id }}"><strong>{{ error }}</strong></span>
     {% endfor %}
+    </div>
 {% endif %}

crispy_bootstrap5/templates/bootstrap5/layout/field_errors_block.html

@@ -1,5 +1,12 @@
 {% if form_show_errors and field.errors %}
+    {% if field.errors.field_id %}
+        {# Django 5.2+ #}
+        <div id="{{field.errors.field_id}}_error"class="invalid-feedback">
+    {% else %}
+        <div id="{{field.auto_id}}_error" class="invalid-feedback">
+    {% endif %}
     {% for error in field.errors %}
-        <p id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="invalid-feedback"><strong>{{ error }}</strong></p>
+        <p id="error_{{ forloop.counter }}_{{ field.auto_id }}"><strong>{{ error }}</strong></p>
     {% endfor %}
+    </div>
 {% endif %}

crispy_bootstrap5/templates/bootstrap5/layout/field_with_buttons.html

@@ -24,9 +24,16 @@
             {% endif %}
             {{ buttons|safe }}
         </div>
-        {% for error in field.errors %}
-            <p id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="text-danger mb-0"><small><strong>{{ error }}</strong></small></p>
-        {% endfor %}
+        {% if field.errors.field_id %}
+            {# Django 5.2+ #}
+            <div id="{{field.errors.field_id}}_error">
+        {% else %}
+            <div id="{{field.auto_id}}_error">
+        {% endif %}
+            {% for error in field.errors %}
+                <p id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="text-danger mb-0"><small><strong>{{ error }}</strong></small></p>
+            {% endfor %}
+        </div>
         {% include 'bootstrap5/layout/help_text.html' %}
     </div>
 </div>

crispy_bootstrap5/templates/bootstrap5/layout/help_text.html

@@ -1,7 +1,7 @@
 {% if field.help_text %}
     {% if help_text_inline %}
-        <span id="{{ field.id_for_label }}_helptext" class="form-text">{{ field.help_text|safe}}</span>
+        <span id="{{ field.auto_id }}_helptext" class="form-text">{{ field.help_text|safe}}</span>
     {% else %}
-        <div {% if field.id_for_label %}id="{{ field.id_for_label }}_helptext" {% endif %}class="form-text">{{ field.help_text|safe }}</div>
+        <div {% if field.auto_id %}id="{{ field.auto_id }}_helptext" {% endif %}class="form-text">{{ field.help_text|safe }}</div>
     {% endif %}
 {% endif %}

crispy_bootstrap5/templates/bootstrap5/layout/radio_checkbox_select.html

@@ -20,8 +20,15 @@
 
 </div>
 {% if field.errors and inline_class %}
-    {% for error in field.errors %}
-        <p id="error_{{ forloop.counter }}_{{ field.auto_id }}" class="invalid-feedback"><strong>{{ error }}</strong></p>
-    {% endfor %}
+    {% if field.errors.field_id %}
+        {# Django 5.2+ #}
+        <div id="{{field.errors.field_id}}_error" class="invalid-feedback">
+    {% else %}
+        <div id="{{field.auto_id}}_error" class="invalid-feedback">
+    {% endif %}
+        {% for error in field.errors %}
+            <p id="error_{{ forloop.counter }}_{{ field.auto_id }}"><strong>{{ error }}</strong></p>
+        {% endfor %}
+    </div>
 {% endif %}
 {% include 'bootstrap5/layout/help_text.html' %}

crispy_bootstrap5/templates/bootstrap5/layout/radioselect_inline.html

@@ -4,7 +4,7 @@
     <div id="div_{{ field.auto_id }}" class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
 
         {% if field.label %}
-            <fieldset{% if 'form-horizontal' in form_class %} class="row"{% endif %}>
+            <fieldset{% if field.aria_describedby %} aria-describedby="{{ field.aria_describedby }}"{% endif %}{% if 'form-horizontal' in form_class %} class="row"{% endif %}>
             <legend for="{{ field.id_for_label }}"  class="{{ label_class }}{% if 'form-horizontal' in form_class %} col-form-label pt-0{% else %} form-label{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
             </legend>

pyproject.toml

@@ -17,6 +17,7 @@ classifiers=[
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
   "Framework :: Django :: 5.1",
+  "Framework :: Django :: 5.2",
   "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3 :: Only",