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 ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-15 15:26+0200\n"
"PO-Revision-Date: 2018-08-15 15:29+0200\n"
"POT-Creation-Date: 2018-08-19 15:27+0200\n"
"PO-Revision-Date: 2018-08-19 15:27+0200\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -311,8 +311,8 @@ msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"
#: models.py
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren."
msgid "Receive mailings about vacancies and events from Thalia's partners."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's partners."
#: models.py
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):
receive_optin = models.BooleanField(
verbose_name=_('Receive opt-in mailings'),
help_text=_("Receive mailings about vacancies and events from Thalia's"
" sponsors."),
" partners."),
default=True,
)
......
......@@ -9,7 +9,7 @@ def showcased_partners(request):
For each user we generate a sequence of banners. This sequence
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
views.
"""
......
......@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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"
"Language-Team: \n"
"Language: nl\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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/templates/partners/partner.html
......@@ -123,7 +123,7 @@ msgstr ""
#: partners/templates/partners/index.html
#: partners/templates/partners/partner.html
msgid "Main Partner"
msgstr "Hoofdsponsor"
msgstr "Hoofdpartner"
#: partners/templates/partners/index.html
#: partners/templates/partners/partner.html
......
......@@ -66,7 +66,7 @@
</div>
{% if vacancies|length > 0 %}
<div id="sponsor_vacatures">
<div>
<h3>{% trans "All vacancies" %}</h3>
<div class="row">
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n"
"PO-Revision-Date: 2018-07-11 20:27+0200\n"
"POT-Creation-Date: 2018-08-19 15:30+0200\n"
"PO-Revision-Date: 2018-08-19 15:30+0200\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -11,100 +11,100 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
msgstr "Activeer geselecteerde apparaten"
#: pushnotifications/admin.py
#: admin.py
msgid "Disable selected devices"
msgstr "Deactiveer geselecteerde apparaten"
#: pushnotifications/admin.py
#: admin.py
msgid "Name"
msgstr "Naam"
#: pushnotifications/apps.py
#: apps.py
msgid "Push Notifications"
msgstr "Pushnotificaties"
#: pushnotifications/models.py
#: models.py
msgid "name"
msgstr "naam"
#: pushnotifications/models.py
#: models.py
msgid "registration token"
msgstr "registratie token"
#: pushnotifications/models.py
#: models.py
msgid "active"
msgstr "actief"
#: pushnotifications/models.py
#: models.py
msgid "Inactive devices will not be sent notifications"
msgstr "Inactieve apparaten zullen geen notificaties ontvangen"
#: pushnotifications/models.py
#: models.py
msgid "registration date"
msgstr "registratiedatum"
#: pushnotifications/models.py
#: models.py
msgid "language"
msgstr "taal"
#: pushnotifications/models.py
#: models.py
msgid "General"
msgstr "Algemeen"
#: pushnotifications/models.py
#: models.py
msgid "Pizza"
msgstr "Pizza"
#: pushnotifications/models.py
#: models.py
msgid "Events"
msgstr "Evenementen"
#: pushnotifications/models.py
#: models.py
msgid "Newsletter"
msgstr "Nieuwsbrief"
#: pushnotifications/models.py
msgid "Sponsored messages"
msgstr "Gesponsorde berichten"
#: models.py
msgid "Messages from partners"
msgstr "Berichten van partners"
#: pushnotifications/models.py
#: models.py
msgid "Photos"
msgstr "Foto's"
#: pushnotifications/models.py
#: models.py
msgid "Board"
msgstr "Bestuur"
#: pushnotifications/models.py
#: models.py
msgid "title"
msgstr "titel"
#: pushnotifications/models.py
#: models.py
msgid "body"
msgstr "bericht"
#: pushnotifications/models.py
#: models.py
msgid "category"
msgstr "categorie"
#: pushnotifications/models.py
#: models.py
msgid "sent"
msgstr "verzonden"
#: pushnotifications/models.py
#: models.py
msgid "failure"
msgstr "mislukt"
#: pushnotifications/models.py
#: models.py
msgid "success"
msgstr "succesvol"
#: pushnotifications/templates/admin/pushnotifications/change_form.html
#: templates/admin/pushnotifications/change_form.html
msgid "Send message"
msgstr "Verstuur bericht"
......@@ -84,7 +84,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
PIZZA = 'pizza'
EVENT = 'event'
NEWSLETTER = 'newsletter'
SPONSOR = 'sponsor'
PARTNER = 'partner'
PHOTO = 'photo'
BOARD = 'board'
......@@ -93,7 +93,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
(PIZZA, _("Pizza")),
(EVENT, _("Events")),
(NEWSLETTER, _("Newsletter")),
(SPONSOR, _("Sponsored messages")),
(PARTNER, _("Messages from partners")),
(PHOTO, _("Photos")),
(BOARD, _("Board")),
)
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-11 20:07+0200\n"
"PO-Revision-Date: 2018-08-19 16:21+0200\n"
"POT-Creation-Date: 2018-08-19 16:41+0200\n"
"PO-Revision-Date: 2018-08-19 16:42+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -18,157 +18,157 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n"
#: registrations/admin.py
#: admin.py
msgid "Application information"
msgstr "Registratieinformatie"
#: registrations/admin.py
#: admin.py
msgid "Personal information"
msgstr "Persoonlijke informatie"
#: registrations/admin.py
#: admin.py
msgid "Address"
msgstr "Adres"
#: registrations/admin.py
#: admin.py
msgid "University information"
msgstr "Unversiteitsinformatie"
#: registrations/admin.py registrations/tests/test_admin.py
#: admin.py tests/test_admin.py
msgid "Processed"
msgstr "Verwerkt"
#: registrations/admin.py registrations/tests/test_admin.py
#: admin.py tests/test_admin.py
msgid "Unprocessed"
msgstr "Onverwerkt"
#: registrations/admin.py registrations/tests/test_admin.py
#: admin.py tests/test_admin.py
#, python-format
msgid "Successfully rejected %(count)d %(items)s."
msgstr "%(count)d %(items)s succesvol afgekeurd."
#: registrations/admin.py
#: admin.py
msgid "The selected registration(s) could not be rejected."
msgstr "De geselecteerde registratie(s) konden niet worden afgekeurd."
#: registrations/admin.py
#: admin.py
msgid "Reject selected registrations"
msgstr "Keur geselecteerde registraties af"
#: registrations/admin.py registrations/tests/test_admin.py
#: admin.py tests/test_admin.py
#, python-format
msgid "Successfully accepted %(count)d %(items)s."
msgstr "%(count)d %(items)s succesvol goedgekeurd."
#: registrations/admin.py
#: admin.py
msgid "The selected registration(s) could not be accepted."
msgstr "De geselecteerde registratie(s) konden niet worden goedgekeurd."
#: registrations/admin.py
#: admin.py
msgid "Accept selected registrations"
msgstr "Keur geselecteerde registraties goed"
#: registrations/apps.py
#: apps.py
msgid "Registrations"
msgstr "Registraties"
#: registrations/emails.py registrations/tests/test_emails.py
#: emails.py tests/test_emails.py
msgid "Confirm email address"
msgstr "Bevestig e-mailadres"
#: registrations/emails.py registrations/tests/test_emails.py
#: emails.py tests/test_emails.py
msgid "Registration accepted"
msgstr "Registratie goedgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py
#: emails.py tests/test_emails.py
msgid "Registration rejected"
msgstr "Registratie afgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py
#: emails.py tests/test_emails.py
msgid "Renewal accepted"
msgstr "Verlenging goedgekeurd"
#: registrations/emails.py registrations/tests/test_emails.py
#: emails.py tests/test_emails.py
msgid "Renewal successful"
msgstr "Verlenging afgekeurd"
#: registrations/forms.py registrations/models.py
#: forms.py models.py
msgid "birthday"
msgstr "verjaardag"
#: registrations/forms.py
#: forms.py
msgid "I accept the privacy policy"
msgstr "Ik accepteer het privacybeleid"
#: registrations/models.py
#: models.py
msgid "created at"
msgstr "aangemaakt op"
#: registrations/models.py
#: models.py
msgid "updated at"
msgstr "bijgewerkt op"
#: registrations/models.py
#: models.py
msgid "Awaiting email confirmation"
msgstr "In afwachting van e-mail confirmatie"
#: registrations/models.py
#: models.py
msgid "Ready for review"
msgstr "Klaar voor beoordeling"
#: registrations/models.py
#: models.py
msgid "Rejected"
msgstr "Afgekeurd"
#: registrations/models.py
#: models.py
msgid "Accepted"
msgstr "Goedgekeurd"
#: registrations/models.py
#: models.py
msgid "Completed"
msgstr "Voltooid"
#: registrations/models.py
#: models.py
msgid "status"
msgstr "status"
#: registrations/models.py
#: models.py
msgid "One year"
msgstr "Één jaar"
#: registrations/models.py
#: models.py
msgid "Until graduation"
msgstr "Tot afstuderen"
#: registrations/models.py
#: models.py
msgid "membership length"
msgstr "lengte lidmaatschap"
#: registrations/models.py registrations/templates/registrations/renewal.html
#: models.py templates/registrations/renewal.html
msgid "membership type"
msgstr "soort lidmaatschap"
#: registrations/models.py
#: models.py
msgid "remarks"
msgstr "opmerkingen"
#: registrations/models.py
#: models.py
msgid "entry"
msgstr "invoer"
#: registrations/models.py
#: models.py
msgid "entries"
msgstr "invoeren"
#: registrations/models.py
#: models.py
msgid "Review registration and renewal entries"
msgstr "Beoordeel registraties en verlengingen"
#: registrations/models.py
#: models.py
msgid "Username"
msgstr "Gebruikersnaam"
#: registrations/models.py
#: models.py
msgid ""
"Enter value to override the auto-generated username (e.g. if it is not "
"unique)"
......@@ -176,75 +176,75 @@ msgstr ""
"Voer waarde in om de automatisch gegenereerde gebruikersnaam te "
"overschrijven (bijv. als deze niet uniek is)"
#: registrations/models.py
#: models.py
msgid "First name"
msgstr "Voornaam"
#: registrations/models.py
#: models.py
msgid "Last name"
msgstr "Achternaam"
#: registrations/models.py
#: models.py
msgid "language"
msgstr "taal"
#: registrations/models.py
#: models.py
msgid "Email address"
msgstr "E-mailadres"
#: registrations/models.py
#: models.py
msgid "phone number"
msgstr "telefoonnummer"
#: registrations/models.py
#: models.py
msgid "please enter a valid phone number"
msgstr "voer alstublieft een geldig telefoonnummer in"
#: registrations/models.py
#: models.py
msgid "student number"
msgstr "studentnummer"
#: registrations/models.py
#: models.py
msgid "enter a valid student- or e/z/u-number."
msgstr "voer een geldig student- of e/z/u-nummer in."
#: registrations/models.py
#: models.py
msgid "study programme"
msgstr "studie"
#: registrations/models.py
#: models.py
msgid "starting year"
msgstr "startjaar"
#: registrations/models.py
#: models.py
msgid "include the house number"
msgstr "inclusief huisnummer"
#: registrations/models.py
#: models.py
msgid "street and house number"
msgstr "straat en huisnummer"
#: registrations/models.py
#: models.py
msgid "second address line"
msgstr "tweede adresregel"
#: registrations/models.py
#: models.py
msgid "postal code"
msgstr "postcode"
#: registrations/models.py
#: models.py
msgid "city"
msgstr "stad"
#: registrations/models.py
#: models.py
msgid "mailinglist opt-in"
msgstr "mailinglijst opt-in"
#: registrations/models.py
#: models.py
msgid "birthday calendar opt-in"
msgstr "verjaardagskalender opt-in"
#: registrations/models.py
#: models.py
msgid ""
"A user with that email address already exists. Login using the existing "
"account and renew the membership by visiting the account settings."
......@@ -252,7 +252,7 @@ msgstr ""
"Er bestaat al een gebruiker met dit e-mailadres. Login met het bestaande "
"account en vernieuw het lidmaatschap in de accountinstellingen."
#: registrations/models.py
#: models.py
msgid ""
"A user with that student number already exists. Login using the existing "
"account and renew the membership by visiting the account settings."
......@@ -260,65 +260,65 @@ msgstr ""
"Er bestaat al een gebruiker met dit studentnummer. Login met het bestaande "
"account en vernieuw het lidmaatschap in de accountinstellingen."
#: registrations/models.py
#: models.py
msgid "A user with that username already exists."
msgstr "Er bestaat al een gebruiker met deze gebruikersnaam."
#: registrations/models.py
#: models.py
msgid "This field is required."
msgstr "Dit veld is verplicht."
#: registrations/models.py
#: models.py
msgid "registation"
msgstr "registratie"
#: registrations/models.py
#: models.py
msgid "registrations"
msgstr "registraties"
#: registrations/models.py
#: models.py
msgid "member"
msgstr "lid"
#: registrations/models.py registrations/tests/test_models.py
#: models.py tests/test_models.py
msgid "You already have a renewal request queued for review."
msgstr "Je hebt al een aanvraag tot verlenging openstaan."
#: registrations/models.py
#: models.py
msgid "You currently have an active membership."
msgstr "Je hebt op dit moment een actief lidmaatschap."
#: registrations/models.py
#: models.py
msgid "You cannot renew your membership at this moment."
msgstr "Je kunt je lidmaatschap op dit moment niet verlengen."
#: registrations/models.py
#: models.py
msgid ""
"Supporters cannot have a membership that lasts their entire study duration."
msgstr "Begunstigers kunnen geen lidmaatschap hebben dat loopt tot afstuderen."
#: registrations/models.py registrations/templates/registrations/renewal.html
#: registrations/templates/registrations/renewal_success.html
#: models.py templates/registrations/renewal.html
#: templates/registrations/renewal_success.html
msgid "renewal"
msgstr "verlenging"
#: registrations/models.py
#: models.py
msgid "renewals"
msgstr "verlenging"
#: registrations/templates/admin/registrations/change_form.html