From e6a91a8e8a7e3007e50daf09dc6ccc74e64dc83d Mon Sep 17 00:00:00 2001
From: Julian Dehm <j.dehm@liqd.net>
Date: Thu, 6 Jun 2024 11:26:37 +0200
Subject: [PATCH] apps/djangosaml2_overwrites: fix deprecation of ugettext

---
 apps/djangosaml2_overwrites/forms.py | 46 ++++++++++++----------------
 apps/djangosaml2_overwrites/views.py | 22 +++++++------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/apps/djangosaml2_overwrites/forms.py b/apps/djangosaml2_overwrites/forms.py
index 1e65f8eb1..378b875e2 100644
--- a/apps/djangosaml2_overwrites/forms.py
+++ b/apps/djangosaml2_overwrites/forms.py
@@ -1,59 +1,53 @@
 from allauth.account.models import EmailAddress
 from django import forms
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
 
 from apps.users.models import User
 
 
 class Djangosaml2SignupForm(forms.ModelForm):
-    terms_of_use = forms.BooleanField(
-        label=_('Terms of use')
-    )
-    data_protection = forms.BooleanField(
-        label=_('Data protection')
-    )
+    terms_of_use = forms.BooleanField(label=_("Terms of use"))
+    data_protection = forms.BooleanField(label=_("Data protection"))
     get_notifications = forms.BooleanField(
         label=pgettext_lazy(
-            'diid',
-            'Notifications: Yes, I would like to be notified by e-mail about '
-            'the beginning and end of participation opportunities and about '
-            'comments on my contributions by other users. This applies to all '
-            'projects I follow.'
+            "diid",
+            "Notifications: Yes, I would like to be notified by e-mail about "
+            "the beginning and end of participation opportunities and about "
+            "comments on my contributions by other users. This applies to all "
+            "projects I follow.",
         ),
-        required=False
+        required=False,
     )
     get_newsletters = forms.BooleanField(
         label=pgettext_lazy(
-            'diid',
-            'Newsletter: Yes, I would like to receive e-mail newsletters '
-            'about the projects I follow.'
+            "diid",
+            "Newsletter: Yes, I would like to receive e-mail newsletters "
+            "about the projects I follow.",
         ),
-        required=False
+        required=False,
     )
 
     class Meta:
         model = User
-        fields = [
-            'username',
-            'get_notifications',
-            'get_newsletters'
-        ]
+        fields = ["username", "get_notifications", "get_newsletters"]
 
     def clean_username(self):
-        username = self.cleaned_data['username']
+        username = self.cleaned_data["username"]
         try:
             user = User.objects.get(username__iexact=username)
             if user != self.instance:
                 raise forms.ValidationError(
-                    User._meta.get_field('username').error_messages['unique'])
+                    User._meta.get_field("username").error_messages["unique"]
+                )
         except User.DoesNotExist:
             pass
         return username
 
     def save(self):
-        email_address = EmailAddress.objects.get(user=self.instance,
-                                                 email=self.instance.email)
+        email_address = EmailAddress.objects.get(
+            user=self.instance, email=self.instance.email
+        )
         email_address.verified = True
         email_address.save()
         super().save()
diff --git a/apps/djangosaml2_overwrites/views.py b/apps/djangosaml2_overwrites/views.py
index d1199acb6..3093d35fb 100644
--- a/apps/djangosaml2_overwrites/views.py
+++ b/apps/djangosaml2_overwrites/views.py
@@ -2,7 +2,7 @@
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib.sites.shortcuts import get_current_site
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import generic
 from djangosaml2.utils import validate_referral_url
 
@@ -11,14 +11,14 @@
 from . import forms
 
 
-class Djangosaml2SignupView(LoginRequiredMixin,
-                            SuccessMessageMixin,
-                            generic.UpdateView):
+class Djangosaml2SignupView(
+    LoginRequiredMixin, SuccessMessageMixin, generic.UpdateView
+):
 
     model = User
-    template_name = 'djangosaml2_overwrites/signup.html'
+    template_name = "djangosaml2_overwrites/signup.html"
     form_class = forms.Djangosaml2SignupForm
-    success_message = _('Your profile was successfully updated.')
+    success_message = _("Your profile was successfully updated.")
 
     def get_object(self):
         return get_object_or_404(User, pk=self.request.user.id)
@@ -33,7 +33,11 @@ def get_context_data(self, **kwargs):
         ret = super().get_context_data(**kwargs)
         redirect_field_value = self.request.GET.get("next")
         site = get_current_site(self.request)
-        ret.update({"site": site,
-                    "redirect_field_name": "next",
-                    "redirect_field_value": redirect_field_value})
+        ret.update(
+            {
+                "site": site,
+                "redirect_field_name": "next",
+                "redirect_field_value": redirect_field_value,
+            }
+        )
         return ret