From 939fd4f0c09fbc185f058036375091281cc89273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Vinot?= <benoit.vinot@roseautechnologies.com>
Date: Mon, 5 Feb 2024 13:48:33 +0100
Subject: [PATCH 1/3] Delete a warning with Python 3.12

---
 grappelli/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grappelli/settings.py b/grappelli/settings.py
index b8a07b310..6a1fb95ce 100644
--- a/grappelli/settings.py
+++ b/grappelli/settings.py
@@ -24,7 +24,7 @@
 # SWITCH_USER_ORIGINAL: Defines if a user is a valid target.
 # Gets a user object and returns True/False.
 SWITCH_USER_TARGET = getattr(settings, "GRAPPELLI_SWITCH_USER_TARGET", lambda original_user, user: user.is_staff and not user.is_superuser)
-SWITCH_USER_REGEX = getattr(settings, "GRAPPELLI_SWITCH_USER_REGEX", "\d+")
+SWITCH_USER_REGEX = getattr(settings, "GRAPPELLI_SWITCH_USER_REGEX", r"\d+")
 
 # CLEAN INPUT TYPES
 # Replaces input types: search, email, url, tel, number, range, date

From 2b91886eff6d9fbbe0e7597b5264a5d160513c3e Mon Sep 17 00:00:00 2001
From: Slava <slava.khromyak@gmail.com>
Date: Thu, 22 Feb 2024 16:58:52 +0200
Subject: [PATCH 2/3] Fix translation not working in delete_confirmation.html

Fix the translation strings used for the button. Otherwise, the translation won't work.
---
 grappelli/templates/admin/delete_confirmation.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grappelli/templates/admin/delete_confirmation.html b/grappelli/templates/admin/delete_confirmation.html
index 06a7f4675..cdbdc3e2c 100644
--- a/grappelli/templates/admin/delete_confirmation.html
+++ b/grappelli/templates/admin/delete_confirmation.html
@@ -52,8 +52,8 @@ <h2>{% blocktrans with escaped_object=object %}Are you sure you want to delete t
                 <div class="grp-module grp-submit-row grp-fixed-footer">
                     <ul>
                         {% url opts|admin_urlname:'change' object.pk|admin_urlquote as object_url %}
-                        <li class="grp-float-left"><a href="{% add_preserved_filters object_url %}" class="grp-button grp-cancel-link">{% trans "Cancel" %}</a></li>
-                        <li><input type="submit" value="{% trans "Yes, I'm sure" %}" class="grp-button grp-default" /></li>
+                        <li class="grp-float-left"><a href="{% add_preserved_filters object_url %}" class="grp-button grp-cancel-link">{% trans "No, take me back" %}</a></li>
+                        <li><input type="submit" value="{% trans "Yes, I’m sure" %}" class="grp-button grp-default" /></li>
                     </ul>
                     <input type="hidden" name="post" value="yes" />
                     {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}

From 89bfaca3a86e31198cad06c4af6873d439fcb6bb Mon Sep 17 00:00:00 2001
From: Martnart <64293438+emdede@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:55:29 +0100
Subject: [PATCH 3/3] Trigger change event in dismissRelatedLookupPopup

---
 grappelli/static/admin/js/admin/RelatedObjectLookups.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grappelli/static/admin/js/admin/RelatedObjectLookups.js b/grappelli/static/admin/js/admin/RelatedObjectLookups.js
index 586dc4cc9..1fd6a7655 100644
--- a/grappelli/static/admin/js/admin/RelatedObjectLookups.js
+++ b/grappelli/static/admin/js/admin/RelatedObjectLookups.js
@@ -52,6 +52,7 @@
         }
         // GRAPPELLI CUSTOM: element focus
         elem.focus();
+        $(elem).trigger('change');
         win.close();
     }