Merge remote-tracking branch 'origin/master'

dav_events/models/event.py

@@ -13,7 +13,7 @@ from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.db import models
 from django.template.loader import get_template
-from django.utils.translation import get_language, ugettext_lazy as _
+from django.utils.translation import get_language, gettext_lazy as _
 from django_countries.fields import Country, CountryField
 
 from .. import choices

dav_events/models/eventstatus.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..validators import IdStringValidator
 

dav_events/models/oneclickaction.py

@@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext, ugettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 
 from .event import Event
 
@@ -51,7 +51,7 @@ class OneClickAction(models.Model):
         if self.done and not self.allow_repeat:
             result['context'] = {
                 'status': 'warning',
-                'message': ugettext('Diese Aktion hast du bereits ausgeführt.'),
+                'message': gettext('Diese Aktion hast du bereits ausgeführt.'),
             }
             return result
 
@@ -78,17 +78,17 @@ class OneClickAction(models.Model):
 
                 flag = event.flags.filter(status__code=status_code).first()
                 if flag:
-                    message = (ugettext('Der Status wurde bereits'
-                                        ' am %(date)s'
-                                        ' von %(user)s'
-                                        ' auf \'%(status)s\' gesetzt.') % {
+                    message = (gettext('Der Status wurde bereits'
+                                       ' am %(date)s'
+                                       ' von %(user)s'
+                                       ' auf \'%(status)s\' gesetzt.') % {
                         'status': flag.status.label,
                         'date': timezone.localtime(flag.timestamp).strftime('%d.%m.%Y %H:%M:%S'),
                         'user': flag.user.get_full_name(),
                     })
                 else:
                     flag = event.workflow.update_status(status_code, user)
-                    message = (ugettext('Der Status wurde auf \'%(status)s\' gesetzt.') %
+                    message = (gettext('Der Status wurde auf \'%(status)s\' gesetzt.') %
                                {'status': flag.status.label})
 
                 result['context'] = {
@@ -109,7 +109,7 @@ class OneClickAction(models.Model):
         else:
             result['context'] = {
                 'status': 'danger',
-                'message': ugettext('Invalid Command. Code on fire!'),
+                'message': gettext('Invalid Command. Code on fire!'),
             }
 
         return result

dav_events/models/participant.py

@@ -4,7 +4,7 @@ import datetime
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from dav_base.validators import DAVNumberValidator
 

dav_events/models/trash/trashed_participant.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..participant import AbstractParticipant