From d7ced0d9e59a28114b52424f815717d59e0ec0f2 Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Wed, 2 Jul 2025 13:11:15 +0200
Subject: [PATCH] chore: added gettext values and renamed rauthy container

---
 docker-compose.yml                        |   8 +-
 lib/mv_web/controllers/auth_controller.ex |  14 +-
 lib/mv_web/router.ex                      |   9 +-
 priv/gettext/de/LC_MESSAGES/default.po    | 106 +++++++++------
 priv/gettext/de/LC_MESSAGES/errors.po     |  21 ---
 priv/gettext/default.pot                  | 152 +++++++++++++---------
 priv/gettext/en/LC_MESSAGES/default.po    | 152 +++++++++++++---------
 priv/gettext/en/LC_MESSAGES/errors.po     |   9 --
 8 files changed, 267 insertions(+), 204 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c41cc71..fc911c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.5"
 
 networks:
   local:
-  rauthy-test:
+  rauthy-dev:
     driver: bridge
 
 services:
@@ -28,11 +28,11 @@ services:
     ports:
       - "1080:1080"
     networks:
-      - rauthy-test
+      - rauthy-dev
 
   
   rauthy:
-    container_name: rauthy-test
+    container_name: rauthy-dev
     image: ghcr.io/sebadob/rauthy:0.30.2
     environment:
       - LOCAL_TEST=true
@@ -54,7 +54,7 @@ services:
       - mailcrab
       - db
     networks:
-      - rauthy-test
+      - rauthy-dev
       - local
     volumes: 
       - type: volume 
diff --git a/lib/mv_web/controllers/auth_controller.ex b/lib/mv_web/controllers/auth_controller.ex
index e6bcb82..42299f4 100644
--- a/lib/mv_web/controllers/auth_controller.ex
+++ b/lib/mv_web/controllers/auth_controller.ex
@@ -9,9 +9,9 @@ defmodule MvWeb.AuthController do
 
     message =
       case activity do
-        {:confirm_new_user, :confirm} -> "Your email address has now been confirmed"
-        {:password, :reset} -> "Your password has successfully been reset"
-        _ -> "You are now signed in"
+        {:confirm_new_user, :confirm} -> gettext("Your email address has now been confirmed")
+        {:password, :reset} -> gettext("Your password has successfully been reset")
+        _ -> gettext("You are now signed in")
       end
 
     conn
@@ -33,14 +33,14 @@ defmodule MvWeb.AuthController do
            caused_by: %Ash.Error.Forbidden{
              errors: [%AshAuthentication.Errors.CannotConfirmUnconfirmedUser{}]
            }
-         }} ->
+         }} -> gettext(
           """
           You have already signed in another way, but have not confirmed your account.
           You can confirm your account using the link we sent to you, or by resetting your password.
-          """
+          """)
 
         _ ->
-          "Incorrect email or password"
+          gettext("Incorrect email or password")
       end
 
     conn
@@ -53,7 +53,7 @@ defmodule MvWeb.AuthController do
 
     conn
     |> clear_session(:mv)
-    |> put_flash(:info, "You are now signed out")
+    |> put_flash(:info, gettext("You are now signed out"))
     |> redirect(to: return_to)
   end
 end
diff --git a/lib/mv_web/router.ex b/lib/mv_web/router.ex
index cdc517b..595a2da 100644
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@@ -79,16 +79,19 @@ defmodule MvWeb.Router do
                   reset_path: "/reset",
                   auth_routes_prefix: "/auth",
                   on_mount: [{MvWeb.LiveUserAuth, :live_no_user}],
-                  overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default]
+                  overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default],
+                  gettext_backend: {MvWeb.Gettext, "default"}
 
     # Remove this if you do not want to use the reset password feature
     reset_route auth_routes_prefix: "/auth",
-                overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default]
+                overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default],
+                gettext_backend: {MvWeb.Gettext, "default"}
 
     # Remove this if you do not use the confirmation strategy
     confirm_route Mv.Accounts.User, :confirm_new_user,
       auth_routes_prefix: "/auth",
-      overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default]
+      overrides: [MvWeb.AuthOverrides, AshAuthentication.Phoenix.Overrides.Default],
+      gettext_backend: {MvWeb.Gettext, "default"}
 
     # Remove this if you do not use the magic link strategy.
     # magic_sign_in_route(Mv.Accounts.User, :magic_link,
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index aa33cc3..7e6d755 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -25,9 +25,9 @@ msgstr "Bist du sicher?"
 msgid "Attempting to reconnect"
 msgstr "Verbindung wird wiederhergestellt"
 
-#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/form_component.ex:50
 #: lib/mv_web/member_live/index.ex:25
-#: lib/mv_web/member_live/show.ex:30
+#: lib/mv_web/member_live/show.ex:32
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr "Stadt"
@@ -43,12 +43,12 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: lib/mv_web/member_live/index.ex:76
-#: lib/mv_web/member_live/show.ex:91
+#: lib/mv_web/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr "Mitglied bearbeiten"
 
-#: lib/mv_web/member_live/form_component.ex:41
+#: lib/mv_web/member_live/form_component.ex:43
 #: lib/mv_web/member_live/index.ex:24
 #: lib/mv_web/member_live/show.ex:23
 #, elixir-autogen, elixir-format
@@ -60,7 +60,7 @@ msgstr "E-Mail"
 msgid "Error!"
 msgstr "Fehler!"
 
-#: lib/mv_web/member_live/form_component.ex:39
+#: lib/mv_web/member_live/form_component.ex:41
 #: lib/mv_web/member_live/index.ex:22
 #: lib/mv_web/member_live/show.ex:21
 #, elixir-autogen, elixir-format
@@ -72,14 +72,14 @@ msgstr "Vorname"
 msgid "Hang in there while we get back on track"
 msgstr "Bitte warten, wir stellen die Verbindung wieder her."
 
-#: lib/mv_web/member_live/form_component.ex:45
+#: lib/mv_web/member_live/form_component.ex:47
 #: lib/mv_web/member_live/index.ex:26
-#: lib/mv_web/member_live/show.ex:27
+#: lib/mv_web/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr "Beitrittsdatum"
 
-#: lib/mv_web/member_live/form_component.ex:40
+#: lib/mv_web/member_live/form_component.ex:42
 #: lib/mv_web/member_live/index.ex:23
 #: lib/mv_web/member_live/show.ex:22
 #, elixir-autogen, elixir-format
@@ -124,76 +124,76 @@ msgstr "Keine Internetverbindung gefunden"
 msgid "close"
 msgstr "schließen"
 
-#: lib/mv_web/member_live/form_component.ex:42
+#: lib/mv_web/member_live/form_component.ex:44
 #: lib/mv_web/member_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr "Geburtsdatum"
 
-#: lib/mv_web/member_live/form_component.ex:53
-#: lib/mv_web/member_live/show.ex:36
+#: lib/mv_web/member_live/form_component.ex:55
+#: lib/mv_web/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr "Eigene Eigenschaften"
 
-#: lib/mv_web/member_live/form_component.ex:46
-#: lib/mv_web/member_live/show.ex:28
+#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr "Austrittsdatum"
 
-#: lib/mv_web/member_live/form_component.ex:50
-#: lib/mv_web/member_live/show.ex:32
+#: lib/mv_web/member_live/form_component.ex:52
+#: lib/mv_web/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr "Hausnummer"
 
-#: lib/mv_web/member_live/form_component.ex:47
-#: lib/mv_web/member_live/show.ex:29
+#: lib/mv_web/member_live/form_component.ex:49
+#: lib/mv_web/member_live/show.ex:31
 #, elixir-autogen, elixir-format
 msgid "Notes"
 msgstr "Notizen"
 
-#: lib/mv_web/member_live/form_component.ex:43
+#: lib/mv_web/member_live/form_component.ex:45
 #: lib/mv_web/member_live/show.ex:25
 #, elixir-autogen, elixir-format
 msgid "Paid"
 msgstr "Bezahlt"
 
-#: lib/mv_web/member_live/form_component.ex:44
-#: lib/mv_web/member_live/show.ex:26
+#: lib/mv_web/member_live/form_component.ex:46
+#: lib/mv_web/member_live/show.ex:28
 #, elixir-autogen, elixir-format
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: lib/mv_web/member_live/form_component.ex:51
-#: lib/mv_web/member_live/show.ex:33
+#: lib/mv_web/member_live/form_component.ex:53
+#: lib/mv_web/member_live/show.ex:35
 #, elixir-autogen, elixir-format
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: lib/mv_web/member_live/form_component.ex:73
+#: lib/mv_web/member_live/form_component.ex:75
 #, elixir-autogen, elixir-format
 msgid "Save Member"
 msgstr "Mitglied speichern"
 
-#: lib/mv_web/member_live/form_component.ex:73
+#: lib/mv_web/member_live/form_component.ex:75
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: lib/mv_web/member_live/form_component.ex:49
-#: lib/mv_web/member_live/show.ex:31
+#: lib/mv_web/member_live/form_component.ex:51
+#: lib/mv_web/member_live/show.ex:33
 #, elixir-autogen, elixir-format
 msgid "Street"
 msgstr "Straße"
 
-#: lib/mv_web/member_live/form_component.ex:29
+#: lib/mv_web/member_live/form_component.ex:30
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage member records and their properties."
 msgstr "Dieses Formular dient zur Verwaltung von Mitgliedern und deren Eigenschaften."
 
-#: lib/mv_web/member_live/show.ex:50
+#: lib/mv_web/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Back to members"
 msgstr "Zurück zur Mitgliederliste"
@@ -208,12 +208,12 @@ msgstr "Mitglied bearbeiten"
 msgid "Id"
 msgstr "ID"
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr "Nein"
 
-#: lib/mv_web/member_live/show.ex:90
+#: lib/mv_web/member_live/show.ex:92
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr "Mitglied anzeigen"
@@ -223,22 +223,52 @@ msgstr "Mitglied anzeigen"
 msgid "This is a member record from your database."
 msgstr "Dies ist ein Mitglied aus deiner Datenbank."
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/mv_web/member_live/form_component.ex:107
-#, elixir-autogen, elixir-format
-msgid "Member %{action} successfully"
-msgstr "Mitglied %{action} erfolgreich"
-
-#: lib/mv_web/member_live/form_component.ex:100
+#: lib/mv_web/member_live/form_component.ex:102
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr "erstellt"
 
-#: lib/mv_web/member_live/form_component.ex:101
+#: lib/mv_web/member_live/form_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr "aktualisiert"
+
+#: lib/mv_web/controllers/auth_controller.ex:43
+#, elixir-autogen, elixir-format
+msgid "Incorrect email or password"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:109
+#, elixir-autogen, elixir-format
+msgid "Member %{action} successfully"
+msgstr "Mitglied %{action} erfolgreich"
+
+#: lib/mv_web/controllers/auth_controller.ex:14
+#, elixir-autogen, elixir-format
+msgid "You are now signed in"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:56
+#, elixir-autogen, elixir-format
+msgid "You are now signed out"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:36
+#, elixir-autogen, elixir-format
+msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:12
+#, elixir-autogen, elixir-format
+msgid "Your email address has now been confirmed"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:13
+#, elixir-autogen, elixir-format
+msgid "Your password has successfully been reset"
+msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po
index c0fba6d..844c4f5 100644
--- a/priv/gettext/de/LC_MESSAGES/errors.po
+++ b/priv/gettext/de/LC_MESSAGES/errors.po
@@ -110,24 +110,3 @@ msgstr ""
 
 msgid "must be equal to %{number}"
 msgstr ""
-
-msgid "is not a valid email"
-msgstr "ist keine gültige E-Mail-Adresse"
-
-msgid "cannot be in the future"
-msgstr "darf nicht in der Zukunft liegen"
-
-msgid "must be present"
-msgstr "muss ausgefüllt sein"
-
-msgid "is not a valid phone number"
-msgstr "ist keine gültige Telefonnummer"
-
-msgid "length must be greater than or equal to 5"
-msgstr "Die Länge muss mindestens 5 Zeichen betragen"
-
-msgid "cannot be before join date"
-msgstr "darf nicht vor dem Eintrittsdatum liegen"
-
-msgid "must consist of 5 digits"
-msgstr "muss aus 5 Ziffern bestehen"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index f5b79d7..aad2ae9 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -26,9 +26,9 @@ msgstr ""
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/form_component.ex:50
 #: lib/mv_web/member_live/index.ex:25
-#: lib/mv_web/member_live/show.ex:30
+#: lib/mv_web/member_live/show.ex:32
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
@@ -44,12 +44,12 @@ msgid "Edit"
 msgstr ""
 
 #: lib/mv_web/member_live/index.ex:76
-#: lib/mv_web/member_live/show.ex:91
+#: lib/mv_web/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:41
+#: lib/mv_web/member_live/form_component.ex:43
 #: lib/mv_web/member_live/index.ex:24
 #: lib/mv_web/member_live/show.ex:23
 #, elixir-autogen, elixir-format
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Error!"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:39
+#: lib/mv_web/member_live/form_component.ex:41
 #: lib/mv_web/member_live/index.ex:22
 #: lib/mv_web/member_live/show.ex:21
 #, elixir-autogen, elixir-format
@@ -73,14 +73,14 @@ msgstr ""
 msgid "Hang in there while we get back on track"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:45
+#: lib/mv_web/member_live/form_component.ex:47
 #: lib/mv_web/member_live/index.ex:26
-#: lib/mv_web/member_live/show.ex:27
+#: lib/mv_web/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:40
+#: lib/mv_web/member_live/form_component.ex:42
 #: lib/mv_web/member_live/index.ex:23
 #: lib/mv_web/member_live/show.ex:22
 #, elixir-autogen, elixir-format
@@ -125,76 +125,76 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:42
+#: lib/mv_web/member_live/form_component.ex:44
 #: lib/mv_web/member_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:53
-#: lib/mv_web/member_live/show.ex:36
+#: lib/mv_web/member_live/form_component.ex:55
+#: lib/mv_web/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:46
-#: lib/mv_web/member_live/show.ex:28
+#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:50
-#: lib/mv_web/member_live/show.ex:32
+#: lib/mv_web/member_live/form_component.ex:52
+#: lib/mv_web/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:47
-#: lib/mv_web/member_live/show.ex:29
-#, elixir-autogen, elixir-format
-msgid "Notes"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:43
-#: lib/mv_web/member_live/show.ex:25
-#, elixir-autogen, elixir-format
-msgid "Paid"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:44
-#: lib/mv_web/member_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Phone Number"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:51
-#: lib/mv_web/member_live/show.ex:33
-#, elixir-autogen, elixir-format
-msgid "Postal Code"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:73
-#, elixir-autogen, elixir-format
-msgid "Save Member"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:73
-#, elixir-autogen, elixir-format
-msgid "Saving..."
-msgstr ""
-
 #: lib/mv_web/member_live/form_component.ex:49
 #: lib/mv_web/member_live/show.ex:31
 #, elixir-autogen, elixir-format
+msgid "Notes"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:45
+#: lib/mv_web/member_live/show.ex:25
+#, elixir-autogen, elixir-format
+msgid "Paid"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:46
+#: lib/mv_web/member_live/show.ex:28
+#, elixir-autogen, elixir-format
+msgid "Phone Number"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:53
+#: lib/mv_web/member_live/show.ex:35
+#, elixir-autogen, elixir-format
+msgid "Postal Code"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:75
+#, elixir-autogen, elixir-format
+msgid "Save Member"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:75
+#, elixir-autogen, elixir-format
+msgid "Saving..."
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:51
+#: lib/mv_web/member_live/show.ex:33
+#, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:29
+#: lib/mv_web/member_live/form_component.ex:30
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:50
+#: lib/mv_web/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Back to members"
 msgstr ""
@@ -209,12 +209,12 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:90
+#: lib/mv_web/member_live/show.ex:92
 #, elixir-autogen, elixir-format
 msgid "Show Member"
 msgstr ""
@@ -224,22 +224,52 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:107
-#, elixir-autogen, elixir-format
-msgid "Mitglied %{action} erfolgreich"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:100
+#: lib/mv_web/member_live/form_component.ex:102
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:101
+#: lib/mv_web/member_live/form_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:43
+#, elixir-autogen, elixir-format
+msgid "Incorrect email or password"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:109
+#, elixir-autogen, elixir-format
+msgid "Member %{action} successfully"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:14
+#, elixir-autogen, elixir-format
+msgid "You are now signed in"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:56
+#, elixir-autogen, elixir-format
+msgid "You are now signed out"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:36
+#, elixir-autogen, elixir-format
+msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:12
+#, elixir-autogen, elixir-format
+msgid "Your email address has now been confirmed"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:13
+#, elixir-autogen, elixir-format
+msgid "Your password has successfully been reset"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 6173d39..3317236 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -26,9 +26,9 @@ msgstr ""
 msgid "Attempting to reconnect"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/form_component.ex:50
 #: lib/mv_web/member_live/index.ex:25
-#: lib/mv_web/member_live/show.ex:30
+#: lib/mv_web/member_live/show.ex:32
 #, elixir-autogen, elixir-format
 msgid "City"
 msgstr ""
@@ -44,12 +44,12 @@ msgid "Edit"
 msgstr ""
 
 #: lib/mv_web/member_live/index.ex:76
-#: lib/mv_web/member_live/show.ex:91
+#: lib/mv_web/member_live/show.ex:93
 #, elixir-autogen, elixir-format
 msgid "Edit Member"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:41
+#: lib/mv_web/member_live/form_component.ex:43
 #: lib/mv_web/member_live/index.ex:24
 #: lib/mv_web/member_live/show.ex:23
 #, elixir-autogen, elixir-format
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Error!"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:39
+#: lib/mv_web/member_live/form_component.ex:41
 #: lib/mv_web/member_live/index.ex:22
 #: lib/mv_web/member_live/show.ex:21
 #, elixir-autogen, elixir-format
@@ -73,14 +73,14 @@ msgstr ""
 msgid "Hang in there while we get back on track"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:45
+#: lib/mv_web/member_live/form_component.ex:47
 #: lib/mv_web/member_live/index.ex:26
-#: lib/mv_web/member_live/show.ex:27
+#: lib/mv_web/member_live/show.ex:29
 #, elixir-autogen, elixir-format
 msgid "Join Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:40
+#: lib/mv_web/member_live/form_component.ex:42
 #: lib/mv_web/member_live/index.ex:23
 #: lib/mv_web/member_live/show.ex:22
 #, elixir-autogen, elixir-format
@@ -125,76 +125,76 @@ msgstr ""
 msgid "close"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:42
+#: lib/mv_web/member_live/form_component.ex:44
 #: lib/mv_web/member_live/show.ex:24
 #, elixir-autogen, elixir-format
 msgid "Birth Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:53
-#: lib/mv_web/member_live/show.ex:36
+#: lib/mv_web/member_live/form_component.ex:55
+#: lib/mv_web/member_live/show.ex:38
 #, elixir-autogen, elixir-format
 msgid "Custom Properties"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:46
-#: lib/mv_web/member_live/show.ex:28
+#: lib/mv_web/member_live/form_component.ex:48
+#: lib/mv_web/member_live/show.ex:30
 #, elixir-autogen, elixir-format
 msgid "Exit Date"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:50
-#: lib/mv_web/member_live/show.ex:32
+#: lib/mv_web/member_live/form_component.ex:52
+#: lib/mv_web/member_live/show.ex:34
 #, elixir-autogen, elixir-format
 msgid "House Number"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:47
-#: lib/mv_web/member_live/show.ex:29
-#, elixir-autogen, elixir-format
-msgid "Notes"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:43
-#: lib/mv_web/member_live/show.ex:25
-#, elixir-autogen, elixir-format
-msgid "Paid"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:44
-#: lib/mv_web/member_live/show.ex:26
-#, elixir-autogen, elixir-format
-msgid "Phone Number"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:51
-#: lib/mv_web/member_live/show.ex:33
-#, elixir-autogen, elixir-format
-msgid "Postal Code"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:73
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Save Member"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:73
-#, elixir-autogen, elixir-format
-msgid "Saving..."
-msgstr ""
-
 #: lib/mv_web/member_live/form_component.ex:49
 #: lib/mv_web/member_live/show.ex:31
 #, elixir-autogen, elixir-format
+msgid "Notes"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:45
+#: lib/mv_web/member_live/show.ex:25
+#, elixir-autogen, elixir-format
+msgid "Paid"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:46
+#: lib/mv_web/member_live/show.ex:28
+#, elixir-autogen, elixir-format
+msgid "Phone Number"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:53
+#: lib/mv_web/member_live/show.ex:35
+#, elixir-autogen, elixir-format
+msgid "Postal Code"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:75
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Save Member"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:75
+#, elixir-autogen, elixir-format
+msgid "Saving..."
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:51
+#: lib/mv_web/member_live/show.ex:33
+#, elixir-autogen, elixir-format
 msgid "Street"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:29
+#: lib/mv_web/member_live/form_component.ex:30
 #, elixir-autogen, elixir-format
 msgid "Use this form to manage member records and their properties."
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:50
+#: lib/mv_web/member_live/show.ex:52
 #, elixir-autogen, elixir-format
 msgid "Back to members"
 msgstr ""
@@ -209,12 +209,12 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "No"
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:90
+#: lib/mv_web/member_live/show.ex:92
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Show Member"
 msgstr ""
@@ -224,22 +224,52 @@ msgstr ""
 msgid "This is a member record from your database."
 msgstr ""
 
-#: lib/mv_web/member_live/show.ex:25
+#: lib/mv_web/member_live/show.ex:26
 #, elixir-autogen, elixir-format
 msgid "Yes"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:107
-#, elixir-autogen, elixir-format
-msgid "Member %{action} successfully"
-msgstr ""
-
-#: lib/mv_web/member_live/form_component.ex:100
+#: lib/mv_web/member_live/form_component.ex:102
 #, elixir-autogen, elixir-format
 msgid "create"
 msgstr ""
 
-#: lib/mv_web/member_live/form_component.ex:101
+#: lib/mv_web/member_live/form_component.ex:103
 #, elixir-autogen, elixir-format
 msgid "update"
 msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:43
+#, elixir-autogen, elixir-format
+msgid "Incorrect email or password"
+msgstr ""
+
+#: lib/mv_web/member_live/form_component.ex:109
+#, elixir-autogen, elixir-format
+msgid "Member %{action} successfully"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:14
+#, elixir-autogen, elixir-format
+msgid "You are now signed in"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:56
+#, elixir-autogen, elixir-format
+msgid "You are now signed out"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:36
+#, elixir-autogen, elixir-format
+msgid "You have already signed in another way, but have not confirmed your account.\nYou can confirm your account using the link we sent to you, or by resetting your password.\n"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:12
+#, elixir-autogen, elixir-format
+msgid "Your email address has now been confirmed"
+msgstr ""
+
+#: lib/mv_web/controllers/auth_controller.ex:13
+#, elixir-autogen, elixir-format
+msgid "Your password has successfully been reset"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po
index 60c1037..844c4f5 100644
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -110,12 +110,3 @@ msgstr ""
 
 msgid "must be equal to %{number}"
 msgstr ""
-
-msgid "length must be greater than or equal to 5"
-msgstr "length must be greater than or equal to 5"
-
-msgid "cannot be before join date"
-msgstr "cannot be before join date"
-
-msgid "must consist of 5 digits"
-msgstr "must consist of 5 digits"