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

Add board role to profile page

parent eb6765ec
...@@ -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: 2017-03-30 16:12+0200\n" "POT-Creation-Date: 2017-04-12 19:40+0200\n"
"PO-Revision-Date: 2017-03-30 16:12+0200\n" "PO-Revision-Date: 2017-04-12 19:40+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"
...@@ -74,15 +74,15 @@ msgstr "Studentnummer" ...@@ -74,15 +74,15 @@ msgstr "Studentnummer"
msgid "Download student number label for selected users" msgid "Download student number label for selected users"
msgstr "Download studentnummers voor geselecteerde gebruikers" msgstr "Download studentnummers voor geselecteerde gebruikers"
#: forms.py:37 #: forms.py:42
msgid "Send welcome email" msgid "Send welcome email"
msgstr "Stuur welkomste-mails" msgstr "Stuur welkomste-mails"
#: forms.py:38 #: forms.py:43
msgid "This email will include the generated password" msgid "This email will include the generated password"
msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten" msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
#: forms.py:68 #: forms.py:75
msgid "Welcome to Study Association Thalia" msgid "Welcome to Study Association Thalia"
msgstr "Welkom bij Studievereniging Thalia" msgstr "Welkom bij Studievereniging Thalia"
...@@ -507,6 +507,10 @@ msgid "Achievements for Thalia" ...@@ -507,6 +507,10 @@ msgid "Achievements for Thalia"
msgstr "Verdiensten voor Thalia" msgstr "Verdiensten voor Thalia"
#: templates/members/profile.html:62 #: templates/members/profile.html:62
msgid "Chair"
msgstr "Voorzitter"
#: templates/members/profile.html:64
msgid "today" msgid "today"
msgstr "heden" msgstr "heden"
......
...@@ -56,8 +56,10 @@ ...@@ -56,8 +56,10 @@
<span>{{ achievement.name }}</span> <span>{{ achievement.name }}</span>
<br> <br>
{% for period in achievement.periods %} {% for period in achievement.periods %}
{% if period.chair %} {% if period.role %}
<span style="text-transform:inherit;">Voorzitter: </span> <span style="text-transform:inherit;">{{ period.role }}: </span>
{% elif period.chair %}
<span style="text-transform:inherit;">{% trans "Chair" %}: </span>
{% endif %} {% endif %}
<i>{% if period.since|date:'Y m d' == '1970 01 01' %}?{% else %}{{ period.since }}{% endif %} - {% if period.until %}{{ period.until }}{% else %}{% trans "today" %}{% endif %}</i> <i>{% if period.since|date:'Y m d' == '1970 01 01' %}?{% else %}{{ period.since }}{% endif %} - {% if period.until %}{{ period.until }}{% else %}{% trans "today" %}{% endif %}</i>
<br> <br>
......
...@@ -106,6 +106,9 @@ def profile(request, pk=None): ...@@ -106,6 +106,9 @@ def profile(request, pk=None):
'chair': membership.chair 'chair': membership.chair
} }
if hasattr(membership.committee, 'board'):
period['role'] = membership.role
if (membership.until is None and if (membership.until is None and
hasattr(membership.committee, 'board')): hasattr(membership.committee, 'board')):
period['until'] = membership.committee.board.until period['until'] = membership.committee.board.until
......
Markdown is supported
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