diff --git a/account/forms.py b/account/forms.py index 1acf493..348626b 100755 --- a/account/forms.py +++ b/account/forms.py @@ -141,8 +141,8 @@ class NRF24Form(forms.Form): class CLabPinForm(forms.Form): - c_lab_pin1 = GastroPinField(label=_('New c-lab PIN')) - c_lab_pin2 = GastroPinField(label=_('Repeat c-lab PIN'), + c_lab_pin1 = GastroPinField(label=_('New indoor PIN')) + c_lab_pin2 = GastroPinField(label=_('Repeat indoor PIN'), help_text=_('Numerical only, 4 to 8 digits')) diff --git a/account/locale/de/LC_MESSAGES/django.mo b/account/locale/de/LC_MESSAGES/django.mo index 61f7a64..8624a23 100644 Binary files a/account/locale/de/LC_MESSAGES/django.mo and b/account/locale/de/LC_MESSAGES/django.mo differ diff --git a/account/locale/de/LC_MESSAGES/django.po b/account/locale/de/LC_MESSAGES/django.po index 2dff6cf..d0e24ab 100644 --- a/account/locale/de/LC_MESSAGES/django.po +++ b/account/locale/de/LC_MESSAGES/django.po @@ -105,12 +105,12 @@ msgid "Your r0ket's NRF24 identification" msgstr "Die NRF24-ID deiner r0ket" #: forms.py:130 -msgid "New c-lab PIN" -msgstr "Neue c-lab-PIN" +msgid "New indoor PIN" +msgstr "Neue innentür-PIN" #: forms.py:131 -msgid "Repeat c-lab PIN" -msgstr "c-lab-PIN wiederholen" +msgid "Repeat indoor PIN" +msgstr "Innentür-PIN wiederholen" #: forms.py:149 msgid "Select the username for whom you want to reset the password." @@ -192,12 +192,12 @@ msgid "This crewname is still available." msgstr "Dieser Crewname ist noch zu haben." #: templates/clabpin.html:5 -msgid "c-lab PIN" -msgstr "c-lab-PIN" +msgid "Indoor PIN" +msgstr "Innentür-PIN" #: templates/clabpin.html:8 -msgid "Change your c-lab PIN to access the c-lab in the basement." -msgstr "PIN ändern für den Zugang zum c-lab im Keller." +msgid "Change your PIN to access rooms secured with PIN-pad." +msgstr "PIN ändern für den Zugang zu PIN-pad-geschützten Räumen." #: templates/gastropin.html:5 msgid "Gastro PIN" @@ -331,8 +331,8 @@ msgid "RFID" msgstr "" #: templates/member_base.html:29 -msgid "c-lab-PIN" -msgstr "c-lab-PIN" +msgid "Indoor-PIN" +msgstr "Innentür-PIN" #: templates/member_base.html:33 templates/nrf24.html:5 msgid "NRF24" diff --git a/account/models.py b/account/models.py index f15c1cf..a8f38c2 100644 --- a/account/models.py +++ b/account/models.py @@ -40,6 +40,7 @@ class UserProfile(models.Model): is_clab_member = models.BooleanField(default=False, editable=False) is_cey_member = models.BooleanField(default=False, editable=False) is_ceymaster = models.BooleanField(default=False, editable=False) + is_soundlab_member = models.BooleanField(default=False, editable=False) def __unicode__(self): return 'Profile: %s' % self.user.username diff --git a/account/templates/500.html b/account/templates/500.html new file mode 100644 index 0000000..e69de29 diff --git a/account/templates/clabpin.html b/account/templates/clabpin.html index 0525404..8c77b2e 100644 --- a/account/templates/clabpin.html +++ b/account/templates/clabpin.html @@ -2,10 +2,10 @@ {% load i18n %} {% load crispy_forms_tags %} -{% block form_title %}{% trans "c-lab PIN"%}{% endblock %} +{% block form_title %}{% trans "Indoor PIN"%}{% endblock %} {% block form_description %} -

{% blocktrans %}Change your c-lab PIN to access the c-lab in the basement.{% endblocktrans %}

+

{% blocktrans %}Change your PIN to access rooms secured with PIN-pad.{% endblocktrans %}

{% endblock %} {% block form_fields %} @@ -19,4 +19,4 @@ -{% endblock form_fields %} \ No newline at end of file +{% endblock form_fields %} diff --git a/account/templates/home.html b/account/templates/home.html index e7e6e0e..1c8f75f 100644 --- a/account/templates/home.html +++ b/account/templates/home.html @@ -37,21 +37,36 @@

{% trans "Management information" %}

-