From 9addd886c732c7a834a19f5cb46f54929a7d1f8a Mon Sep 17 00:00:00 2001
From: Benjamin PIERRE <contact@benjamin-pierre.dev>
Date: Tue, 18 Nov 2025 11:32:36 +0100
Subject: [PATCH 1/4] FEAT: Replace "trans" tags with "translate" in mail
 template

---
 .../mails/default/mail_html.html                   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
index 32d9e1a..5ae4a5a 100644
--- a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
+++ b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
@@ -1,11 +1,11 @@
 {% load i18n %}
-<h1>{% trans "Form submission" %}</h1>
-<p>{% if user %}{% trans "by" %} {{ user.firstname }} {{ user.lastname }} ({{ user.username }}){% else %}{% trans "by anonymous" %}{% endif %}</p>
+<h1>{% translate "Form submission" %}</h1>
+<p>{% if user %}{% translate "by" %} {{ user.firstname }} {{ user.lastname }} ({{ user.username }}){% else %}{% translate "by anonymous" %}{% endif %}</p>
 <table>
     <thead>
     <tr>
-        <th>{% trans "Field" %}</th>
-        <th>{% trans "Value" %}</th>
+        <th>{% translate "Field" %}</th>
+        <th>{% translate "Value" %}</th>
     </tr>
     </thead>
     <tbody>
@@ -16,15 +16,15 @@ <h1>{% trans "Form submission" %}</h1>
     </tr>
     {% endfor %}
     <tr>
-        <td>{% trans "time" %}</td>
+        <td>{% translate "time" %}</td>
         <td>{% now "H:i d/m/Y" %}</td>
     </tr>
     <tr>
-        <td>{% trans "user agent" %}</td>
+        <td>{% translate "user agent" %}</td>
         <td>{{ user_agent }}</td>
     </tr>
     <tr>
-        <td>{% trans "referer" %}</td>
+        <td>{% translate "referer" %}</td>
         <td>{{ referer }}</td>
     </tr>
     </tbody>

From e21fd0b9e09a77585c5657e3985e8353d5ecdb26 Mon Sep 17 00:00:00 2001
From: Benjamin PIERRE <contact@benjamin-pierre.dev>
Date: Tue, 18 Nov 2025 11:34:22 +0100
Subject: [PATCH 2/4] FIX: Remove captcha field value from sent mail

---
 .../mails/default/mail_html.html                       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
index 5ae4a5a..9429a73 100644
--- a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
+++ b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
@@ -10,10 +10,12 @@ <h1>{% translate "Form submission" %}</h1>
     </thead>
     <tbody>
     {% for field, value in cleaned_data.items %}
-    <tr>
-        <td>{{ field }}</td>
-        <td>{{ value }}</td>
-    </tr>
+        {% if field != 'captcha_field' %}
+            <tr>
+                <td>{{ field }}</td>
+                <td>{{ value }}</td>
+            </tr>
+        {% endif %}
     {% endfor %}
     <tr>
         <td>{% translate "time" %}</td>

From b18616e3e695323419a1cb59d0d64d762102dc83 Mon Sep 17 00:00:00 2001
From: Benjamin PIERRE <contact@benjamin-pierre.dev>
Date: Tue, 18 Nov 2025 16:32:25 +0100
Subject: [PATCH 3/4] FEAT: Remove captcha_field value from FrontendForm
 cleaned_data

---
 djangocms_form_builder/forms.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/djangocms_form_builder/forms.py b/djangocms_form_builder/forms.py
index 2cdf26d..687d884 100644
--- a/djangocms_form_builder/forms.py
+++ b/djangocms_form_builder/forms.py
@@ -45,7 +45,10 @@ def clean(self):
                 raise ValidationError(
                     _("Please login before submitting this form."), code="unauthorized"
                 )
-        return super().clean()
+
+        cleaned_data = super().clean()
+        cleaned_data.pop("captcha_field", None)
+        return cleaned_data
 
     def save(self):
         results = {}

From 39fdd70f81075a7e4ab5190d87b5fea3a491dbd8 Mon Sep 17 00:00:00 2001
From: Benjamin PIERRE <contact@benjamin-pierre.dev>
Date: Tue, 18 Nov 2025 16:33:42 +0100
Subject: [PATCH 4/4] Revert "FIX: Remove captcha field value from sent mail"

This reverts commit e21fd0b9e09a77585c5657e3985e8353d5ecdb26.
---
 .../mails/default/mail_html.html                       | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
index 9429a73..5ae4a5a 100644
--- a/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
+++ b/djangocms_form_builder/templates/djangocms_form_builder/mails/default/mail_html.html
@@ -10,12 +10,10 @@ <h1>{% translate "Form submission" %}</h1>
     </thead>
     <tbody>
     {% for field, value in cleaned_data.items %}
-        {% if field != 'captcha_field' %}
-            <tr>
-                <td>{{ field }}</td>
-                <td>{{ value }}</td>
-            </tr>
-        {% endif %}
+    <tr>
+        <td>{{ field }}</td>
+        <td>{{ value }}</td>
+    </tr>
     {% endfor %}
     <tr>
         <td>{% translate "time" %}</td>