From 3303e47f1a81d7de1129e2091a1159261bb406bf Mon Sep 17 00:00:00 2001
From: Dennis Siemensma <github@dennissiemensma.nl>
Date: Mon, 23 Jan 2023 22:49:17 +0100
Subject: [PATCH] Admin rework #1794

---
 dsmr_datalogger/admin.py                                   | 7 +++++--
 .../migrations/0032_dsmr_extra_device_channel.py           | 2 +-
 dsmr_datalogger/models/settings.py                         | 2 +-
 dsmrreader/locales/nl/LC_MESSAGES/django.po                | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dsmr_datalogger/admin.py b/dsmr_datalogger/admin.py
index 053eb59b7..4520142c3 100644
--- a/dsmr_datalogger/admin.py
+++ b/dsmr_datalogger/admin.py
@@ -23,7 +23,11 @@ class DataloggerSettingsAdmin(SingletonModelAdmin):
         (
             _("Input method and DSMR protocol"),
             {
-                "fields": ["input_method", "dsmr_version"],
+                "fields": [
+                    "input_method",
+                    "dsmr_version",
+                    "dsmr_extra_device_channel",
+                ],
                 "description": _(
                     "The datalogger process should automatically restart to apply changes."
                 ),
@@ -45,7 +49,6 @@ class DataloggerSettingsAdmin(SingletonModelAdmin):
             _("Advanced"),
             {
                 "fields": [
-                    "dsmr_extra_device_channel",
                     "process_sleep",
                     "override_telegram_timestamp",
                 ],
diff --git a/dsmr_datalogger/migrations/0032_dsmr_extra_device_channel.py b/dsmr_datalogger/migrations/0032_dsmr_extra_device_channel.py
index 38f8c688f..e38851f4b 100644
--- a/dsmr_datalogger/migrations/0032_dsmr_extra_device_channel.py
+++ b/dsmr_datalogger/migrations/0032_dsmr_extra_device_channel.py
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
             field=models.IntegerField(
                 blank=True,
                 choices=[
-                    (None, "Auto (default)"),
+                    (None, "Automatic (default)"),
                     (1, "Belgium - Fluvius (channel 1)"),
                     (2, "Belgium - Fluvius (channel 2)"),
                     (3, "Belgium - Fluvius (channel 3)"),
diff --git a/dsmr_datalogger/models/settings.py b/dsmr_datalogger/models/settings.py
index b0895949d..fa0adb4c4 100644
--- a/dsmr_datalogger/models/settings.py
+++ b/dsmr_datalogger/models/settings.py
@@ -34,7 +34,7 @@ class DataloggerSettings(ModelUpdateMixin, SingletonModel):
     DSMR_EXTRA_DEVICE_CHANNEL_3 = 3
     DSMR_EXTRA_DEVICE_CHANNEL_4 = 4
     DSMR_EXTRA_DEVICE_CHANNEL_CHOICES = (
-        (DSMR_EXTRA_DEVICE_CHANNEL_AUTO, _("Auto (default)")),
+        (DSMR_EXTRA_DEVICE_CHANNEL_AUTO, _("Automatic (default)")),
         (DSMR_EXTRA_DEVICE_CHANNEL_1, _("Belgium - Fluvius (channel 1)")),
         (DSMR_EXTRA_DEVICE_CHANNEL_2, _("Belgium - Fluvius (channel 2)")),
         (DSMR_EXTRA_DEVICE_CHANNEL_3, _("Belgium - Fluvius (channel 3)")),
diff --git a/dsmrreader/locales/nl/LC_MESSAGES/django.po b/dsmrreader/locales/nl/LC_MESSAGES/django.po
index 841d9c7f8..7fefcf919 100644
--- a/dsmrreader/locales/nl/LC_MESSAGES/django.po
+++ b/dsmrreader/locales/nl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR-reader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-23 22:41+0100\n"
+"POT-Creation-Date: 2023-01-23 22:47+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Dennis Siemensma <github@dennissiemensma.nl>\n"
 "Language-Team: Dennis Siemensma <github@dennissiemensma.nl>\n"
@@ -711,7 +711,7 @@ msgstr "België - Fluvius (fix voor gasmeter)"
 msgid "Luxembourg - Smarty (single tariff fix)"
 msgstr "Luxemburg - Smarty (fix voor enkel tarief)"
 
-msgid "Auto (default)"
+msgid "Automatic (default)"
 msgstr "Automatisch (standaard)"
 
 msgid "Belgium - Fluvius (channel 1)"