diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 3ff87fb..fdd5d50 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -24,9 +24,10 @@ from easy_select2 import apply_select2 # Register your models here. class MemberAdmin(admin.ModelAdmin): fields = ['prename', 'lastname', 'email', 'email_parents', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', - 'gets_newsletter', 'queue', 'registration_form', 'comments'] - list_display = ('name', 'birth_date', 'gets_newsletter', 'get_group', 'queue', 'created', 'comments') - list_filter = ('group', 'gets_newsletter', 'queue') + 'gets_newsletter', 'registered', 'registration_form', 'comments'] + list_display = ('name', 'birth_date', 'get_group', 'gets_newsletter', + 'registered', 'created', 'comments') + list_filter = ('group', 'gets_newsletter', 'registered') formfield_overrides = { ManyToManyField: {'widget': forms.CheckboxSelectMultiple}, ForeignKey: {'widget': apply_select2(forms.Select)} diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po index bb8b782..9fa8986 100644 --- a/jdav_web/members/locale/de/LC_MESSAGES/django.po +++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-18 17:27+0200\n" +"POT-Creation-Date: 2017-10-11 11:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,19 +18,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: admin.py:58 +#: admin.py:59 msgid "Difficulty" msgstr "Schwierigkeit" -#: admin.py:62 +#: admin.py:63 msgid "Tour type" msgstr "Art der Tour" -#: admin.py:199 +#: admin.py:200 msgid "Convert to PDF" msgstr "Kriseninterventionsliste erstellen" -#: admin.py:305 +#: admin.py:306 msgid "Generate overview" msgstr "Hinweise für Jugendleiter erstellen" @@ -115,8 +115,8 @@ msgid "created" msgstr "erstellt" #: models.py:67 -msgid "queue" -msgstr "Warteliste" +msgid "Registration complete" +msgstr "Anmeldung vollständig" #: models.py:68 msgid "registration form" @@ -218,6 +218,9 @@ msgstr "Fähigkeiten:" msgid "Skill level" msgstr "Fähigkeitsniveau" +#~ msgid "queue" +#~ msgstr "Warteliste" + #~ msgid "Art der Tour" #~ msgstr "Art der Tour" diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index ecc1d0e..e568499 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -64,7 +64,7 @@ class Member(models.Model): unsubscribe_expire = models.DateTimeField(default=timezone.now) comments = models.TextField(_('comments'), default='', blank=True) created = models.DateField(auto_now=True, verbose_name=_('created')) - queue = models.BooleanField(default=False, verbose_name=_('queue')) + registered = models.BooleanField(default=False, verbose_name=_('Registration complete')) registration_form = models.ImageField(verbose_name=_('registration form'), blank=True) def __str__(self):