Commit 6a3a87ca authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'sponsor_partner' into 'master'

Replace 'sponsor' with 'partner'

See merge request !903
parents 83e87bfa 1098d5e1
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-15 15:26+0200\n" "POT-Creation-Date: 2018-08-19 15:27+0200\n"
"PO-Revision-Date: 2018-08-15 15:29+0200\n" "PO-Revision-Date: 2018-08-19 15:27+0200\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n" "Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -311,8 +311,8 @@ msgid "Receive opt-in mailings" ...@@ -311,8 +311,8 @@ msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings" msgstr "Ontvang opt-in mailings"
#: models.py #: models.py
msgid "Receive mailings about vacancies and events from Thalia's sponsors." msgid "Receive mailings about vacancies and events from Thalia's partners."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren." msgstr "Ontvang mailings over vacatures en evenementen van Thalia's partners."
#: models.py #: models.py
msgid "Receive newsletter" msgid "Receive newsletter"
......
# Generated by Django 2.0.8 on 2018-08-19 13:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('members', '0022_auto_20180708_1802'),
]
operations = [
migrations.AlterField(
model_name='profile',
name='receive_optin',
field=models.BooleanField(default=True, help_text="Receive mailings about vacancies and events from Thalia's partners.", verbose_name='Receive opt-in mailings'),
),
]
...@@ -347,7 +347,7 @@ class Profile(models.Model): ...@@ -347,7 +347,7 @@ class Profile(models.Model):
receive_optin = models.BooleanField( receive_optin = models.BooleanField(
verbose_name=_('Receive opt-in mailings'), verbose_name=_('Receive opt-in mailings'),
help_text=_("Receive mailings about vacancies and events from Thalia's" help_text=_("Receive mailings about vacancies and events from Thalia's"
" sponsors."), " partners."),
default=True, default=True,
) )
......
...@@ -9,7 +9,7 @@ def showcased_partners(request): ...@@ -9,7 +9,7 @@ def showcased_partners(request):
For each user we generate a sequence of banners. This sequence For each user we generate a sequence of banners. This sequence
is then stored for that user, because doing it randomly creates is then stored for that user, because doing it randomly creates
a feel of an artificial 'bias' towards certain sponsors. Doing a feel of an artificial 'bias' towards certain partners. Doing
it this way ensures that everyone gets an exactly fair number of it this way ensures that everyone gets an exactly fair number of
views. views.
""" """
......
...@@ -8,7 +8,7 @@ msgstr "" ...@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n" "POT-Creation-Date: 2018-07-11 20:07+0200\n"
"PO-Revision-Date: 2018-06-07 16:19+0200\n" "PO-Revision-Date: 2018-08-19 15:24+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n" "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -16,7 +16,7 @@ msgstr "" ...@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.1.1\n"
#: partners/apps.py partners/templates/partners/index.html #: partners/apps.py partners/templates/partners/index.html
#: partners/templates/partners/partner.html #: partners/templates/partners/partner.html
...@@ -123,7 +123,7 @@ msgstr "" ...@@ -123,7 +123,7 @@ msgstr ""
#: partners/templates/partners/index.html #: partners/templates/partners/index.html
#: partners/templates/partners/partner.html #: partners/templates/partners/partner.html
msgid "Main Partner" msgid "Main Partner"
msgstr "Hoofdsponsor" msgstr "Hoofdpartner"
#: partners/templates/partners/index.html #: partners/templates/partners/index.html
#: partners/templates/partners/partner.html #: partners/templates/partners/partner.html
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</div> </div>
{% if vacancies|length > 0 %} {% if vacancies|length > 0 %}
<div id="sponsor_vacatures"> <div>
<h3>{% trans "All vacancies" %}</h3> <h3>{% trans "All vacancies" %}</h3>
<div class="row"> <div class="row">
......
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n" "POT-Creation-Date: 2018-08-19 15:30+0200\n"
"PO-Revision-Date: 2018-07-11 20:27+0200\n" "PO-Revision-Date: 2018-08-19 15:30+0200\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n" "Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -11,100 +11,100 @@ msgstr "" ...@@ -11,100 +11,100 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.8\n" "X-Generator: Poedit 2.1.1\n"
#: pushnotifications/admin.py #: admin.py
msgid "Enable selected devices" msgid "Enable selected devices"
msgstr "Activeer geselecteerde apparaten" msgstr "Activeer geselecteerde apparaten"
#: pushnotifications/admin.py #: admin.py
msgid "Disable selected devices" msgid "Disable selected devices"
msgstr "Deactiveer geselecteerde apparaten" msgstr "Deactiveer geselecteerde apparaten"
#: pushnotifications/admin.py #: admin.py
msgid "Name" msgid "Name"
msgstr "Naam" msgstr "Naam"
#: pushnotifications/apps.py #: apps.py
msgid "Push Notifications" msgid "Push Notifications"
msgstr "Pushnotificaties" msgstr "Pushnotificaties"
#: pushnotifications/models.py #: models.py
msgid "name" msgid "name"
msgstr "naam" msgstr "naam"
#: pushnotifications/models.py #: models.py
msgid "registration token" msgid "registration token"
msgstr "registratie token" msgstr "registratie token"
#: pushnotifications/models.py #: models.py
msgid "active" msgid "active"
msgstr "actief" msgstr "actief"
#: pushnotifications/models.py #: models.py
msgid "Inactive devices will not be sent notifications" msgid "Inactive devices will not be sent notifications"
msgstr "Inactieve apparaten zullen geen notificaties ontvangen" msgstr "Inactieve apparaten zullen geen notificaties ontvangen"
#: pushnotifications/models.py #: models.py
msgid "registration date" msgid "registration date"
msgstr "registratiedatum" msgstr "registratiedatum"
#: pushnotifications/models.py #: models.py
msgid "language" msgid "language"
msgstr "taal" msgstr "taal"
#: pushnotifications/models.py #: models.py
msgid "General" msgid "General"
msgstr "Algemeen" msgstr "Algemeen"
#: pushnotifications/models.py #: models.py
msgid "Pizza" msgid "Pizza"
msgstr "Pizza" msgstr "Pizza"
#: pushnotifications/models.py #: models.py
msgid "Events" msgid "Events"
msgstr "Evenementen" msgstr "Evenementen"
#: pushnotifications/models.py #: models.py
msgid "Newsletter" msgid "Newsletter"
msgstr "Nieuwsbrief" msgstr "Nieuwsbrief"
#: pushnotifications/models.py #: models.py
msgid "Sponsored messages" msgid "Messages from partners"
msgstr "Gesponsorde berichten" msgstr "Berichten van partners"
#: pushnotifications/models.py #: models.py
msgid "Photos" msgid "Photos"
msgstr "Foto's" msgstr "Foto's"
#: pushnotifications/models.py #: models.py
msgid "Board" msgid "Board"
msgstr "Bestuur" msgstr "Bestuur"
#: pushnotifications/models.py #: models.py
msgid "title" msgid "title"
msgstr "titel" msgstr "titel"
#: pushnotifications/models.py #: models.py
msgid "body" msgid "body"
msgstr "bericht" msgstr "bericht"
#: pushnotifications/models.py #: models.py
msgid "category" msgid "category"
msgstr "categorie" msgstr "categorie"
#: pushnotifications/models.py #: models.py
msgid "sent" msgid "sent"
msgstr "verzonden" msgstr "verzonden"
#: pushnotifications/models.py #: models.py
msgid "failure" msgid "failure"
msgstr "mislukt" msgstr "mislukt"
#: pushnotifications/models.py #: models.py
msgid "success" msgid "success"
msgstr "succesvol" msgstr "succesvol"
#: pushnotifications/templates/admin/pushnotifications/change_form.html #: templates/admin/pushnotifications/change_form.html
msgid "Send message" msgid "Send message"
msgstr "Verstuur bericht" msgstr "Verstuur bericht"
...@@ -84,7 +84,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta): ...@@ -84,7 +84,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
PIZZA = 'pizza' PIZZA = 'pizza'
EVENT = 'event' EVENT = 'event'
NEWSLETTER = 'newsletter' NEWSLETTER = 'newsletter'
SPONSOR = 'sponsor' PARTNER = 'partner'
PHOTO = 'photo' PHOTO = 'photo'
BOARD = 'board' BOARD = 'board'
...@@ -93,7 +93,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta): ...@@ -93,7 +93,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
(PIZZA, _("Pizza")), (PIZZA, _("Pizza")),
(EVENT, _("Events")), (EVENT, _("Events")),
(NEWSLETTER, _("Newsletter")), (NEWSLETTER, _("Newsletter")),
(SPONSOR, _("Sponsored messages")), (PARTNER, _("Messages from partners")),
(PHOTO, _("Photos")), (PHOTO, _("Photos")),
(BOARD, _("Board")), (BOARD, _("Board")),
) )
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="controls"> <div class="controls">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="optin_mailinglist" id="id_optin_mailinglist"> <input type="checkbox" name="optin_mailinglist" id="id_optin_mailinglist">
{% trans "Receive emails about (amongst others) job opportunities and in-house days from sponsors of Thalia." %}. {% trans "Receive emails about (amongst others) job opportunities and in-house days from partners of Thalia." %}.
</label> </label>
</div> </div>
</div> </div>
......
...@@ -7,8 +7,8 @@ msgid "" ...@@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-15 14:58+0200\n" "POT-Creation-Date: 2018-08-19 15:33+0200\n"
"PO-Revision-Date: 2018-08-15 14:54+0200\n" "PO-Revision-Date: 2018-08-19 15:36+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n" "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: nl\n" "Language: nl\n"
...@@ -512,14 +512,13 @@ msgstr "E-mailadres" ...@@ -512,14 +512,13 @@ msgstr "E-mailadres"
#: templates/singlepages/privacy_policy.html #: templates/singlepages/privacy_policy.html
msgid "" msgid ""
"Used for delivery of planned mail such as GM announcements, sending the opt-" "Used for delivery of planned mail such as GM announcements, sending the opt-"
"out newsletter and sending the opt-in sponsorship mail. In addition, this " "out newsletter and sending the opt-in partner mail. In addition, this will "
"will be used to send personal messages with login credentials for the " "be used to send personal messages with login credentials for the website and "
"website and messages with event-specific information after registering for " "messages with event-specific information after registering for an event."
"an event."
msgstr "" msgstr ""
"Voor het versturen van plenaire mailing zoals ALV-aankondigingen, het " "Voor het versturen van plenaire mailing zoals ALV-aankondigingen, het "
"versturen van de opt-out nieuwsbrief en het versturen van opt-in spon- " "versturen van de opt-out nieuwsbrief en het versturen van opt-in "
"sormailings. Daarnaast voor het versturen persoonlijke berichten met " "partnermailings. Daarnaast voor het versturen persoonlijke berichten met "
"inloggegevens voor de website en berichten met evenementspecifieke in- " "inloggegevens voor de website en berichten met evenementspecifieke in- "
"formatie, nadat je je geregistreerd hebt voor dit evenement." "formatie, nadat je je geregistreerd hebt voor dit evenement."
...@@ -1023,13 +1022,13 @@ msgstr "Introshirts" ...@@ -1023,13 +1022,13 @@ msgstr "Introshirts"
msgid "" msgid ""
"The introshirts too are an exception. These shirts are in different colours " "The introshirts too are an exception. These shirts are in different colours "
"every year. The templates for the shirts can be found <a href=" "every year. The templates for the shirts can be found <a href="
"\"%(introshirt_url)s\">here</a>. The sponsorlogos and texts can be changed " "\"%(introshirt_url)s\">here</a>. The partner logos and texts can be changed "
"to those you prefer." "to those you prefer."
msgstr "" msgstr ""
"Ook de introshirts zijn een uitzondering op het kleurenpalet. Het is " "Ook de introshirts zijn een uitzondering op het kleurenpalet. Het is "
"toegestaan om elke kleur te gebruiken die je maar wilt, zolang het maar niet " "toegestaan om elke kleur te gebruiken die je maar wilt, zolang het maar niet "
"vloekt. De basisdesigns voor de introshirts zijn <a href=\"%(introshirt_url)s" "vloekt. De basisdesigns voor de introshirts zijn <a href=\"%(introshirt_url)s"
"\">hier</a> te vinden. Logo's van sponsoren en teksten zijn naar voorkeur te " "\">hier</a> te vinden. Logo's van partners en teksten zijn naar voorkeur te "
"vervangen." "vervangen."
#: templates/singlepages/styleguide.html #: templates/singlepages/styleguide.html
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
{% trans "Email address" %}<br/> {% trans "Email address" %}<br/>
{% blocktrans trimmed %} {% blocktrans trimmed %}
Used for delivery of planned mail such as GM announcements, Used for delivery of planned mail such as GM announcements,
sending the opt-out newsletter and sending the opt-in sponsorship mail. sending the opt-out newsletter and sending the opt-in partner mail.
In addition, this will be used to send personal messages with login In addition, this will be used to send personal messages with login
credentials for the website and messages with event-specific information credentials for the website and messages with event-specific information
after registering for an event. after registering for an event.
......
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
{% url 'styleguide-file' 'introshirt.zip' as introshirt_url %} {% url 'styleguide-file' 'introshirt.zip' as introshirt_url %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
The introshirts too are an exception. These shirts are in different colours every year. The introshirts too are an exception. These shirts are in different colours every year.
The templates for the shirts can be found <a href="{{ introshirt_url }}">here</a>. The sponsorlogos and texts can be changed to those you prefer. The templates for the shirts can be found <a href="{{ introshirt_url }}">here</a>. The partner logos and texts can be changed to those you prefer.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
......
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