Merge branch 'fix/newsletter-plaintext-events' into 'master'

Fix event dates in plaintext newsletters

Closes #435

See merge request !493

website/newsletters/templates/newsletters/email.txt

@@ -11,13 +11,13 @@
 
 {% for item in newsletter.newslettercontent_set.all %}{{ item.title|upper }}:
  {{ item.description|striptags }}
- {% if item.newsletterevent %}{% if event.price != 0 and event.show_costs_warning %}
- {% trans "Attention" %}: {% trans "Registration deadline = unregistration deadline" %}! {% trans "Thalia will recover the costs on you if you do not unregister on time" %}. {% if event.penalty_costs and event.penalty_costs > 0 %}{% trans "These costs are" %}: €{{ event.penalty_costs }}.{% endif %}
+ {% if item.newsletterevent %}{% if item.newsletterevent.price != 0 and item.newsletterevent.show_costs_warning %}
+ {% trans "Attention" %}: {% trans "Registration deadline = unregistration deadline" %}! {% trans "Thalia will recover the costs on you if you do not unregister on time" %}. {% if item.newsletterevent.penalty_costs and item.newsletterevent.penalty_costs > 0 %}{% trans "These costs are" %}: €{{ item.newsletterevent.penalty_costs }}.{% endif %}
 {% endif %}
- {% trans "What"|upper %}: {{ event.what }}
- {% trans "Where"|upper %}: {{ event.where }}
- {% trans "When"|upper %}: {% if event.start_datetime == event.end_datetime %}{{ event.start_datetime }}{% elif event.start_datetime|date:'d-M-Y' == event.end_datetime|date:'d-M-Y' %}{{ event.start_datetime }} - {{ event.end_datetime|date:'H:i' }}{% else %}{{ event.start_datetime }} - {{ event.end_datetime }}{% endif %}
- {% if event.price is not None %}{% trans "Price"|upper %}: {% if event.price == 0 %}{% trans "Free" %}{% else %}€{{ event.price }}{% endif %}{% endif %}
+ {% trans "What"|upper %}: {{ item.newsletterevent.what }}
+ {% trans "Where"|upper %}: {{ item.newsletterevent.where }}
+ {% trans "When"|upper %}: {% if item.newsletterevent.start_datetime == item.newsletterevent.end_datetime %}{{ item.newsletterevent.start_datetime }}{% elif item.newsletterevent.start_datetime|date:'d-M-Y' == item.newsletterevent.end_datetime|date:'d-M-Y' %}{{ item.newsletterevent.start_datetime }} - {{ item.newsletterevent.end_datetime|date:'H:i' }}{% else %}{{ item.newsletterevent.start_datetime }} - {{ item.newsletterevent.end_datetime }}{% endif %}
+ {% if item.newsletterevent.price is not None %}{% trans "Price"|upper %}: {% if item.newsletterevent.price == 0 %}{% trans "Free" %}{% else %}€{{ item.newsletterevent.price }}{% endif %}{% endif %}
  {% endif %}
 {% endfor %}