Merge branch...

Merge branch '303-commissieleden-die-lid-zijn-sinds-hebben-commissielid-sinds-1970-bij-hun-avatar-staan' into 'master'

Show ? for missing committee join dates

Closes #303

See merge request !334

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 21:36+0100\n"
-"PO-Revision-Date: 2017-01-24 21:36+0100\n"
+"POT-Creation-Date: 2017-01-30 17:52+0100\n"
+"PO-Revision-Date: 2017-01-30 17:53+0100\n"
 "Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -201,12 +201,16 @@ msgstr "Over de %(name)s"
 msgid "Committee members"
 msgstr "Commissieleden"
 
-#: templates/activemembers/committee_detail.html:51
+#: templates/activemembers/committee_detail.html:53
+msgid "Committee member since: ?"
+msgstr "Commissielid sinds: ?"
+
+#: templates/activemembers/committee_detail.html:55
 #, python-format
 msgid "Committee member since: %(since)s"
 msgstr "Commissielid sinds: %(since)s"
 
-#: templates/activemembers/committee_detail.html:61
+#: templates/activemembers/committee_detail.html:67
 msgid "This committee doesn't have any members?"
 msgstr "Deze commissie heeft geen leden?"
 

website/activemembers/templates/activemembers/committee_detail.html

@@ -48,7 +48,13 @@
               <div class="post-overlay">
                 <div class="post-overlay-meta">
                   <h2>{{ member.display_name }}</h2>
-                  <p>{% blocktrans with since=member.committee_since|date:"Y" %}Committee member since: {{ since }}{% endblocktrans %}</p>
+                  <p>
+                  {% if member.committee_since.year == 1970 %}
+                  {% blocktrans %}Committee member since: ?{% endblocktrans %}
+                  {% else %}
+                  {% blocktrans with since=member.committee_since|date:"Y" %}Committee member since: {{ since }}{% endblocktrans %}
+                  {% endif %}
+                  </p>
                 </div>
               </div>
               <div class="post-body avatar-subtitle">