Commit f3e0d555 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'tc/change-mention-of-supporter' into 'master'

Change all textual mentions of supporter to benefactor

Closes #697

See merge request !960
parents 0fac9c0a 9f44e25c
......@@ -12,7 +12,7 @@
Note: Only Computing Science and Information Sciences students at the Radboud University can become a member.<br/>
<br/>
It is still possible to be associated with Thalia, even if you do not study Computing Science or Information
Sciences (anymore): You can become a supporter. For at least € {{ year_fees }} per year, you too can enjoy
Sciences (anymore): You can become a benefactor. For at least € {{ year_fees }} per year, you too can enjoy
everything Thalia has to offer.
{% endblocktrans %}
</p>
......@@ -55,7 +55,7 @@
{% elif membership.type == 'supporter' and not was_member %}
<p class="tcenter">
{% blocktrans trimmed %}
You're a supporter. Contact the board to renew your membership.
You're a benefactor. Contact the board to renew your membership.
{% endblocktrans %}
</p>
{% elif membership.until is None %}
......@@ -85,7 +85,7 @@
<div class="control-group row">
<label class="control-label" for="id_membership_type">{% trans 'membership type'|capfirst %}:</label>
<div class="controls">
<input type="text" readonly disabled value="{% trans 'Supporter' %}"/>
<input type="text" readonly disabled value="{% trans 'Benefactor' %}"/>
</div>
</div>
<div class="control-group row">
......
......@@ -160,7 +160,7 @@ class RegistrationTest(TestCase):
"{'programme': ['This field is required.']}"
):
self.registration.clean()
self.registration.membership_type = Membership.SUPPORTER
self.registration.membership_type = Membership.BENEFACTOR
self.registration.clean()
def test_require_starting_year_members(self):
......@@ -170,7 +170,7 @@ class RegistrationTest(TestCase):
"{'starting_year': ['This field is required.']}"
):
self.registration.clean()
self.registration.membership_type = Membership.SUPPORTER
self.registration.membership_type = Membership.BENEFACTOR
self.registration.clean()
def test_save(self):
......@@ -269,9 +269,9 @@ class RenewalTest(TestCase):
self.renewal.clean()
def test_supporter_no_study_length(self):
def test_benefactor_no_study_length(self):
self.renewal.length = Entry.MEMBERSHIP_STUDY
self.renewal.membership_type = Membership.SUPPORTER
self.renewal.membership_type = Membership.BENEFACTOR
membership = self.member.latest_membership
membership.until = timezone.now()
membership.save()
......@@ -283,7 +283,7 @@ class RenewalTest(TestCase):
self.renewal.clean()
except ValidationError as e:
self.assertCountEqual(e.error_dict, {
'length': 'Supporters cannot have a membership '
'length': 'Benefactors cannot have a membership '
'that lasts their entire study duration.',
})
......
......@@ -493,12 +493,12 @@ class RenewalFormViewTest(TestCase):
with self.subTest('Benefactor type'):
request.POST = QueryDict()
request.member.latest_membership.type = Membership.SUPPORTER
request.member.latest_membership.type = Membership.BENEFACTOR
self.view.post(request)
request = super_post.call_args[0][0]
self.assertEqual(request.POST['member'], 2)
self.assertEqual(request.POST['membership_type'], Membership.SUPPORTER)
self.assertEqual(request.POST['membership_type'], Membership.BENEFACTOR)
self.assertEqual(request.POST['length'], Entry.MEMBERSHIP_YEAR)
@mock.patch('registrations.emails.send_new_renewal_board_message')
......
......@@ -181,8 +181,8 @@ class RenewalFormView(FormView):
def post(self, request, *args, **kwargs):
request.POST = request.POST.dict()
if request.member.latest_membership.type == Membership.SUPPORTER:
request.POST['membership_type'] = Membership.SUPPORTER
if request.member.latest_membership.type == Membership.BENEFACTOR:
request.POST['membership_type'] = Membership.BENEFACTOR
request.POST['length'] = Entry.MEMBERSHIP_YEAR
request.POST['member'] = request.member.pk
return super().post(request, *args, **kwargs)
......
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-27 11:18+0200\n"
"PO-Revision-Date: 2018-09-27 11:16+0200\n"
"POT-Creation-Date: 2018-09-28 14:05+0200\n"
"PO-Revision-Date: 2018-09-28 14:06+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -477,7 +477,7 @@ msgstr "Versie"
#: templates/singlepages/privacy_policy.html
msgid ""
"This document contains the privacy conditions of Study Association Thalia. "
"The conditions are applicable on all members, supporters and honorary "
"The conditions are applicable on all members, benefactors and honorary "
"members of Thalia. Where there are differences in the applicability of the "
"conditions on the mentioned groups this will be stated."
msgstr ""
......@@ -496,7 +496,7 @@ msgid ""
"otherwise. At the end of the membership the address information will be "
"deleted, the name, email address and history with Thalia will be collected "
"in the alumni database. The account on the Thalia-website will be "
"operational even after the end of the membership or supportership."
"operational even after the end of the membership or benefactorship."
msgstr ""
"Alle gegevens worden minstens voor de duur van het lidmaatschap opgeslagen, "
"tenzij anders aangegeven. Bij het aflopen van het lidmaatschap worden de "
......@@ -505,7 +505,7 @@ msgstr ""
"blijft ook na het lidmaatschap of begunstigerschap behouden."
#: templates/singlepages/privacy_policy.html
msgid "Applicable to members, supporters and honorary members:"
msgid "Applicable to members, benefactors and honorary members:"
msgstr "Op leden, begunstigers en ereleden van toepassing:"
#: templates/singlepages/privacy_policy.html
......@@ -514,7 +514,7 @@ msgstr "Voor- en achternaam"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the name of members, supporters and honorary members for its "
"Thalia uses the name of members, benefactors and honorary members for its "
"administration and for personalising its communication. Processing of these "
"data happens on the basis of it being necessary to fulfill the membership "
"agreement."
......@@ -530,7 +530,7 @@ msgstr "Adres"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the address of the members, supporters and honorary members for "
"Thalia uses the address of the members, benefactors and honorary members for "
"its administration and for sending the association magazine. Processing of "
"these data happens on the basis of it being necessary to fulfill the "
"membership agreement."
......@@ -546,7 +546,7 @@ msgstr "E-mailadres"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the email addresses of members, supporters and honorary members "
"Thalia uses the email addresses of members, benefactors and honorary members "
"to communicate about policy and financial matters, for sending the weekly "
"newsletter and to enable logging in on the website. Processing of these data "
"happens on the basis of it being necessary to fulfill the membership "
......@@ -564,7 +564,7 @@ msgstr "Telefoonnummer"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the phone number of members, supporters and honorary members to "
"Thalia uses the phone number of members, benefactors and honorary members to "
"communicate with members about activities of Thalia. Think about calling a "
"participant who is too late for an activity or communicating a last-minute "
"change.The processing of phone numbers by Thalia is optional. Processing of "
......@@ -597,8 +597,8 @@ msgstr "Geboortedatum"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the date of birth of members, supporters and honorary members to "
"guarantee that no alcohol is served to minors. Processing of these data "
"Thalia uses the date of birth of members, benefactors and honorary members "
"to guarantee that no alcohol is served to minors. Processing of these data "
"happens on the basis of it being a legitimate interest of Thalia."
msgstr ""
"Thalia gebruikt de geboortedatum van leden, begunstigers en ereleden om te "
......@@ -612,7 +612,7 @@ msgstr "Bankrekeningnummer"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia uses the bank account number of members, supporters and honorary "
"Thalia uses the bank account number of members, benefactors and honorary "
"members when they pay via bank transfer or when they declare costs with "
"Thalia. These data are saved for as long is required by law for the "
"financial administration of Thalia. Processing of these data happens on the "
......@@ -722,14 +722,14 @@ msgstr ""
#: templates/singlepages/privacy_policy.html
msgid ""
"Rights of members, supporters and honorary members concerning processing of "
"Rights of members, benefactors and honorary members concerning processing of "
"personal data"
msgstr ""
"Rechten van leden, begunstigers en ereleden betreffende gegevensverwerking"
#: templates/singlepages/privacy_policy.html
msgid ""
"The relevant rights of members, supporters and honorary members concerning "
"The relevant rights of members, benefactors and honorary members concerning "
"the processing of personal data is as follows:"
msgstr ""
"De wettelijke en relevante rechten van leden, begunstigers en ereleden "
......@@ -847,7 +847,7 @@ msgstr ""
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia will not share personal data with partners, unless a member, "
"supporter or an honorary member registers for a partner event for which "
"benefactor or an honorary member registers for a partner event for which "
"sharing personal data is required."
msgstr ""
"Thalia zal onder geen beding persoonsgegevens delen met partners, tenzij een "
......@@ -873,7 +873,7 @@ msgstr "Bijwerken privacyvoorwaarden"
#: templates/singlepages/privacy_policy.html
msgid ""
"Thalia reserves the right to change the privacy conditions. The new "
"conditions will be shared as soon as possible with members, supporters and "
"conditions will be shared as soon as possible with members, benefactors and "
"honorary members. When changes require consent to be given anew, this will "
"be done accordingly."
msgstr ""
......
......@@ -14,7 +14,7 @@
<p>
{% blocktrans trimmed %}
This document contains the privacy conditions of Study Association Thalia.
The conditions are applicable on all members, supporters and honorary members of Thalia.
The conditions are applicable on all members, benefactors and honorary members of Thalia.
Where there are differences in the applicability of the conditions on the mentioned groups this will be stated.
{% endblocktrans %}
</p>
......@@ -25,16 +25,16 @@
{% blocktrans trimmed %}
All data are stored at least for the length of the membership, unless stated otherwise.
At the end of the membership the address information will be deleted, the name, email address and history with Thalia will be collected in the alumni database.
The account on the Thalia-website will be operational even after the end of the membership or supportership.
The account on the Thalia-website will be operational even after the end of the membership or benefactorship.
{% endblocktrans %}
</p>
<h3>{% trans "Applicable to members, supporters and honorary members:" %}</h3>
<h3>{% trans "Applicable to members, benefactors and honorary members:" %}</h3>
<p>
<strong>{% trans "Full name" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the name of members, supporters and honorary members for its administration and for personalising its communication.
Thalia uses the name of members, benefactors and honorary members for its administration and for personalising its communication.
Processing of these data happens on the basis of it being necessary to fulfill the membership agreement.
{% endblocktrans %}
</p>
......@@ -42,7 +42,7 @@
<p>
<strong>{% trans "Address" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the address of the members, supporters and honorary members for its administration and for sending the association magazine.
Thalia uses the address of the members, benefactors and honorary members for its administration and for sending the association magazine.
Processing of these data happens on the basis of it being necessary to fulfill the membership agreement.
{% endblocktrans %}
</p>
......@@ -50,7 +50,7 @@
<p>
<strong>{% trans "Email address" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the email addresses of members, supporters and honorary members to communicate about policy and financial matters,
Thalia uses the email addresses of members, benefactors and honorary members to communicate about policy and financial matters,
for sending the weekly newsletter and to enable logging in on the website. Processing of these data happens on the basis of it being
necessary to fulfill the membership agreement.
{% endblocktrans %}
......@@ -59,7 +59,7 @@
<p>
<strong>{% trans "Phone number" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the phone number of members, supporters and honorary members to communicate with members about activities of Thalia.
Thalia uses the phone number of members, benefactors and honorary members to communicate with members about activities of Thalia.
Think about calling a participant who is too late for an activity or communicating a last-minute change.The processing of phone numbers by Thalia is optional.
Processing of these data happens based on consent, which is given implicitly when the phone number is entered during registration or on the user profile on the website.
{% endblocktrans %}
......@@ -75,7 +75,7 @@
<p>
<strong>{% trans "Date of birth" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the date of birth of members, supporters and honorary members to guarantee that no alcohol is served to minors.
Thalia uses the date of birth of members, benefactors and honorary members to guarantee that no alcohol is served to minors.
Processing of these data happens on the basis of it being a legitimate interest of Thalia.
{% endblocktrans %}
</p>
......@@ -83,7 +83,7 @@
<p>
<strong>{% trans "Bank account number" %}</strong><br/>
{% blocktrans trimmed %}
Thalia uses the bank account number of members, supporters and honorary members when they pay via bank transfer or when they declare costs with Thalia.
Thalia uses the bank account number of members, benefactors and honorary members when they pay via bank transfer or when they declare costs with Thalia.
These data are saved for as long is required by law for the financial administration of Thalia.
Processing of these data happens on the basis of it being necessary to fulfill the membership agreement.
{% endblocktrans %}
......@@ -144,11 +144,11 @@
{% endblocktrans %}
</p>
<h2>2. {% trans "Rights of members, supporters and honorary members concerning processing of personal data" %}</h2>
<h2>2. {% trans "Rights of members, benefactors and honorary members concerning processing of personal data" %}</h2>
<p>
{% blocktrans trimmed %}
The relevant rights of members, supporters and honorary members concerning the processing of personal data is as follows:
The relevant rights of members, benefactors and honorary members concerning the processing of personal data is as follows:
{% endblocktrans %}
</p>
......@@ -212,7 +212,7 @@
<p>
{% blocktrans trimmed %}
Thalia will not share personal data with partners, unless a member, supporter or an honorary member registers for a partner event for which sharing personal data is required.
Thalia will not share personal data with partners, unless a member, benefactor or an honorary member registers for a partner event for which sharing personal data is required.
{% endblocktrans %}
</p>
......@@ -227,7 +227,7 @@
<p>
{% blocktrans trimmed %}
Thalia reserves the right to change the privacy conditions.
The new conditions will be shared as soon as possible with members, supporters and honorary members.
The new conditions will be shared as soon as possible with members, benefactors and honorary members.
When changes require consent to be given anew, this will be done accordingly.
{% endblocktrans %}
</p>
......
......@@ -333,7 +333,7 @@ class Command(BaseCommand):
membership.until = random.choice([_faker.date_time_between(
start_date='-2y', end_date='+2y', tzinfo=None), None])
membership.type = random.choice(
['member', 'supporter', 'honorary'])
[t[0] for t in Membership.MEMBERSHIP_TYPES])
user.save()
profile.save()
......
Supports Markdown
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