Merge branch 'sponsor_partner' into 'master'

Replace 'sponsor' with 'partner'

See merge request !903

website/members/locale/nl/LC_MESSAGES/django.po

@@ -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"

website/members/migrations/0023_auto_20180819_1542.py

+# 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'),
+        ),
+    ]

website/members/models.py

@@ -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,
     )
 

website/partners/context_processors.py

@@ -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.
     """

website/partners/locale/nl/LC_MESSAGES/django.po

@@ -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

website/partners/templates/partners/vacancies.html

@@ -66,7 +66,7 @@
     </div>
 
     {% if vacancies|length > 0 %}
-        <div id="sponsor_vacatures">
+        <div>
             <h3>{% trans "All vacancies" %}</h3>
 
             <div class="row">

website/pushnotifications/locale/nl/LC_MESSAGES/django.po

@@ -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"

website/pushnotifications/models.py

@@ -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")),
     )

website/registrations/templates/registrations/register_member.html

@@ -57,7 +57,7 @@
                 <div class="controls">
                     <label class="checkbox">
                         <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>
                 </div>
             </div>

website/thaliawebsite/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-15 14:58+0200\n"
-"PO-Revision-Date: 2018-08-15 14:54+0200\n"
+"POT-Creation-Date: 2018-08-19 15:33+0200\n"
+"PO-Revision-Date: 2018-08-19 15:36+0200\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -512,14 +512,13 @@ msgstr "E-mailadres"
 #: templates/singlepages/privacy_policy.html
 msgid ""
 "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 "
-"will be used to send personal messages with login credentials for the "
-"website and messages with event-specific information after registering for "
-"an event."
+"out newsletter and sending the opt-in partner mail. In addition, this will "
+"be used to send personal messages with login credentials for the website and "
+"messages with event-specific information after registering for an event."
 msgstr ""
 "Voor het versturen van plenaire mailing zoals ALV-aankondigingen, het "
-"versturen van de opt-out nieuwsbrief en het versturen van opt-in spon- "
-"sormailings. Daarnaast voor het versturen persoonlijke berichten met "
+"versturen van de opt-out nieuwsbrief en het versturen van opt-in "
+"partnermailings. Daarnaast voor het versturen persoonlijke berichten met "
 "inloggegevens voor de website en berichten met evenementspecifieke in- "
 "formatie, nadat je je geregistreerd hebt voor dit evenement."
 
@@ -1023,13 +1022,13 @@ msgstr "Introshirts"
 msgid ""
 "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)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."
 msgstr ""
 "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 "
 "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."
 
 #: templates/singlepages/styleguide.html

website/thaliawebsite/templates/singlepages/privacy_policy.html

@@ -37,7 +37,7 @@
             {% trans "Email address" %}<br/>
             {% blocktrans trimmed %}
             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
             credentials for the website and messages with event-specific information
             after registering for an event.

website/thaliawebsite/templates/singlepages/styleguide.html

@@ -230,7 +230,7 @@
     {% url 'styleguide-file' 'introshirt.zip' as introshirt_url %}
     {% blocktrans trimmed %}
     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 %}
 </p>