Merge branch 'feature/pushnotification-device-language' into 'master'

Add language field to Device model and make verbose names lowercase

See merge request !620

website/pushnotifications/migrations/0002_auto_20171103_1658.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-11-03 15:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pushnotifications', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='device',
+            name='language',
+            field=models.CharField(choices=[('en', 'English'), ('nl', 'Dutch')], default='nl', max_length=2, verbose_name='language'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='active',
+            field=models.BooleanField(default=True, help_text='Inactive devices will not be sent notifications', verbose_name='active'),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='date_created',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='registration date'),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='registration_id',
+            field=models.TextField(verbose_name='registration token'),
+        ),
+    ]

website/pushnotifications/models.py

@@ -14,16 +14,21 @@ class Device(models.Model):
         ('android', 'Android')
     )
 
-    registration_id = models.TextField(verbose_name=_("Registration token"))
+    registration_id = models.TextField(verbose_name=_("registration token"))
     type = models.CharField(choices=DEVICE_TYPES, max_length=10)
     active = models.BooleanField(
-        verbose_name=_("Is active"), default=True,
+        verbose_name=_("active"), default=True,
         help_text=_("Inactive devices will not be sent notifications")
     )
     user = models.ForeignKey(django_settings.AUTH_USER_MODEL,
                              blank=False, null=False)
     date_created = models.DateTimeField(
-        verbose_name=_("Registration date"), auto_now_add=True, null=False
+        verbose_name=_("registration date"), auto_now_add=True, null=False
+    )
+    language = models.CharField(
+        verbose_name=_('language'),
+        max_length=2,
+        choices=settings.LANGUAGES,
     )
 
     class Meta: