diff --git a/com/models.py b/com/models.py index 9775d547..c60c97a9 100644 --- a/com/models.py +++ b/com/models.py @@ -115,7 +115,7 @@ class Weekmail(models.Model): email = EmailMultiAlternatives( subject=self.title, body=self.render_text(), - from_email=settings.DEFAULT_FROM_EMAIL, + from_email=settings.SITH_COM_EMAIL, to=Sith.objects.first().weekmail_destinations.split(' '), bcc=dest, ) diff --git a/com/templates/com/weekmail_renderer_html.jinja b/com/templates/com/weekmail_renderer_html.jinja index bc913434..a713b028 100644 --- a/com/templates/com/weekmail_renderer_html.jinja +++ b/com/templates/com/weekmail_renderer_html.jinja @@ -10,16 +10,16 @@ img {
-

{{ weekmail.title }}

+

{{ weekmail.title }}

{% if weekmail.intro %} -

{% trans %}Intro{% endtrans %}

+

{% trans %}Intro{% endtrans %}

{{ weekmail.intro|markdown }} {% endif %} -

{% trans %}Table of content{% endtrans %}

+

{% trans %}Table of content{% endtrans %}

{%- for a in weekmail.articles.all() %} -

[{{ a.club }}] {{ a.title }}

+

[{{ a.club }}] {{ a.title }}

{{ a.content|markdown }} {%- endfor -%} {%- if weekmail.joke %} -

{% trans %}Joke{% endtrans %}

+

{% trans %}Joke{% endtrans %}

{{ weekmail.joke|markdown }} {% endif -%} {%- if weekmail.protip %} -

{% trans %}Pro tip{% endtrans %}

+

{% trans %}Pro tip{% endtrans %}

{{ weekmail.protip|markdown }} {% endif -%} {%- if weekmail.conclusion %} -

{% trans %}Final word{% endtrans %}

+

{% trans %}Final word{% endtrans %}

{{ weekmail.conclusion|markdown }} {% endif -%} diff --git a/sith/settings.py b/sith/settings.py index ca6a8845..04cc00d2 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -237,6 +237,7 @@ LOGIN_URL = '/login' LOGOUT_URL = '/logout' LOGIN_REDIRECT_URL = '/' DEFAULT_FROM_EMAIL="bibou@git.an" +SITH_COM_EMAIL="bibou_com@git.an" # Email EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'