From d8cbe629193a4613dad5bd6a403001a1280a54cf Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@liip.ch>
Date: Thu, 4 Mar 2021 17:30:37 +0100
Subject: [PATCH 1/7] feat: update template for django 3

---
 lock_tokens/templates/api/load_client.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lock_tokens/templates/api/load_client.html b/lock_tokens/templates/api/load_client.html
index 7f8886b..edc086a 100644
--- a/lock_tokens/templates/api/load_client.html
+++ b/lock_tokens/templates/api/load_client.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% if csrf %}{% csrf_token %}{% endif %}
 <script src="{% static "lock_tokens/js/lock_tokens.js" %}" type="text/javascript"></script>
 <script type="text/javascript">

From d40f5fcb5c23a3c3fc9fc838ad29a166429c0e0b Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@liip.ch>
Date: Mon, 8 Mar 2021 10:28:04 +0100
Subject: [PATCH 2/7] feat: make plugin translatable

---
 lock_tokens/admin.py                        | 12 +++++++----
 lock_tokens/locale/de/LC_MESSAGES/django.po | 22 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100755 lock_tokens/locale/de/LC_MESSAGES/django.po

diff --git a/lock_tokens/admin.py b/lock_tokens/admin.py
index 7c6faf2..f60285a 100644
--- a/lock_tokens/admin.py
+++ b/lock_tokens/admin.py
@@ -2,6 +2,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.db.models import Count
+from django.utils.translation import gettext as _
 
 from lock_tokens.exceptions import AlreadyLockedError
 from lock_tokens.sessions import (
@@ -32,22 +33,25 @@ def change_view(self, request, object_id, form_url="", extra_context=None):
             lock_for_session(obj, request.session, force_new=force_new_session_lock)
             extra_context["lock_token"] = request.session[get_session_key(obj)]
         except AlreadyLockedError:
-            messages.add_message(request, messages.ERROR, "You cannot edit this "
-                                 "object, it has been locked. Come back later.")
+            messages.add_message(
+                request, 
+                messages.ERROR, 
+                _("You cannot edit this object, it has been locked. Come back later.")
+            )
         return super(LockableModelAdmin, self).change_view(request, object_id,
                                                            form_url, extra_context)
 
     def save_model(self, request, obj, form, change):
         if change:
             if not check_for_session(obj, request.session):
-                raise PermissionDenied("Invalid lock, cannot save.")
+                raise PermissionDenied(_("Invalid lock, cannot save."))
             try:
               # Renew lock to make sure it is still valid when saving
               lock_for_session(obj, request.session)
             except AlreadyLockedError:
               # Race condition: lock expired just after the check_for_session call and
               # someone else locked the object before the lock_for_session call
-              raise PermissionDenied("Lock has expired, cannot save.")
+              raise PermissionDenied(_("Lock has expired, cannot save."))
         super(LockableModelAdmin, self).save_model(request, obj, form, change)
         if change:
             unlock_for_session(obj, request.session)
diff --git a/lock_tokens/locale/de/LC_MESSAGES/django.po b/lock_tokens/locale/de/LC_MESSAGES/django.po
new file mode 100755
index 0000000..852b7e5
--- /dev/null
+++ b/lock_tokens/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: lock_tokens\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-08 08:38-0600\n"
+"PO-Revision-Date: 2021-03-08 09:06+0100\n"
+"Last-Translator: Liip\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language-Team: \n"
+"X-Generator: Poedit 2.3\n"
+
+msgid "You cannot edit this object, it has been locked. Come back later."
+msgstr "Sie können dieses Objekt nicht bearbeiten, es wurde gesperrt. Versuchen Sie es später erneut."
+
+msgid "Invalid lock, cannot save."
+msgstr "Ungültige Sperre, kann nicht gespeichert werden."
+
+msgid "Lock has expired, cannot save."
+msgstr "Die Sperre ist abgelaufen, kann nicht gespeichert werden."

From 4d1ac75a169345136977d72613928f35ede46335 Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@liip.ch>
Date: Mon, 8 Mar 2021 10:33:47 +0100
Subject: [PATCH 3/7] feat: add mo file for translations

---
 lock_tokens/locale/de/LC_MESSAGES/django.mo | Bin 0 -> 702 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 lock_tokens/locale/de/LC_MESSAGES/django.mo

diff --git a/lock_tokens/locale/de/LC_MESSAGES/django.mo b/lock_tokens/locale/de/LC_MESSAGES/django.mo
new file mode 100755
index 0000000000000000000000000000000000000000..692db1bfd608b983d728b0f7daf4c7b519e925a8
GIT binary patch
literal 702
zcmaix&u$Yj5XKFJ%N{u*gyz7Fc-f>9N*6dlTTrA#joK7}gs8mh>BeMhZ*6Z{-hnG`
zz>Pa6Zg~&hfD2E+w<)C(7e@MN?D02$<oR)@_gTPt;2wAiZi9EAvj*G+XW%~g1fGMh
zpm#%vpYQ|l3+HY42RDT{hJO!_khlf9+MOXJ#MrJ>Z8X)cT=uC{*1AYRtvD4EglM4x
z@kL`i>wli#y7o%X+C+*A6UY@GxQu<my~`|^?WQ#Aly=-HQ=w3_R*`)wX5MvbIo9$u
z`(T{SH{#>ymTW_Ez>V`!PD5q1e9=}x&RtH)Y+oMm%5-|Ui%K~Sv*AEyTQVC_ww-5>
zA7+CrOC~BrIrqv2^m9I^i7^eLwrW*{EX~PuJl(tQJxH@;$Jxjhc^?}{B45NuO|6W5
zLghmF!13A9{G}XS>$>_U?B$*<oi?`0X;hf_w~d^$I>pd$<SVx9F9(^q&5sS!twbEz
zYW=;AreZp5*n95N5?df^%0;A#L&G?+k95vnvrWaWxss9zkyKG}t=bc||IIu^=5qbb
zT5Lrd4jgD73tPrN-3nH|V1p0n6W-2SG`t+a`<PO<q!zPS>Iy*+n)MfKlGs~rV=8_F
D+Sb%j

literal 0
HcmV?d00001


From 47fa4e65acabda215c5f9b10b76b04c160f83624 Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@liip.ch>
Date: Thu, 18 Mar 2021 14:13:32 +0100
Subject: [PATCH 4/7] fix: use default theme on add page

---
 lock_tokens/admin.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lock_tokens/admin.py b/lock_tokens/admin.py
index f60285a..92c06dd 100644
--- a/lock_tokens/admin.py
+++ b/lock_tokens/admin.py
@@ -14,8 +14,14 @@
 
 
 class LockableModelAdmin(admin.ModelAdmin):
+    def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
+        # use custom template in change view, but use default in add view, as lock is not used there
+        self.change_form_template = 'admin/lock_tokens_change_form.html'
+        if add:
+            self.change_form_template = None
 
-    change_form_template = 'admin/lock_tokens_change_form.html'
+        return super(LockableModelAdmin, self).render_change_form(request, context, add, change,
+                                                                  form_url, obj)
 
     def change_view(self, request, object_id, form_url="", extra_context=None):
         extra_context = extra_context or {}
@@ -34,8 +40,8 @@ def change_view(self, request, object_id, form_url="", extra_context=None):
             extra_context["lock_token"] = request.session[get_session_key(obj)]
         except AlreadyLockedError:
             messages.add_message(
-                request, 
-                messages.ERROR, 
+                request,
+                messages.ERROR,
                 _("You cannot edit this object, it has been locked. Come back later.")
             )
         return super(LockableModelAdmin, self).change_view(request, object_id,

From e7839bfdf9962873f251d2f78391b8d9e21c6a43 Mon Sep 17 00:00:00 2001
From: Lars Peyer <l.peyer@netfire.ch>
Date: Mon, 20 Feb 2023 14:28:23 +0100
Subject: [PATCH 5/7] Update urls to work with django 4.0

---
 lock_tokens/urls.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lock_tokens/urls.py b/lock_tokens/urls.py
index 82e0635..d8e88e9 100644
--- a/lock_tokens/urls.py
+++ b/lock_tokens/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import re_path
 
 from lock_tokens.views import LockTokenDetailView, LockTokenListView
 
@@ -6,8 +6,8 @@
 app_name = 'lock_tokens'
 
 urlpatterns = [
-    url(r'^(?P<app_label>\w+)/(?P<model>\w+)/(?P<object_id>\d+)/$',
+    re_path(r'^(?P<app_label>\w+)/(?P<model>\w+)/(?P<object_id>\d+)/$',
         LockTokenListView.as_view(), name='list-view'),
-    url(r'^(?P<app_label>\w+)/(?P<model>\w+)/(?P<object_id>\d+)/(?P<token>\w+)/$',
+    re_path(r'^(?P<app_label>\w+)/(?P<model>\w+)/(?P<object_id>\d+)/(?P<token>\w+)/$',
         LockTokenDetailView.as_view(), name='detail-view'),
 ]

From ed152f3e82f517046c31ccd795a8c1c2d62480c9 Mon Sep 17 00:00:00 2001
From: Lars Peyer <l.peyer@netfire.ch>
Date: Mon, 20 Feb 2023 14:30:30 +0100
Subject: [PATCH 6/7] Update urls to work with django 4.0

---
 lock_tokens/urls.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lock_tokens/urls.py b/lock_tokens/urls.py
index d8e88e9..2465ac0 100644
--- a/lock_tokens/urls.py
+++ b/lock_tokens/urls.py
@@ -1,5 +1,4 @@
-from django.conf.urls import re_path
-
+from django.urls import include, path
 from lock_tokens.views import LockTokenDetailView, LockTokenListView
 
 

From 1268d0e4a8d6492df144e291576e522700d5664a Mon Sep 17 00:00:00 2001
From: Lars Peyer <l.peyer@netfire.ch>
Date: Mon, 20 Feb 2023 14:31:08 +0100
Subject: [PATCH 7/7] Update urls to work with django 4.0

---
 lock_tokens/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lock_tokens/urls.py b/lock_tokens/urls.py
index 2465ac0..ab4890e 100644
--- a/lock_tokens/urls.py
+++ b/lock_tokens/urls.py
@@ -1,4 +1,4 @@
-from django.urls import include, path
+from django.urls import re_path
 from lock_tokens.views import LockTokenDetailView, LockTokenListView