feat: add plaintext versions of the e-mail
This commit is contained in:
@@ -23,7 +23,7 @@ def mail_admins_new_report(report):
|
|||||||
|
|
||||||
subject = _("Neue Meldung")
|
subject = _("Neue Meldung")
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/report.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/report.html', context)
|
||||||
plain_message = strip_tags(html_message)
|
plain_message = render_to_string('fellchensammlung/mail/notifications/report.txt', context)
|
||||||
|
|
||||||
mail.send_mail(subject,
|
mail.send_mail(subject,
|
||||||
plain_message,
|
plain_message,
|
||||||
@@ -41,20 +41,27 @@ def send_notification_email(notification_pk):
|
|||||||
context["user_comment"] = notification.report.user_comment
|
context["user_comment"] = notification.report.user_comment
|
||||||
context["report_url"] = f"{base_url}{notification.report.get_absolute_url()}"
|
context["report_url"] = f"{base_url}{notification.report.get_absolute_url()}"
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/report.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/report.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/report.txt', context)
|
||||||
elif notification.notification_type == NotificationTypeChoices.NEW_USER:
|
elif notification.notification_type == NotificationTypeChoices.NEW_USER:
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/new-user.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/new-user.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/new-user.txt', context)
|
||||||
elif notification.notification_type == NotificationTypeChoices.AN_IS_TO_BE_CHECKED:
|
elif notification.notification_type == NotificationTypeChoices.AN_IS_TO_BE_CHECKED:
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/an-to-be-checked.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/an-to-be-checked.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/an-to-be-checked.txt', context)
|
||||||
elif notification.notification_type == NotificationTypeChoices.AN_WAS_DEACTIVATED:
|
elif notification.notification_type == NotificationTypeChoices.AN_WAS_DEACTIVATED:
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/an-deactivated.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/an-deactivated.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/an-deactivated.txt', context)
|
||||||
elif notification.notification_type == NotificationTypeChoices.AN_FOR_SEARCH_FOUND:
|
elif notification.notification_type == NotificationTypeChoices.AN_FOR_SEARCH_FOUND:
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/an-for-search-found.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/an-for-search-found.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/an-for-search-found.txt', context)
|
||||||
elif notification.notification_type == NotificationTypeChoices.NEW_COMMENT:
|
elif notification.notification_type == NotificationTypeChoices.NEW_COMMENT:
|
||||||
html_message = render_to_string('fellchensammlung/mail/notifications/new-comment.html', context)
|
html_message = render_to_string('fellchensammlung/mail/notifications/new-comment.html', context)
|
||||||
|
plain_message = render_to_string('fellchensammlung/mail/notifications/new-comment.txt', context)
|
||||||
else:
|
else:
|
||||||
raise NotImplementedError("Unknown notification type")
|
raise NotImplementedError("Unknown notification type")
|
||||||
|
|
||||||
plain_message = strip_tags(html_message)
|
if "plain_message" not in locals():
|
||||||
|
plain_message = strip_tags(html_message)
|
||||||
mail.send_mail(subject, plain_message, settings.DEFAULT_FROM_EMAIL,
|
mail.send_mail(subject, plain_message, settings.DEFAULT_FROM_EMAIL,
|
||||||
[notification.user_to_notify.email],
|
[notification.user_to_notify.email],
|
||||||
html_message=html_message)
|
html_message=html_message)
|
||||||
|
@@ -252,6 +252,9 @@ class User(AbstractUser):
|
|||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return reverse("user-detail", args=[str(self.pk)])
|
return reverse("user-detail", args=[str(self.pk)])
|
||||||
|
|
||||||
|
def get_full_url(self):
|
||||||
|
return f"{base_url}{self.get_absolute_url()}"
|
||||||
|
|
||||||
def get_notifications_url(self):
|
def get_notifications_url(self):
|
||||||
return self.get_absolute_url()
|
return self.get_absolute_url()
|
||||||
|
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
{% block content %}{% endblock %}
|
||||||
|
|
||||||
|
---
|
||||||
|
{% include "fellchensammlung/mail/footer.txt" %}
|
@@ -0,0 +1 @@
|
|||||||
|
🐀 notfellchen.org | Für Menschen die Ratten aus dem Tierschutz ein liebendes Zuhause geben wollen.
|
@@ -0,0 +1,7 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.txt" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
die Vermittlung {{ notification.adoption_notice }} wurde deaktiviert.
|
||||||
|
{% endblocktranslate %}
|
||||||
|
|
||||||
|
{% translate 'Vermittlung anzeigen' %}: {{ notification.adoption_notice.get_full_url }}{% endblock %}
|
@@ -0,0 +1,9 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.txt" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
|
||||||
|
es wurde eine neue Vermittlung gefunden, die deinen Kriterien entspricht: {{ notification.adoption_notice }}
|
||||||
|
|
||||||
|
|
||||||
|
Vermittlung anzeigen: {{ notification.adoption_notice.get_full_url }}
|
||||||
|
{% endblocktranslate %}{% endblock %}
|
@@ -0,0 +1,8 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.txt" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
|
||||||
|
die Vermittlung {{ notification.adoption_notice }} muss überprüft werden.
|
||||||
|
|
||||||
|
Vermittlung anzeigen: {{ notification.adoption_notice.get_full_url }}
|
||||||
|
{% endblocktranslate %}{% endblock %}
|
@@ -0,0 +1,11 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% load custom_tags %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
|
||||||
|
folgender Kommentar wurde zur Vermittlung {{ notification.adoption_notice }} hinzugefügt:
|
||||||
|
|
||||||
|
{{ notification.comment.text }}
|
||||||
|
|
||||||
|
Vermittlung anzeigen: {{ notification.adoption_notice.get_full_url }}
|
||||||
|
{% endblocktranslate %}{% endblock %}
|
@@ -14,6 +14,6 @@
|
|||||||
Details findest du hier
|
Details findest du hier
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="{{ notification.user_related.get_absolute_url }}" class="cta-button">{% translate 'User anzeigen' %}</a>
|
<a href="{{ notification.user_related.get_full_url }}" class="cta-button">{% translate 'User anzeigen' %}</a>
|
||||||
</p>
|
</p>
|
||||||
{% endblock %}
|
{% endblock %}
|
@@ -0,0 +1,12 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.txt" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
|
||||||
|
es wurde ein neuer Useraccount erstellt.
|
||||||
|
|
||||||
|
{{ notification }}
|
||||||
|
Related: {{ notification.user_related }}
|
||||||
|
{{ notification.user_related.get_full_url }}
|
||||||
|
|
||||||
|
User anzeigen: {{ notification.user_related.get_full_url }}
|
||||||
|
{% endblocktranslate %}{% endblock %}
|
@@ -0,0 +1,11 @@
|
|||||||
|
{% extends "fellchensammlung/mail/base.txt" %}
|
||||||
|
{% load i18n %}
|
||||||
|
{% block content %}{% blocktranslate %}Moin,
|
||||||
|
|
||||||
|
es gibt eine neue Meldung. Folgende Nachricht wurde zur Meldung hinzugefügt:
|
||||||
|
|
||||||
|
{{ user_comment }}
|
||||||
|
|
||||||
|
Bitte bearbeite die Meldung möglichst bald.
|
||||||
|
|
||||||
|
Meldung bearbeiten: {{ report_url }}{% endblocktranslate %}{% endblock %}
|
Reference in New Issue
Block a user