Skip to content

Commit

Permalink
Reference implementation of the first contribution wiki
Browse files Browse the repository at this point in the history
  • Loading branch information
se-bastiaan committed Dec 11, 2017
1 parent 5f5421c commit fbde290
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 69 deletions.
2 changes: 1 addition & 1 deletion website/members/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ProfileInline(admin.StackedInline):
'receive_newsletter', 'birthday', 'show_birthday',
'direct_debit_authorized', 'bank_account', 'initials',
'nickname', 'display_name_preference', 'profile_description',
'website', 'photo', 'emergency_contact',
'shoe_size', 'website', 'photo', 'emergency_contact',
'emergency_contact_phone_number', 'language',
'event_permissions')
model = models.Profile
Expand Down
3 changes: 2 additions & 1 deletion website/members/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class Meta:
model = Member
fields = ('pk', 'display_name', 'photo', 'profile_description',
'birthday', 'starting_year', 'programme',
'website', 'membership_type', 'achievements')
'website', 'shoe_size', 'membership_type', 'achievements')

display_name = serializers.SerializerMethodField('_display_name')
photo = serializers.SerializerMethodField('_b64_photo')
Expand All @@ -64,6 +64,7 @@ class Meta:
starting_year = serializers.SerializerMethodField('_starting_year')
programme = serializers.SerializerMethodField('_programme')
website = serializers.SerializerMethodField('_website')
shoe_size = serializers.IntegerField(source='profile.shoe_size')
membership_type = serializers.SerializerMethodField('_membership_type')
achievements = serializers.SerializerMethodField('_achievements')

Expand Down
Binary file modified website/members/locale/nl/LC_MESSAGES/django.mo
Binary file not shown.
138 changes: 71 additions & 67 deletions website/members/locale/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-18 21:31+0200\n"
"PO-Revision-Date: 2017-10-18 21:32+0200\n"
"POT-Creation-Date: 2017-11-22 14:50+0100\n"
"PO-Revision-Date: 2017-11-22 14:50+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
Expand Down Expand Up @@ -54,19 +54,19 @@ msgstr "Adres"
msgid "Address line 2"
msgstr "Tweede adresregel"

#: admin.py:113 models.py:202
#: admin.py:113 models.py:203
msgid "Postal code"
msgstr "Postcode"

#: admin.py:113 models.py:208
#: admin.py:113 models.py:209
msgid "City"
msgstr "Woonplaats"

#: admin.py:123
msgid "Download address label for selected users"
msgstr "Download adreslabels voor geselecteerde gebruikers"

#: admin.py:131 models.py:165
#: admin.py:131 models.py:166
msgid "Student number"
msgstr "Studentnummer"

Expand Down Expand Up @@ -114,261 +114,265 @@ msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia"

#: models.py:110
#: models.py:111
msgid "Is this user currently active"
msgstr "Is deze user op dit moment actief"

#: models.py:144
#: models.py:145
msgid "Computing Science"
msgstr "Informatica"

#: models.py:145
#: models.py:146
msgid "Information Sciences"
msgstr "Informatiekunde"

#: models.py:159 templates/members/profile.html:40
#: models.py:160 templates/members/profile.html:40
msgid "Study programme"
msgstr "Studie"

#: models.py:169
#: models.py:170
msgid "Enter a valid student- or e/z/u-number."
msgstr "Voer een geldig student- of e/z/u-nummer in."

#: models.py:175
#: models.py:176
msgid "Starting year"
msgstr "Startjaar"

#: models.py:176
#: models.py:177
msgid "The year this member started studying."
msgstr "Het jaar waarop dit lid begon met studeren."

#: models.py:187
#: models.py:188
msgid "Include the house number"
msgstr "Inclusief huisnummer"

#: models.py:189
#: models.py:190
msgid "Street and house number"
msgstr "Straat en huisnummer"

#: models.py:195
#: models.py:196
msgid "Second address line"
msgstr "Tweede adresregel"

#: models.py:214
#: models.py:215
msgid "Phone number"
msgstr "Telefoonnummer"

#: models.py:215
#: models.py:216
msgid "Enter a phone number so Thalia may reach you"
msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken"

#: models.py:218 models.py:240
#: models.py:219 models.py:241
msgid "Please enter a valid phone number"
msgstr "Voer svp een geldig telefoonnummer in"

#: models.py:228
#: models.py:229
msgid "Emergency contact name"
msgstr "Contact voor noodgevallen"

#: models.py:229
#: models.py:230
msgid "Who should we contact in case of emergencies"
msgstr "Wie Thalia moet bereiken in bij noodgevallen"

#: models.py:236
#: models.py:237
msgid "Emergency contact phone number"
msgstr "Telefoonnummer noodcontact"

#: models.py:237
#: models.py:238
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"

#: models.py:249 templates/members/profile.html:47
#: models.py:250
msgid "Shoe size"
msgstr "Schoenmaat"

#: models.py:257 templates/members/profile.html:47
msgid "Birthday"
msgstr "Verjaardag"

#: models.py:254
#: models.py:262
msgid "Display birthday"
msgstr "Laat verjaardag zien"

#: models.py:256
#: models.py:264
msgid ""
"Show your birthday to other members on your profile page and in the birthday "
"calendar"
msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"

#: models.py:263 templates/members/profile.html:43
#: models.py:271 templates/members/profile.html:43
msgid "Website"
msgstr "Website"

#: models.py:264
#: models.py:272
msgid "Website to display on your profile page"
msgstr "Website om op je profiel te linken"

#: models.py:270
#: models.py:278
msgid "Profile text"
msgstr "Profieltekst"

#: models.py:271
#: models.py:279
msgid "Text to display on your profile"
msgstr "Tekst om te laten zien op je profielpagina"

#: models.py:278
#: models.py:286
msgid "Initials"
msgstr "Initialen"

#: models.py:285
#: models.py:293
msgid "Nickname"
msgstr "Bijnaam"

#: models.py:292
#: models.py:300
msgid "How to display name"
msgstr "Weergave naam"

#: models.py:293
#: models.py:301
msgid "Show full name"
msgstr "Volledige naam"

#: models.py:294
#: models.py:302
msgid "Show only nickname"
msgstr "Alleen initialen"

#: models.py:295
#: models.py:303
msgid "Show only first name"
msgstr "Alleen voornaam"

#: models.py:296
#: models.py:304
msgid "Show initials and last name"
msgstr "Alleen initialen en achternaam"

#: models.py:297
#: models.py:305
msgid "Show name like \"John 'nickname' Doe\""
msgstr "Laat zien als \"John 'bijnaam' Doe\""

#: models.py:298
#: models.py:306
msgid "Show nickname and last name"
msgstr "Laat bijnaam en achternaam zien"

#: models.py:303
#: models.py:311
msgid "Photo"
msgstr "Foto"

#: models.py:311
#: models.py:319
msgid "Which events can this member attend"
msgstr "Welke evenementen mag dit lid bijwonen"

#: models.py:312
#: models.py:320
msgid "All events"
msgstr "Alle evenementen"

#: models.py:313
#: models.py:321
msgid "User may not attend events"
msgstr "Gebruiker mag niet naar evenementen"

#: models.py:314
#: models.py:322
msgid "User may not attend drinks"
msgstr "Gebruiker mag niet naar borrels"

#: models.py:315
#: models.py:323
msgid "User may not attend anything"
msgstr "Gebruiker mag nergens heen"

#: models.py:322
#: models.py:330
msgid "Preferred language"
msgstr "Voorkeurstaal"

#: models.py:323
#: models.py:331
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"

#: models.py:330
#: models.py:338
msgid "Receive opt-in mailings"
msgstr "Ontvang opt-in mailings"

#: models.py:331
#: models.py:339
msgid "Receive mailings about vacancies and events from Thalia's sponsors."
msgstr "Ontvang mailings over vacatures en evenementen van Thalia's sponsoren."

#: models.py:337
#: models.py:345
msgid "Receive newsletter"
msgstr "Ontvang nieuwsbrief"

#: models.py:338
#: models.py:346
msgid "Receive the Thalia Newsletter"
msgstr "Ontvang de Thalia nieuwsbrief"

#: models.py:345
#: models.py:353
msgid ""
"Yes, I want Thalia to take the membership fees from my bank account through "
"direct debit for each year."
msgstr ""
"Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn "
"bankrekening afschrijft."

#: models.py:348
#: models.py:356
msgid "No, I will pay the contribution myself"
msgstr "Nee, ik zal de contributie zelf betalen"

#: models.py:349
#: models.py:357
msgid "Direct debit"
msgstr "Automatische afschijving"

#: models.py:350
#: models.py:358
msgid "Each year, have Thalia take the membership fees from my bank account"
msgstr ""
"Laat Thalia elk jaar het lidmaatschapsgeld van mijn bankrekening afschrijven"

#: models.py:356
#: models.py:364
msgid "Bank account"
msgstr "Bankrekening"

#: models.py:357
#: models.py:365
msgid "Bank account for direct debit"
msgstr "Bankrekening voor automatische afschrijving"

#: models.py:381
#: models.py:389
msgid "Display name"
msgstr "Weergavenaam"

#: models.py:410
#: models.py:418
msgid "You need to enter a nickname to use it as display name"
msgstr ""
"Je moet een bijnaam invoeren voordat je deze kunt gebruiken als weergavenaam"

#: models.py:444
#: models.py:452
msgid "Member"
msgstr "Lid"

#: models.py:445
#: models.py:453
msgid "Supporter"
msgstr "Begunstiger"

#: models.py:446
#: models.py:454
msgid "Honorary Member"
msgstr "Erelid"

#: models.py:451 templates/members/profile.html:37
#: models.py:459 templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"

#: models.py:459
#: models.py:467
msgid "User"
msgstr "Gebruiker"

#: models.py:463
#: models.py:471
msgid "Membership since"
msgstr "Lid sinds"

#: models.py:464
#: models.py:472
msgid "The date the member started holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap is begonnen."

#: models.py:469
#: models.py:477
msgid "Membership until"
msgstr "Lid tot"

#: models.py:470
#: models.py:478
msgid "The date the member stops holding this membership."
msgstr "De datum waarop het lid dit lidmaatschap beëindigd."

Expand Down
Loading

0 comments on commit fbde290

Please sign in to comment.