Commit e027af25 authored by Luko van der Maas's avatar Luko van der Maas
Browse files

Merge branch 'fix/costs-warning-newsletter' into 'master'

Base costs warning in newsletter only on the checkbox

Closes #860

See merge request !1229
parents 9c99b670 e192a5ef
......@@ -96,7 +96,7 @@
<td style="{{ item_tr_style }}">
{{ item.description|safe }}
{% if item.newsletterevent.price != 0 and item.newsletterevent.show_costs_warning %}
{% if item.newsletterevent.show_costs_warning %}
<p style="font-family: Arial, sans-serif">
<i><b>{% trans "Attention" %}:</b> {% trans "Registration deadline = unregistration deadline" %}!
{% trans "Thalia will recover the costs on you if you do not unregister on time" %}.
......
......@@ -11,7 +11,7 @@
{% for item in newsletter.newslettercontent_set.all %}{{ item.title|upper }}:
{{ item.description|striptags }}
{% if item.newsletterevent %}{% if item.newsletterevent.price != 0 and item.newsletterevent.show_costs_warning %}
{% if item.newsletterevent %}{% if 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 %}: {{ item.newsletterevent.what }}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment