Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
6a3cb714
Unverified
Commit
6a3cb714
authored
Apr 26, 2017
by
Thom Wiggers
📐
Browse files
Display membership type on profile page
Implements
#412
parent
07202744
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/members/locale/nl/LC_MESSAGES/django.po
View file @
6a3cb714
...
...
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-04-
12 19:40
+0200\n"
"POT-Creation-Date: 2017-04-
26 18:58
+0200\n"
"PO-Revision-Date: 2017-04-12 19:40+0200\n"
"Last-Translator:
Sébastiaan Versteeg <se_bastiaan@outlook.com
>\n"
"Last-Translator:
Thom Wiggers <thom@thomwiggers.nl
>\n"
"Language-Team: \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
...
...
@@ -94,7 +94,7 @@ msgstr "Informatica"
msgid "Information Sciences"
msgstr "Informatiekunde"
#: models.py:70 templates/members/profile.html:
39
#: models.py:70 templates/members/profile.html:
40
msgid "Study programme"
msgstr "Studie"
...
...
@@ -154,7 +154,7 @@ msgstr "Telefoonnummer noodcontact"
msgid "The phone number for the emergency contact"
msgstr "Het telefoonummer van de noodcontact"
#: models.py:199 templates/members/profile.html:4
6
#: models.py:199 templates/members/profile.html:4
7
msgid "Birthday"
msgstr "Verjaardag"
...
...
@@ -170,7 +170,7 @@ msgstr ""
"Toon je verjaardag aan andere leden op je profielpagina en in de "
"verjaardagskalender"
#: models.py:213 templates/members/profile.html:4
2
#: models.py:213 templates/members/profile.html:4
3
msgid "Website"
msgstr "Website"
...
...
@@ -320,7 +320,7 @@ msgstr "Begunstiger"
msgid "Honorary Member"
msgstr "Erelid"
#: models.py:393
#: models.py:393
templates/members/profile.html:37
msgid "Membership type"
msgstr "Lidtype"
...
...
@@ -478,7 +478,7 @@ msgstr "Ex-leden"
msgid "No members found"
msgstr "Geen leden gevonden"
#: templates/members/index.html:66 templates/members/profile.html:3
7
#: templates/members/index.html:66 templates/members/profile.html:3
8
msgid "Cohort"
msgstr "Cohort"
...
...
@@ -502,15 +502,15 @@ msgstr "Dit lid heeft nog geen beschrijving geschreven."
msgid "Personal information"
msgstr "Persoonlijke gegevens"
#: templates/members/profile.html:5
2
#: templates/members/profile.html:5
3
msgid "Achievements for Thalia"
msgstr "Verdiensten voor Thalia"
#: templates/members/profile.html:6
2
#: templates/members/profile.html:6
3
msgid "Chair"
msgstr "Voorzitter"
#: templates/members/profile.html:6
4
#: templates/members/profile.html:6
5
msgid "today"
msgstr "heden"
...
...
@@ -522,3 +522,7 @@ msgstr "Statistieken"
#: templates/members/statistics.html:11
msgid "Total amount of Thalia members"
msgstr "Totaal aantal Thalialeden"
#: views.py:143
msgid "Former member"
msgstr "Oud-leden"
website/members/templates/members/profile.html
View file @
6a3cb714
...
...
@@ -34,6 +34,7 @@
<hr
class=
"separator"
>
<h4>
{% trans "Personal information" %}
</h4>
<ul
class=
"post-meta"
>
<li><span>
{% trans "Membership type" %}:
</span>
{{ member_type }}
<br></li>
<li><span>
{% trans "Cohort" %}:
</span>
{{ member.starting_year }}
<br></li>
<li><span>
{% trans "Study programme" %}:
</span>
{{ member.get_programme_display }}
<br></li>
...
...
website/members/views.py
View file @
6a3cb714
...
...
@@ -7,6 +7,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from
django.db.models
import
Q
from
django.shortcuts
import
get_object_or_404
,
render
from
django.utils.text
import
slugify
from
django.utils.translation
import
gettext
as
_
from
sendfile
import
sendfile
from
.
import
models
...
...
@@ -137,8 +138,17 @@ def profile(request, pk=None):
'earliest'
:
earliest
,
}
achievements
=
sorted
(
achievements
.
values
(),
key
=
lambda
x
:
x
[
'earliest'
])
membership
=
member
.
current_membership
membership_type
=
_
(
"Former member"
)
if
membership
:
membership_type
=
membership
.
get_type_display
()
return
render
(
request
,
'members/profile.html'
,
{
'member'
:
member
,
'achievements'
:
achievements
})
{
'achievements'
:
achievements
,
'member'
:
member
,
'membership_type'
:
membership_type
,
})
@
login_required
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment