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")),
) )
......
...@@ -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-07-11 20:07+0200\n" "POT-Creation-Date: 2018-08-19 16:41+0200\n"
"PO-Revision-Date: 2018-08-19 16:21+0200\n" "PO-Revision-Date: 2018-08-19 16:42+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"
...@@ -18,157 +18,157 @@ msgstr "" ...@@ -18,157 +18,157 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n" "X-Generator: Poedit 2.1.1\n"
#: registrations/admin.py #: admin.py
msgid "Application information" msgid "Application information"
msgstr "Registratieinformatie" msgstr "Registratieinformatie"
#: registrations/admin.py #: admin.py
msgid "Personal information" msgid "Personal information"
msgstr "Persoonlijke informatie" msgstr "Persoonlijke informatie"
#: registrations/admin.py #: admin.py
msgid "Address" msgid "Address"
msgstr "Adres" msgstr "Adres"
#: registrations/admin.py #: admin.py
msgid "University information" msgid "University information"
msgstr "Unversiteitsinformatie" msgstr "Unversiteitsinformatie"
#: registrations/admin.py registrations/tests/test_admin.py #: admin.py tests/test_admin.py
msgid "Processed" msgid "Processed"
msgstr "Verwerkt" msgstr "Verwerkt"
#: registrations/admin.py registrations/tests/test_admin.py #: admin.py tests/test_admin.py
msgid "Unprocessed" msgid "Unprocessed"
msgstr "Onverwerkt" msgstr "Onverwerkt"
#: registrations/admin.py registrations/tests/test_admin.py #: admin.py tests/test_admin.py
#, python-format #, python-format
msgid "Successfully rejected %(count)d %(items)s." msgid "Successfully rejected %(count)d %(items)s."
msgstr "%(count)d %(items)s succesvol afgekeurd." msgstr "%(count)d %(items)s succesvol afgekeurd."
#: registrations/admin.py #: admin.py
msgid "The selected registration(s) could not be rejected." msgid "The selected registration(s) could not be rejected."
msgstr "De geselecteerde registratie(s) konden niet worden afgekeurd." msgstr "De geselecteerde registratie(s) konden niet worden afgekeurd."
#: registrations/admin.py #: admin.py
msgid "Reject selected registrations" msgid "Reject selected registrations"
msgstr "Keur geselecteerde registraties af" msgstr "Keur geselecteerde registraties af"
#: registrations/admin.py registrations/tests/test_admin.py #: admin.py tests/test_admin.py
#, python-format #, python-format
msgid "Successfully accepted %(count)d %(items)s." msgid "Successfully accepted %(count)d %(items)s."
msgstr "%(count)d %(items)s succesvol goedgekeurd." msgstr "%(count)d %(items)s succesvol goedgekeurd."
#: registrations/admin.py #: admin.py
msgid "The selected registration(s) could not be accepted." msgid "The selected registration(s) could not be accepted."
msgstr "De geselecteerde registratie(s) konden niet worden goedgekeurd." msgstr "De geselecteerde registratie(s) konden niet worden goedgekeurd."
#: registrations/admin.py #: admin.py
msgid "Accept selected registrations" msgid "Accept selected registrations"
msgstr "Keur geselecteerde registraties goed" msgstr "Keur geselecteerde registraties goed"
#: registrations/apps.py #: apps.py
msgid "Registrations" msgid "Registrations"
msgstr "Registraties" msgstr "Registraties"
#: registrations/emails.py registrations/tests/test_emails.py #: emails.py tests/test_emails.py
msgid "Confirm email address" msgid "Confirm email address"
msgstr "Bevestig e-mailadres" msgstr "Bevestig e-mailadres"
#: registrations/emails.py registrations/tests/test_emails.py #: emails.py tests/test_emails.py
msgid "Registration accepted" msgid "Registration accepted"
msgstr "Registratie goedgekeurd" msgstr "Registratie goedgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py #: emails.py tests/test_emails.py
msgid "Registration rejected" msgid "Registration rejected"
msgstr "Registratie afgekeurd" msgstr "Registratie afgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py #: emails.py tests/test_emails.py
msgid "Renewal accepted" msgid "Renewal accepted"
msgstr "Verlenging goedgekeurd" msgstr "Verlenging goedgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py #: emails.py tests/test_emails.py
msgid "Renewal successful" msgid "Renewal successful"
msgstr "Verlenging afgekeurd" msgstr "Verlenging afgekeurd"
#: registrations/forms.py registrations/models.py #: forms.py models.py
msgid "birthday" msgid "birthday"
msgstr "verjaardag" msgstr "verjaardag"
#: registrations/forms.py #: forms.py
msgid "I accept the privacy policy" msgid "I accept the privacy policy"
msgstr "Ik accepteer het privacybeleid" msgstr "Ik accepteer het privacybeleid"
#: registrations/models.py #: models.py
msgid "created at" msgid "created at"
msgstr "aangemaakt op" msgstr "aangemaakt op"
#: registrations/models.py #: models.py
msgid "updated at" msgid "updated at"
msgstr "bijgewerkt op" msgstr "bijgewerkt op"
#: registrations/models.py #: models.py
msgid "Awaiting email confirmation" msgid "Awaiting email confirmation"
msgstr "In afwachting van e-mail confirmatie" msgstr "In afwachting van e-mail confirmatie"
#: registrations/models.py #: models.py
msgid "Ready for review" msgid "Ready for review"
msgstr "Klaar voor beoordeling" msgstr "Klaar voor beoordeling"
#: registrations/models.py #: models.py
msgid "Rejected" msgid "Rejected"
msgstr "Afgekeurd" msgstr "Afgekeurd"
#: registrations/models.py #: models.py
msgid "Accepted" msgid "Accepted"
msgstr "Goedgekeurd" msgstr "Goedgekeurd"
#: registrations/models.py #: models.py
msgid "Completed" msgid "Completed"
msgstr "Voltooid" msgstr "Voltooid"
#: registrations/models.py #: models.py
msgid "status" msgid "status"
msgstr "status" msgstr "status"
#: registrations/models.py #: models.py
msgid "One year" msgid "One year"
msgstr "Één jaar" msgstr "Één jaar"
#: registrations/models.py #: models.py
msgid "Until graduation" msgid "Until graduation"
msgstr "Tot afstuderen" msgstr "Tot afstuderen"
#: registrations/models.py #: models.py
msgid "membership length" msgid "membership length"
msgstr "lengte lidmaatschap" msgstr "lengte lidmaatschap"
#: registrations/models.py registrations/templates/registrations/renewal.html #: models.py templates/registrations/renewal.html
msgid "membership type" msgid "membership type"
msgstr "soort lidmaatschap" msgstr "soort lidmaatschap"
#: registrations/models.py #: models.py