fix more gettexts

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.8.3
+- Improve some styles
+- Improve server log
+
 # v0.8.2
 - Fix bug with public registration
 - Improve templates

lib/cannery/accounts.ex

@@ -16,9 +16,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %User{} <- get_user_by_email("foo@example.com"), do: :passed
-      :passed
+      iex> get_user_by_email("foo@example.com")
+      %User{}
 
       iex> get_user_by_email("unknown@example.com")
       nil
@@ -34,9 +33,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %User{} <- get_user_by_email_and_password("foo@example.com", "valid_password"), do: :passed
-      :passed
+      iex> get_user_by_email_and_password("foo@example.com", "valid_password")
+      %User{}
 
       iex> get_user_by_email_and_password("foo@example.com", "invalid_password")
       nil
@@ -57,15 +55,14 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> get_user!(user.id)
+      iex> get_user!(user_id)
       user
 
-      > get_user!()
+      iex> get_user!()
       ** (Ecto.NoResultsError)
 
   """
-  @spec get_user!(User.t()) :: User.t()
+  @spec get_user!(User.id()) :: User.t()
   def get_user!(id) do
     Repo.get!(User, id)
   end
@@ -75,10 +72,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user1} = register_user(%{email: "foo1@example.com", password: "valid_password"})
-      iex> {:ok, user2} = register_user(%{email: "foo2@example.com", password: "valid_password"})
-      iex> with %{admin: [^user1], user: [^user2]} <- list_all_users_by_role(user1), do: :passed
-      :passed
+      iex> list_all_users_by_role(user1)
+      %{admin: [%User{role: :admin}], user: [%User{role: :user}]}
 
   """
   @spec list_all_users_by_role(User.t()) :: %{User.role() => [User.t()]}
@@ -91,9 +86,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with [^user] <- list_users_by_role(:admin), do: :passed
-      :passed
+      iex> list_users_by_role(:admin)
+      [%User{role: :admin}]
 
   """
   @spec list_users_by_role(:admin) :: [User.t()]
@@ -108,13 +102,11 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with {:ok, %User{email: "foo@example.com"}} <-
-      ...>        register_user(%{email: "foo@example.com", password: "valid_password"}),
-      ...>      do: :passed
-      :passed
+      iex> register_user(%{email: "foo@example.com", password: "valid_password"})
+      {:ok, %User{email: "foo@example.com"}}
 
-      iex> with {:error, %Changeset{}} <- register_user(%{email: "foo@example"}), do: :passed
-      :passed
+      iex> register_user(%{email: "foo@example"})
+      {:error, %Changeset{}}
 
   """
   @spec register_user(attrs :: map()) ::
@@ -149,11 +141,11 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_registration(), do: :passed
-      :passed
+      iex> change_user_registration()
+      %Changeset{}
 
-      iex> with %Changeset{} <- change_user_registration(%{password: "hi"}), do: :passed
-      :passed
+      iex> change_user_registration(%{password: "hi"}
+      %Changeset{}
 
   """
   @spec change_user_registration() :: User.changeset()
@@ -169,8 +161,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_email(%User{email: "foo@example.com"}), do: :passed
-      :passed
+      iex> change_user_email(%User{email: "foo@example.com"})
+      %Changeset{}
 
   """
   @spec change_user_email(User.t()) :: User.changeset()
@@ -184,8 +176,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_role(%User{}, :user), do: :passed
-      :passed
+      iex> change_user_role(%User{}, :user)
+      %Changeset{}
 
   """
   @spec change_user_role(User.t(), User.role()) :: User.changeset()
@@ -199,17 +191,11 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:ok, %User{}} <-
-      ...>        apply_user_email(user, "valid_password", %{email: "new_email@account.com"}),
-      ...>      do: :passed
-      :passed
+      iex> apply_user_email(user, "valid_password", %{email: "new_email@account.com"})
+      {:ok, %User{}}
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:error, %Changeset{}} <-
-      ...>        apply_user_email(user, "invalid password", %{email: "new_email@account"}),
-      ...>      do: :passed
-      :passed
+      iex> apply_user_email(user, "invalid password", %{email: "new_email@account"})
+      {:error, %Changeset{}}
 
   """
   @spec apply_user_email(User.t(), email :: String.t(), attrs :: map()) ::
@@ -254,12 +240,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %Oban.Job{
-      ...>        args: %{email: :update_email, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...>      } <- deliver_update_email_instructions(user, "new_foo@example.com", fn _token -> "example url" end),
-      ...>      do: :passed
-      :passed
+      iex> deliver_update_email_instructions(user, "new_foo@example.com", fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :update_email, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_update_email_instructions(User.t(), current_email :: String.t(), function) ::
@@ -276,8 +258,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_password(%User{}), do: :passed
-      :passed
+      iex> change_user_password(%User{})
+      %Changeset{}
 
   """
   @spec change_user_password(User.t(), attrs :: map()) :: User.changeset()
@@ -290,20 +272,14 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:ok, %User{}} <-
-      ...>         reset_user_password(user, %{
+      iex> reset_user_password(user, %{
       ...>   password: "new password",
       ...>   password_confirmation: "new password"
-      ...>         }),
-      ...>      do: :passed
-      :passed
+      ...> })
+      {:ok, %User{}}
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:error, %Changeset{}} <-
-      ...>        update_user_password(user, "invalid password", %{password: "123"}),
-      ...>      do: :passed
-      :passed
+      iex> update_user_password(user, "invalid password", %{password: "123"})
+      {:error, %Changeset{}}
 
   """
   @spec update_user_password(User.t(), String.t(), attrs :: map()) ::
@@ -329,8 +305,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> with %Changeset{} <- change_user_locale(%User{}), do: :passed
-      :passed
+      iex> change_user_locale(%User{})
+      %Changeset{}
 
   """
   @spec change_user_locale(User.t()) :: User.changeset()
@@ -343,9 +319,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:ok, %User{}} <- update_user_locale(user, "en_US"), do: :passed
-      :passed
+      iex> update_user_locale(user, "en_US")
+      {:ok, %User{}}
 
   """
   @spec update_user_locale(User.t(), locale :: String.t()) ::
@@ -359,13 +334,11 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %User{} <- delete_user!(user, %User{id: 123, role: :admin}), do: :passed
-      :passed
+      iex> delete_user!(user, %User{id: 123, role: :admin})
+      %User{}
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %User{} <- delete_user!(user, user), do: :passed
-      :passed
+      iex> delete_user!(user, user)
+      %User{}
 
   """
   @spec delete_user!(user_to_delete :: User.t(), User.t()) :: User.t()
@@ -421,11 +394,10 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> is_admin?(user)
+      iex> is_admin?(%User{role: :admin})
       true
 
-      iex> is_admin?(%User{id: Ecto.UUID.generate()})
+      iex> is_admin?(%User{})
       false
 
   """
@@ -439,8 +411,7 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> is_already_admin?(user)
+      iex> is_already_admin?(%User{role: :admin})
       true
 
       iex> is_already_admin?(%User{})
@@ -458,15 +429,9 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %Oban.Job{
-      ...>   args: %{email: :welcome, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...> } <- deliver_user_confirmation_instructions(user, fn _token -> "example url" end),
-      ...> do: :passed
-      :passed
+      iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :welcome, user_id: ^user_id, attrs: %{url: "example url"}}}
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> user = user |> User.confirm_changeset() |> Repo.update!()
       iex> deliver_user_confirmation_instructions(user, fn _token -> "example url" end)
       {:error, :already_confirmed}
 
@@ -514,12 +479,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, %{id: user_id} = user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with %Oban.Job{args: %{
-      ...>        email: :reset_password, user_id: ^user_id, attrs: %{url: "example url"}}
-      ...>    } <- deliver_user_reset_password_instructions(user, fn _token -> "example url" end),
-      ...>    do: :passed
-      :passed
+      iex> deliver_user_reset_password_instructions(user, fn _token -> "example url" end)
+      %Oban.Job{args: %{email: :reset_password, user_id: ^user_id, attrs: %{url: "example url"}}}
 
   """
   @spec deliver_user_reset_password_instructions(User.t(), function()) :: Job.t()
@@ -535,11 +496,8 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> {encoded_token, user_token} = UserToken.build_email_token(user, "reset_password")
-      iex> Repo.insert!(user_token)
-      iex> with %User{} <- get_user_by_reset_password_token(encoded_token), do: :passed
-      :passed
+      iex> get_user_by_reset_password_token(encoded_token)
+      %User{}
 
       iex> get_user_by_reset_password_token("invalidtoken")
       nil
@@ -560,20 +518,14 @@ defmodule Cannery.Accounts do
 
   ## Examples
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:ok, %User{}} <-
-      ...>         reset_user_password(user, %{
+      iex> reset_user_password(user, %{
       ...>   password: "new password",
       ...>   password_confirmation: "new password"
-      ...>         }),
-      ...>      do: :passed
-      :passed
+      ...> })
+      {:ok, %User{}}
 
-      iex> {:ok, user} = register_user(%{email: "foo@example.com", password: "valid_password"})
-      iex> with {:error, %Changeset{}} <-
-      ...>        reset_user_password(user, %{password: "valid", password_confirmation: "not the same"}),
-      ...>      do: :passed
-      :passed
+      iex> reset_user_password(user, %{password: "valid", password_confirmation: "not the same"})
+      {:error, %Changeset{}}
 
   """
   @spec reset_user_password(User.t(), attrs :: map()) ::

lib/cannery_web/templates/user_confirmation/new.html.heex

@@ -9,7 +9,7 @@
     action={Routes.user_confirmation_path(@conn, :create)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
     <%= submit(dgettext("actions", "Resend confirmation instructions"),

lib/cannery_web/templates/user_registration/new.html.heex

@@ -17,11 +17,11 @@
       <%= hidden_input(f, :invite_token, value: @invite_token) %>
     <% end %>
 
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :email, "col-span-3") %>
 
-    <%= label(f, :password, class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("Password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 

lib/cannery_web/templates/user_reset_password/edit.html.heex

@@ -15,11 +15,11 @@
       </p>
     </div>
 
-    <%= label(f, :password, "New password", class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("New password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
     <%= error_tag(f, :password, "col-span-3") %>
 
-    <%= label(f, :password_confirmation, "Confirm new password",
+    <%= label(f, :password_confirmation, gettext("Confirm new password"),
       class: "title text-lg text-primary-600"
     ) %>
     <%= password_input(f, :password_confirmation,

lib/cannery_web/templates/user_reset_password/new.html.heex

@@ -9,7 +9,7 @@
     action={Routes.user_reset_password_path(@conn, :create)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
     <%= submit(dgettext("actions", "Send instructions to reset password"),

lib/cannery_web/templates/user_session/new.html.heex

@@ -16,10 +16,10 @@
       </p>
     </div>
 
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
 
-    <%= label(f, :password, class: "title text-lg text-primary-600") %>
+    <%= label(f, :password, gettext("Password"), class: "title text-lg text-primary-600") %>
     <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
 
     <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"),

lib/cannery_web/templates/user_settings/edit.html.heex

@@ -1,5 +1,5 @@
-<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
-  <h1 class="pb-4 title text-primary-600 text-xl">
+<div class="mx-auto pb-8 max-w-2xl flex flex-col justify-center items-center text-right space-y-4">
+  <h1 class="pb-4 title text-primary-600 text-2xl text-center">
     <%= gettext("Settings") %>
   </h1>
 
@@ -11,7 +11,7 @@
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <h3 class="title text-primary-600 text-lg col-span-3">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change email") %>
     </h3>
 
@@ -19,14 +19,12 @@
       :if={@email_changeset.action && not @email_changeset.valid?()}
       class="alert alert-danger col-span-3"
     >
-      <p>
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-      </p>
     </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_email") %>
 
-    <%= label(f, :email, class: "title text-lg text-primary-600") %>
+    <%= label(f, :email, gettext("Email"), class: "title text-lg text-primary-600") %>
     <%= email_input(f, :email, required: true, class: "mx-2 my-1 input input-primary col-span-2") %>
     <%= error_tag(f, :email, "col-span-3") %>
 
@@ -55,7 +53,7 @@
     action={Routes.user_settings_path(@conn, :update)}
     class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <h3 class="title text-primary-600 text-lg col-span-3">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change password") %>
     </h3>
 
@@ -63,9 +61,7 @@
       :if={@password_changeset.action && not @password_changeset.valid?()}
       class="alert alert-danger col-span-3"
     >
-      <p>
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-      </p>
     </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_password") %>
@@ -109,19 +105,17 @@
     :let={f}
     for={@locale_changeset}
     action={Routes.user_settings_path(@conn, :update)}
-    class="flex flex-col space-y-4 justify-center items-center"
+    class="flex flex-col space-y-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4 justify-center items-center"
   >
-    <h3 class="title text-primary-600 text-lg">
+    <h3 class="title text-primary-600 text-lg text-center col-span-3">
       <%= dgettext("actions", "Change Language") %>
     </h3>
 
     <div
       :if={@locale_changeset.action && not @locale_changeset.valid?()}
-      class="alert alert-danger"
+      class="alert alert-danger col-span-3"
     >
-      <p>
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
-      </p>
     </div>
 
     <%= hidden_input(f, :action, name: "action", value: "update_locale") %>
@@ -135,12 +129,12 @@
         {gettext("French"), "fr"},
         {gettext("Spanish"), "es"}
       ],
-      class: "mx-2 my-1 min-w-md input input-primary"
+      class: "mx-2 my-1 min-w-md input input-primary col-span-3"
     ) %>
-    <%= error_tag(f, :locale) %>
+    <%= error_tag(f, :locale, "col-span-3") %>
 
     <%= submit(dgettext("actions", "Change language"),
-      class: "whitespace-nowrap mx-auto btn btn-primary",
+      class: "whitespace-nowrap mx-auto btn btn-primary col-span-3",
       data: [qa: dgettext("prompts", "Are you sure you want to change your language?")]
     ) %>
   </.form>

mix.exs

@@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
   def project do
     [
       app: :cannery,
-      version: "0.8.2",
+      version: "0.8.3",
       elixir: "1.14.1",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),

priv/gettext/actions.pot

@@ -33,13 +33,13 @@ msgid "Add your first type!"
 msgstr ""
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
@@ -193,12 +193,12 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/de/LC_MESSAGES/actions.po

@@ -46,13 +46,13 @@ msgid "Add your first type!"
 msgstr "Fügen Sie ihre erste Munitionsart hinzu!"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Mailadresse ändern"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -62,7 +62,7 @@ msgstr "Passwort ändern"
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Benutzer löschen"
@@ -206,12 +206,12 @@ msgstr "Zuerst einen Behälter hinzufügen"
 msgid "Create"
 msgstr "Erstellen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Sprache wechseln"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Sprache wechseln"
@@ -248,7 +248,7 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -574,18 +574,20 @@ msgstr "Pulverart"
 msgid "UPC"
 msgstr "UPC"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr "Passwort bestätigen"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr "Derzeitiges Passwort"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr "Neues Passwort"
@@ -709,17 +711,17 @@ msgid "Added on:"
 msgstr "Hinzugefügt am:"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr "Englisch"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr "Französisch"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr "Deutsch"
@@ -1109,7 +1111,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1197,3 +1199,18 @@ msgstr "Verbleibende Nutzung:"
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/de/LC_MESSAGES/errors.po

@@ -71,9 +71,9 @@ msgstr "Nicht gefunden"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr "Oops, etwas ist schiefgegangen. Bitte beachten Sie den Fehler unten."

priv/gettext/de/LC_MESSAGES/prompts.po

@@ -79,7 +79,7 @@ msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?"
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Sind Sie sicher, dass sie diese Munition löschen möchten?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie sicher, dass sie Ihren Account löschen möchten?"
@@ -224,7 +224,7 @@ msgstr "Sie müssen"
 msgid "Creating..."
 msgstr "Erstellen..."
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "Möchten Sie die Sprache wechseln?"

priv/gettext/default.pot

@@ -568,18 +568,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -703,17 +705,17 @@ msgid "Added on:"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""
@@ -1103,7 +1105,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1180,3 +1182,18 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/en/LC_MESSAGES/actions.po

@@ -33,13 +33,13 @@ msgid "Add your first type!"
 msgstr ""
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
@@ -193,12 +193,12 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
@@ -235,7 +235,7 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -568,18 +568,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -703,17 +705,17 @@ msgid "Added on:"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""
@@ -1103,7 +1105,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1180,3 +1182,18 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/en/LC_MESSAGES/errors.po

@@ -58,9 +58,9 @@ msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

priv/gettext/en/LC_MESSAGES/prompts.po

@@ -64,7 +64,7 @@ msgstr ""
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""

priv/gettext/errors.pot

@@ -58,9 +58,9 @@ msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

priv/gettext/es/LC_MESSAGES/actions.po

@@ -46,13 +46,13 @@ msgid "Add your first type!"
 msgstr "¡Añade tu primer tipo!"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Cambiar correo electrónico"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Cambiar contraseña"
@@ -62,7 +62,7 @@ msgstr "Cambiar contraseña"
 msgid "Create Invite"
 msgstr "Crear Invitación"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Eliminar cuenta de Usuario"
@@ -206,12 +206,12 @@ msgstr "añade primero un contenedor"
 msgid "Create"
 msgstr "Crear"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Cambiar Lenguaje"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Cambiar lenguaje"
@@ -248,7 +248,7 @@ msgstr "Preparar para el campo de tiro"
 msgid "Unstage from range"
 msgstr "Desmontar del campo de tiro"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr "Exportar datos como JSON"

priv/gettext/es/LC_MESSAGES/default.po

@@ -575,18 +575,20 @@ msgstr "Tipo de polvora"
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr "Confirme contraseña nueva"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr "Nueva contraseña"
@@ -710,17 +712,17 @@ msgid "Added on:"
 msgstr "Añadido en:"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr "Inglés"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr "Francés"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr "Alemán"
@@ -1111,7 +1113,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1199,3 +1201,18 @@ msgstr "Usos Restantes:"
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/es/LC_MESSAGES/errors.po

@@ -71,9 +71,9 @@ msgstr "No se encontró"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

priv/gettext/es/LC_MESSAGES/prompts.po

@@ -79,7 +79,7 @@ msgstr "Está seguro que desea eliminar %{name}?"
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Está seguro que desea eliminar esta munición?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Está seguro que desea eliminar su cuenta?"
@@ -223,7 +223,7 @@ msgstr "Necesitará hacerlo"
 msgid "Creating..."
 msgstr "Creando..."
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "¿Está segure de que quiere cambiar el idioma?"

priv/gettext/fr/LC_MESSAGES/actions.po

@@ -46,13 +46,13 @@ msgid "Add your first type!"
 msgstr "Ajoutez votre premier type !"
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr "Changer le mél"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr "Changer le mot de passe"
@@ -62,7 +62,7 @@ msgstr "Changer le mot de passe"
 msgid "Create Invite"
 msgstr "Créer une invitation"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr "Supprimer utilisateur"
@@ -206,12 +206,12 @@ msgstr "ajouter un conteneur en premier"
 msgid "Create"
 msgstr "Créer"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr "Changer la langue"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr "Changer la langue"
@@ -248,7 +248,7 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/fr/LC_MESSAGES/default.po

@@ -576,18 +576,20 @@ msgstr "Type de poudre"
 msgid "UPC"
 msgstr "UPC"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr "Confirmez le nouveau mot de passe"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr "Nouveau mot de passe"
@@ -711,17 +713,17 @@ msgid "Added on:"
 msgstr "Ajouté le :"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr "Anglais"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr "Français"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr "Allemand"
@@ -1112,7 +1114,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1200,3 +1202,18 @@ msgstr "Utilisations restantes :"
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/fr/LC_MESSAGES/errors.po

@@ -71,9 +71,9 @@ msgstr "Pas trouvé"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

priv/gettext/fr/LC_MESSAGES/prompts.po

@@ -80,7 +80,7 @@ msgstr "Êtes-vous certain·e de supprimer %{name} ?"
 msgid "Are you sure you want to delete this ammo?"
 msgstr "Êtes-vous certain·e de supprimer cette munition ?"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr "Êtes-vous certain·e de supprimer votre compte ?"
@@ -225,7 +225,7 @@ msgstr "Vous aurez besoin de"
 msgid "Creating..."
 msgstr "Création en cours…"
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr "Êtes-vous certain·e de vouloir changer votre langue ?"

priv/gettext/ga/LC_MESSAGES/actions.po

@@ -44,13 +44,13 @@ msgid "Add your first type!"
 msgstr ""
 
 #: lib/cannery_web/templates/user_settings/edit.html.heex:15
-#: lib/cannery_web/templates/user_settings/edit.html.heex:45
+#: lib/cannery_web/templates/user_settings/edit.html.heex:43
 #, elixir-autogen, elixir-format
 msgid "Change email"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:59
-#: lib/cannery_web/templates/user_settings/edit.html.heex:101
+#: lib/cannery_web/templates/user_settings/edit.html.heex:57
+#: lib/cannery_web/templates/user_settings/edit.html.heex:97
 #, elixir-autogen, elixir-format
 msgid "Change password"
 msgstr ""
@@ -60,7 +60,7 @@ msgstr ""
 msgid "Create Invite"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:165
+#: lib/cannery_web/templates/user_settings/edit.html.heex:159
 #, elixir-autogen, elixir-format
 msgid "Delete User"
 msgstr ""
@@ -204,12 +204,12 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:115
+#: lib/cannery_web/templates/user_settings/edit.html.heex:111
 #, elixir-autogen, elixir-format
 msgid "Change Language"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:142
+#: lib/cannery_web/templates/user_settings/edit.html.heex:136
 #, elixir-autogen, elixir-format
 msgid "Change language"
 msgstr ""
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Unstage from range"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:156
+#: lib/cannery_web/templates/user_settings/edit.html.heex:150
 #, elixir-autogen, elixir-format
 msgid "Export Data as JSON"
 msgstr ""

priv/gettext/ga/LC_MESSAGES/default.po

@@ -570,18 +570,20 @@ msgstr ""
 msgid "UPC"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:80
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:76
 #, elixir-autogen, elixir-format
 msgid "Confirm new password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:33
-#: lib/cannery_web/templates/user_settings/edit.html.heex:89
+#: lib/cannery_web/templates/user_settings/edit.html.heex:31
+#: lib/cannery_web/templates/user_settings/edit.html.heex:85
 #, elixir-autogen, elixir-format
 msgid "Current password"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:73
+#: lib/cannery_web/templates/user_reset_password/edit.html.heex:18
+#: lib/cannery_web/templates/user_settings/edit.html.heex:69
 #, elixir-autogen, elixir-format
 msgid "New password"
 msgstr ""
@@ -705,17 +707,17 @@ msgid "Added on:"
 msgstr ""
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:32
-#: lib/cannery_web/templates/user_settings/edit.html.heex:133
+#: lib/cannery_web/templates/user_settings/edit.html.heex:127
 #, elixir-autogen, elixir-format
 msgid "English"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:135
+#: lib/cannery_web/templates/user_settings/edit.html.heex:129
 #, elixir-autogen, elixir-format
 msgid "French"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:134
+#: lib/cannery_web/templates/user_settings/edit.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "German"
 msgstr ""
@@ -1105,7 +1107,7 @@ msgstr ""
 msgid "Search shot records"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:136
+#: lib/cannery_web/templates/user_settings/edit.html.heex:130
 #, elixir-autogen, elixir-format
 msgid "Spanish"
 msgstr ""
@@ -1191,3 +1193,18 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Uses: %{uses_count}"
 msgstr ""
+
+#: lib/cannery_web/templates/user_confirmation/new.html.heex:12
+#: lib/cannery_web/templates/user_registration/new.html.heex:20
+#: lib/cannery_web/templates/user_reset_password/new.html.heex:12
+#: lib/cannery_web/templates/user_session/new.html.heex:19
+#: lib/cannery_web/templates/user_settings/edit.html.heex:27
+#, elixir-autogen, elixir-format
+msgid "Email"
+msgstr ""
+
+#: lib/cannery_web/templates/user_registration/new.html.heex:24
+#: lib/cannery_web/templates/user_session/new.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "Password"
+msgstr ""

priv/gettext/ga/LC_MESSAGES/errors.po

@@ -72,9 +72,9 @@ msgstr "Ní feidir é a fáil"
 
 #: lib/cannery_web/templates/user_registration/new.html.heex:13
 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
-#: lib/cannery_web/templates/user_settings/edit.html.heex:23
-#: lib/cannery_web/templates/user_settings/edit.html.heex:67
-#: lib/cannery_web/templates/user_settings/edit.html.heex:123
+#: lib/cannery_web/templates/user_settings/edit.html.heex:22
+#: lib/cannery_web/templates/user_settings/edit.html.heex:64
+#: lib/cannery_web/templates/user_settings/edit.html.heex:118
 #, elixir-autogen, elixir-format
 msgid "Oops, something went wrong! Please check the errors below."
 msgstr ""

priv/gettext/ga/LC_MESSAGES/prompts.po

@@ -75,7 +75,7 @@ msgstr ""
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""

priv/gettext/prompts.pot

@@ -64,7 +64,7 @@ msgstr ""
 msgid "Are you sure you want to delete this ammo?"
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:163
+#: lib/cannery_web/templates/user_settings/edit.html.heex:157
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to delete your account?"
 msgstr ""
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Creating..."
 msgstr ""
 
-#: lib/cannery_web/templates/user_settings/edit.html.heex:144
+#: lib/cannery_web/templates/user_settings/edit.html.heex:138
 #, elixir-autogen, elixir-format
 msgid "Are you sure you want to change your language?"
 msgstr ""

test/cannery/accounts_test.exs

@@ -10,8 +10,6 @@ defmodule Cannery.AccountsTest do
 
   @moduletag :accounts_test
 
-  doctest Accounts, import: true
-
   describe "get_user_by_email/1" do
     test "does not return the user if the email does not exist" do
       refute Accounts.get_user_by_email("unknown@example.com")