Merge pull request #837 from santropolroulant/dev

Rename "Diabetic Dessert" to "Diabetic" to work around #833.

docker-compose.override.yml

@@ -10,7 +10,7 @@ services:
     command: python src/manage.py runserver 0.0.0.0:8000
     environment:
       - SOUSCHEF_ENVIRONMENT_NAME=DEV
-      - SOUSCHEF_DJANGO_ALLOWED_HOSTS=0.0.0.0
+      - SOUSCHEF_DJANGO_ALLOWED_HOSTS=0.0.0.0 127.0.0.1 localhost
     volumes:
       - .:/code
     ports:

src/meal/locale/fr/LC_MESSAGES/django.po

@@ -27,8 +27,8 @@ msgid "Dessert"
 msgstr "Dessert"
 
 #: meal/models.py
-msgid "Diabetic Dessert"
-msgstr "Dessert pour diabétique"
+msgid "Diabetic"
+msgstr "Diabétique"
 
 #: meal/models.py
 msgid "Fruit Salad"

src/meal/migrations/0008_auto_20180704_1613.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-07-04 20:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meal', '0007_auto_20170313_1442'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='component',
+            name='component_group',
+            field=models.CharField(choices=[('main_dish', 'Main Dish'), ('dessert', 'Dessert'), ('diabetic', 'Diabetic'), ('fruit_salad', 'Fruit Salad'), ('green_salad', 'Green Salad'), ('pudding', 'Pudding'), ('compote', 'Compote'), ('sides', 'Sides')], max_length=100, verbose_name='component group'),
+        ),
+    ]

src/meal/models.py

@@ -4,7 +4,7 @@
 COMPONENT_GROUP_CHOICES = (
     ('main_dish', _('Main Dish')),
     ('dessert', _('Dessert')),
-    ('diabetic', _('Diabetic Dessert')),
+    ('diabetic', _('Diabetic')),
     ('fruit_salad', _('Fruit Salad')),
     ('green_salad', _('Green Salad')),
     ('pudding', _('Pudding')),

src/order/migrations/0016_auto_20180704_1613.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-07-04 20:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0015_auto_20170410_1029'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order_item',
+            name='component_group',
+            field=models.CharField(blank=True, choices=[('main_dish', 'Main Dish'), ('dessert', 'Dessert'), ('diabetic', 'Diabetic'), ('fruit_salad', 'Fruit Salad'), ('green_salad', 'Green Salad'), ('pudding', 'Pudding'), ('compote', 'Compote'), ('sides', 'Sides')], max_length=100, null=True, verbose_name='component group'),
+        ),
+    ]