Commit 8ad68bee authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'mentors' into 'master'

Add model for mentors

They are not well fit in the committee model, and are necessary when we migrate members in #33.

See merge request !61
parents 2cf9e993 6d2c9564
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-09-05 10:26+0200\n"
"PO-Revision-Date: 2016-09-05 10:26+0100\n"
"Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
"Language-Team: \n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.10\n"
#: models.py:40
msgid "Committee name"
msgstr ""
#: models.py:45
msgid "Description"
msgstr ""
#: models.py:49
msgid "Image"
msgstr ""
#: models.py:62
msgid "permissions"
msgstr ""
#: models.py:67
msgid "founded in"
msgstr ""
#: models.py:73
msgid "existed until"
msgstr ""
#: models.py:78
msgid "contact email address"
msgstr ""
#: models.py:87
msgid "committee"
msgstr ""
#: models.py:88
msgid "committees"
msgstr ""
#: models.py:100
msgid "Is this a board"
msgstr ""
#: models.py:122
msgid "Member"
msgstr ""
#: models.py:128
msgid "Committee"
msgstr ""
#: models.py:132
msgid "Committee member since"
msgstr ""
#: models.py:133
msgid "The date this member joined the committee in this role"
msgstr ""
#: models.py:138
msgid "Committee member until"
msgstr ""
#: models.py:139
msgid "A member of this committee until this time (can't be in the future)."
msgstr ""
#: models.py:146
msgid "Chair of the committee"
msgstr ""
#: models.py:147
msgid "There can only be one chair at a time!"
msgstr ""
#: models.py:152
msgid "role"
msgstr ""
#: models.py:153
msgid "The role of this member"
msgstr ""
#: models.py:176
msgid "Membership expiration date can't be in the future: '{}'"
msgstr ""
#: models.py:182
msgid "End date can't be before start date"
msgstr ""
#: models.py:196
msgid "This committee already has a chair"
msgstr ""
#: models.py:213
msgid "This member is already in the committee"
msgstr ""
#: models.py:216
msgid "This member is already in the committee for this period"
msgstr ""
#: models.py:247
msgid "committee membership"
msgstr ""
#: models.py:248
msgid "committee memberships"
msgstr ""
#: models.py:256
#, python-brace-format
msgid "Mentor introduction {year}"
msgstr "Mentor introductie {year}"
#: templates/committees/boards.html:4 templates/committees/boards.html:8
msgid "Boards"
msgstr ""
#: templates/committees/boards.html:14
msgid ""
"Het gehele Thaliabestuur zet zich gedurende een collegejaar in om alle "
"activiteiten van Thalia in goede banen te leiden, voor of achter de "
"schermen. Bij vragen en opmerkingen kun je ze altijd persoonlijk aanspreken "
"of <a href=\"mailto:info@thalia.nu\">mailen</a>. Besturen van langer geleden "
"(eerder dan 2001), zijn op <a href=\"/board/oud-besturen\">deze pagina</a> "
"te vinden."
msgstr ""
#: templates/committees/boards.html:53
msgid "Board members"
msgstr ""
#: templates/committees/boards.html:73
msgid "Chair"
msgstr ""
#: templates/committees/details.html:3 templates/committees/index.html:3
#: templates/committees/index.html:6
msgid "Committees"
msgstr ""
#: templates/committees/details.html:22
#, python-format
msgid "About the %(name)s"
msgstr ""
#: templates/committees/details.html:26
msgid "Committee members"
msgstr ""
#: templates/committees/details.html:34
msgid "Default avatar"
msgstr ""
#: templates/committees/details.html:42
msgid "Voorzitter"
msgstr ""
#: templates/committees/details.html:49
#, python-format
msgid "Committee member since: %(since)s"
msgstr ""
#: templates/committees/details.html:59
msgid "This committee doesn't have any members?"
msgstr ""
#: templates/committees/index.html:39
msgid "There are no committees!"
msgstr ""
#~ msgid "Mentors {year}-{year_to}"
#~ msgstr "Mentoren {year}-{year_to}"
# -*- coding: utf-8 -*-
# Generated by Django 1.10 on 2016-09-05 20:49
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('members', '0006_auto_20160824_2041'),
('committees', '0006_auto_20160817_2236'),
]
operations = [
migrations.CreateModel(
name='Mentors',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('year', models.IntegerField(unique=True)),
('members', models.ManyToManyField(to='members.Member')),
],
),
]
......@@ -246,3 +246,11 @@ class CommitteeMembership(models.Model):
class Meta:
verbose_name = _('committee membership')
verbose_name_plural = _('committee memberships')
class Mentors(models.Model):
members = models.ManyToManyField(Member)
year = models.IntegerField(unique=True)
def __str__(self):
return _("Mentor introduction {year}".format(self.year))
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