Merge branch 'master' into issue6

biscuit/core/migrations/0005_person_short_name.py

+# Generated by Django 2.2.3 on 2019-07-16 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0004_group'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='person',
+            name='short_name',
+            field=models.CharField(blank=True, max_length=5, verbose_name='Short name'),
+        ),
+    ]

biscuit/core/models.py

@@ -19,6 +19,9 @@ class Person(models.Model):
     additional_name = models.CharField(verbose_name=_(
         'Additional name(s)'), max_length=30, blank=True)
 
+    short_name = models.CharField(verbose_name=_(
+        'Short name'), max_length=5, blank=True)
+
     street = models.CharField(verbose_name=_(
         'Street'), max_length=30, blank=True)
     housenumber = models.CharField(verbose_name=_(

biscuit/core/templates/core/index.html

@@ -7,9 +7,8 @@
 {% block content %}
  <div class="jumbotron">
   <p>
-   BiscuIT ist ein webbasiertes Schulinformationssystem (SIS), das verwendet
-   werden kann, um organisatorische Themen von Bildungseinrichtungen zu
-   verwalten und / oder zu veröffentlichen.
+   BiscuIT is a web-based school information system (SIS) which can be used to
+   manage and/or publish organisational subjects of educational institutions.
   </p>
  </div>
 {% endblock %}