Replaced ugettext and ugettext_lazy with gettext and gettext_lazy

ugettext and ugettext_lazy were deprecated in Django 3 and will be
removed in Django 4.

dav_auth/admin.py

@@ -2,7 +2,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import GroupAdmin as _GroupAdmin
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 admin.site.unregister(Group)
 
 

dav_auth/forms.py

@@ -2,7 +2,7 @@
 import logging
 from django import forms
 from django.contrib.auth import forms as auth_forms, password_validation
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 
 logger = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ class SetPasswordForm(forms.Form):
         if password1 and password2:
             if password1 != password2:
                 raise forms.ValidationError(
-                    ugettext('Passwörter stimmen nicht überein'),
+                    gettext('Passwörter stimmen nicht überein'),
                     code='password_mismatch',
                 )
         return password2

dav_auth/tests/test_forms.py

@@ -2,7 +2,7 @@
 from unittest import skip
 from django.contrib.auth import get_user_model
 from django.core import mail as django_mail
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 
 from dav_base.tests.generic import FormDataSet, FormsTestCase
 
@@ -25,8 +25,8 @@ class LoginFormTestCase(FormsTestCase):
 
     def test_labels(self):
         form = self.form_class()
-        self.assertEqual(form.fields['username'].label, ugettext('E-Mail-Adresse'))
-        self.assertEqual(form.fields['password'].label, ugettext('Password'))
+        self.assertEqual(form.fields['username'].label, gettext('E-Mail-Adresse'))
+        self.assertEqual(form.fields['password'].label, gettext('Password'))
 
     def test_required(self):
         form = self.form_class()
@@ -193,7 +193,7 @@ class CreateAndSendPasswordFormTestCase(FormsTestCase):
 
     def test_labels(self):
         form = self.form_class()
-        self.assertEqual(form.fields['username'].label, ugettext('E-Mail-Adresse'))
+        self.assertEqual(form.fields['username'].label, gettext('E-Mail-Adresse'))
 
     def test_required(self):
         form = self.form_class()

dav_auth/tests/test_screenshots.py

@@ -2,7 +2,7 @@
 from django.contrib.auth import get_user_model
 from django.test import tag
 from django.urls import reverse
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 
@@ -105,7 +105,7 @@ class TestCase(ScreenshotTestCase):
 
         # Click on 'set password' -> save set password page
         user_menu = c.find_element(By.CSS_SELECTOR, '#login-widget ul')
-        link = user_menu.find_element(By.PARTIAL_LINK_TEXT, ugettext('Passwort ändern'))
+        link = user_menu.find_element(By.PARTIAL_LINK_TEXT, gettext('Passwort ändern'))
         link.click()
         password_field = self.wait_on_presence(c, (By.ID, 'id_new_password'))
         self.save_screenshot('empty_set_password_form', sequence=sequence_name)
@@ -189,7 +189,7 @@ class TestCase(ScreenshotTestCase):
         dropdown_button = self.wait_on_presence(c, (By.ID, 'user_dropdown_button'))
         dropdown_button.click()
         user_menu = c.find_element(By.CSS_SELECTOR, '#login-widget ul')
-        link = user_menu.find_element(By.PARTIAL_LINK_TEXT, ugettext('Logout'))
+        link = user_menu.find_element(By.PARTIAL_LINK_TEXT, gettext('Logout'))
         link.click()
         self.wait_until_stale(c, user_menu)
         self.save_screenshot('logout_succeed', sequence=sequence_name)
@@ -200,7 +200,7 @@ class TestCase(ScreenshotTestCase):
         self.wait_on_presence(c, (By.ID, 'id_username'))
 
         # Locate password recreate link, click it -> save password recreate form
-        link = c.find_element(By.PARTIAL_LINK_TEXT, ugettext('Passwort vergessen'))
+        link = c.find_element(By.PARTIAL_LINK_TEXT, gettext('Passwort vergessen'))
         link.click()
         username_field = self.wait_on_presence(c, (By.ID, 'id_username'))
         self.save_screenshot('empty_recreate_password_form', sequence=sequence_name)
@@ -212,7 +212,7 @@ class TestCase(ScreenshotTestCase):
         self.save_screenshot('recreate_password_invalid_user', sequence=sequence_name)
 
         # Locate password recreate link, click it
-        link = c.find_element(By.PARTIAL_LINK_TEXT, ugettext('Passwort vergessen'))
+        link = c.find_element(By.PARTIAL_LINK_TEXT, gettext('Passwort vergessen'))
         link.click()
         username_field = self.wait_on_presence(c, (By.ID, 'id_username'))
 

dav_auth/tests/test_templates.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 from django.contrib.auth import get_user_model
 from django.test import SimpleTestCase, tag
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from django.urls import reverse
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.by import By
@@ -20,7 +20,7 @@ class TemplatesTestCase(SimpleTestCase):
     def test_recreate_link_in_login_form(self):
         login_url = reverse('dav_auth:login')
         recreate_url = reverse('dav_auth:recreate_password')
-        text = ugettext('Passwort vergessen?')
+        text = gettext('Passwort vergessen?')
         html = '<a href="{url}">{text}</a>'.format(url=recreate_url, text=text)
         response = self.client.get(login_url)
         self.assertInHTML(html, response.content.decode('utf-8'))

dav_auth/tests/test_views.py

@@ -4,7 +4,7 @@ from django.contrib.auth import get_user_model
 from django.core import mail as django_mail
 from django.shortcuts import resolve_url
 from django.test import TestCase
-from django.utils.translation import ugettext
+from django.utils.translation import gettext
 from django.urls import reverse
 
 from ..forms import LoginForm, SetPasswordForm, CreateAndSendPasswordForm
@@ -30,9 +30,9 @@ class ViewsTestCase(TestCase):
         cls.recreate_password_url = reverse('dav_auth:recreate_password')
 
         # Some messages
-        cls.wrong_credentials_message = ugettext('Benutzername oder Passwort falsch.')
-        cls.logout_message = ugettext('Benutzer abgemeldet.')
-        cls.set_password_message = ugettext('Passwort gespeichert.')
+        cls.wrong_credentials_message = gettext('Benutzername oder Passwort falsch.')
+        cls.logout_message = gettext('Benutzer abgemeldet.')
+        cls.set_password_message = gettext('Passwort gespeichert.')
 
     def setUp(self):
         super().setUp()
@@ -74,7 +74,7 @@ class ViewsTestCase(TestCase):
 
     def test_integrated_login_succeed(self):
         username = self.user.username
-        message = ugettext('Benutzer angemeldet: %(username)s') % {'username': username}
+        message = gettext('Benutzer angemeldet: %(username)s') % {'username': username}
 
         response = self.client.post(self.login_url, {'username': username, 'password': self.test_password})
         self.assertEqual(response.status_code, 302)

dav_auth/views.py

@@ -9,7 +9,7 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import resolve_url
 from django.urls import reverse_lazy, reverse
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views import generic
 
 from . import emails