diff options
Diffstat (limited to 'app/lttr')
| -rw-r--r-- | app/lttr/models.py | 13 | ||||
| -rw-r--r-- | app/lttr/validators.py | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/lttr/models.py b/app/lttr/models.py index 5fed036..6414039 100644 --- a/app/lttr/models.py +++ b/app/lttr/models.py @@ -5,7 +5,6 @@ from django.contrib.gis.db import models from django.db.models.signals import post_save from django.contrib.sites.models import Site from django.template.loader import select_template -from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from django.utils.text import slugify from django.urls import reverse @@ -356,10 +355,10 @@ class StatusType(models.IntegerChoices): class MailingStatus(models.Model): - newsletter_mailing = models.ForeignKey(NewsletterMailing, on_delete=models.CASCADE, verbose_name=_('newsletter')) - subscriber = models.ForeignKey(Subscriber, on_delete=models.CASCADE, verbose_name=_('subscriber')) + newsletter_mailing = models.ForeignKey(NewsletterMailing, on_delete=models.CASCADE, verbose_name=('newsletter')) + subscriber = models.ForeignKey(Subscriber, on_delete=models.CASCADE, verbose_name=('subscriber')) status = models.IntegerField(choices=StatusType.choices, null=True) - creation_date = models.DateTimeField(_('creation date'), auto_now_add=True) + creation_date = models.DateTimeField(('creation date'), auto_now_add=True) def newsletter(self): return self.newsletter_mailing.newsletter @@ -371,8 +370,8 @@ class MailingStatus(models.Model): class Meta: ordering = ('-creation_date',) - verbose_name = _('subscriber mailing status') - verbose_name_plural = _('subscriber mailing statuses') + verbose_name = ('subscriber mailing status') + verbose_name_plural = ('subscriber mailing statuses') ''' @@ -386,7 +385,7 @@ n.send_mailings() def send_notification_email(newsletter, message, instance): recipient_list = ['sng@luxagraf.net',] - subject = _('[%(site)s] New Subscriber to "%(object)s"') % { + subject = ('[%(site)s] New Subscriber to "%(object)s"') % { 'site': Site.objects.get_current().name, 'object': newsletter, } diff --git a/app/lttr/validators.py b/app/lttr/validators.py index a6355bf..581043c 100644 --- a/app/lttr/validators.py +++ b/app/lttr/validators.py @@ -1,6 +1,5 @@ from django.contrib.auth import get_user_model from django.forms.utils import ValidationError -from django.utils.translation import ugettext_lazy as _ def validate_email_nouser(email): |