Commit 7781cd45 authored by Jelle Besseling's avatar Jelle Besseling

Remove redundant "What" from newsletter event box

parent 7687fc82
......@@ -27,7 +27,7 @@ class NewsletterEventForm(forms.ModelForm):
class Meta:
fields = ('order', 'event', 'title_en', 'title_nl',
'description_en', 'description_nl', 'what_en', 'what_nl',
'description_en', 'description_nl',
'where_en', 'where_nl', 'start_datetime', 'end_datetime',
'show_costs_warning', 'price', 'penalty_costs')
model = NewsletterEvent
......
This diff was suppressed by a .gitattributes entry.
......@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thaliawebsite: nieuwsbrieven\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-07 14:29+0200\n"
"POT-Creation-Date: 2019-11-03 18:14+0100\n"
"PO-Revision-Date: 2019-06-07 15:03+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: Technicie <www@thalia.nu>\n"
......@@ -78,10 +78,6 @@ msgstr "Beschrijving"
msgid "order"
msgstr "volgorde"
#: models.py templates/newsletters/email.html templates/newsletters/email.txt
msgid "What"
msgstr "Wat"
#: models.py templates/newsletters/email.html templates/newsletters/email.txt
msgid "Where"
msgstr "Waar"
......
# Generated by Django 2.2.1 on 2019-11-03 17:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('newsletters', '0008_auto_20190413_1603'),
]
operations = [
migrations.RemoveField(
model_name='newsletterevent',
name='what_en',
),
migrations.RemoveField(
model_name='newsletterevent',
name='what_nl',
),
]
......@@ -148,13 +148,6 @@ class NewsletterItem(NewsletterContent):
class NewsletterEvent(NewsletterContent):
"""Describes one piece of event content of a newsletter"""
what = MultilingualField(
models.CharField,
max_length=150,
verbose_name=_('What'),
blank=False,
null=False,
)
where = MultilingualField(
models.CharField,
......
......@@ -104,16 +104,6 @@
<td style="vertical-align: top;">
<div style="padding: 20px; background-color: black; border-left: 5px solid {{ primary_color }};">
<div style="margin-bottom: 5px;">
<b style="font-family: Calibri, 'Trebuchet MS', sans-serif;font-size: 15px; color: {{ primary_color }};">
{% trans "What"|upper %}
</b>
<br>
<span style="font-family: Arial, sans-serif; font-size: 15px; color: white; ">
{{ item.newsletterevent.what }}
</span>
</div>
<div style="margin-bottom: 5px;">
<b style="font-family: Calibri, 'Trebuchet MS', sans-serif;font-size: 15px; color: {{ primary_color }};">
{% trans "Where"|upper %}
......
......@@ -14,7 +14,6 @@
{% 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 }}
{% 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 %}
......
......@@ -180,8 +180,6 @@ class NewsletterEventsTest(TestCase):
title_en='testevent',
description_nl='testbesc',
description_en='testdesc',
what_nl='wat',
what_en='what',
where_nl='waar',
where_en='where',
start_datetime=timezone.now().date().replace(
......
Markdown is supported
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