From 3e296080f549704f74263253ed53b9cb4214614b Mon Sep 17 00:00:00 2001 From: shibao Date: Sun, 4 Jun 2023 00:11:09 -0400 Subject: [PATCH] fix user registration controller --- changelog.md | 1 + .../controllers/user_registration_controller.ex | 5 +++-- priv/gettext/de/LC_MESSAGES/default.po | 2 +- priv/gettext/de/LC_MESSAGES/errors.po | 10 +++++----- priv/gettext/de/LC_MESSAGES/prompts.po | 2 +- priv/gettext/default.pot | 2 +- priv/gettext/en/LC_MESSAGES/default.po | 2 +- priv/gettext/en/LC_MESSAGES/errors.po | 10 +++++----- priv/gettext/en/LC_MESSAGES/prompts.po | 2 +- priv/gettext/errors.pot | 10 +++++----- priv/gettext/prompts.pot | 2 +- 11 files changed, 25 insertions(+), 23 deletions(-) diff --git a/changelog.md b/changelog.md index 45053f1..5e59fe9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,5 @@ # v0.1.12 +- Code quality fixes - Fix error/404 pages not rendering properly # v0.1.11 diff --git a/lib/memex_web/controllers/user_registration_controller.ex b/lib/memex_web/controllers/user_registration_controller.ex index ea1fb30..9d427a6 100644 --- a/lib/memex_web/controllers/user_registration_controller.ex +++ b/lib/memex_web/controllers/user_registration_controller.ex @@ -1,6 +1,7 @@ defmodule MemexWeb.UserRegistrationController do use MemexWeb, :controller import MemexWeb.Gettext + alias Ecto.Changeset alias Memex.{Accounts, Accounts.Invites} def new(conn, %{"invite" => invite_token}) do @@ -69,8 +70,8 @@ defmodule MemexWeb.UserRegistrationController do |> put_flash(:error, dgettext("errors", "sorry, this invite was not found or expired")) |> redirect(to: ~p"/") - {:error, %Ecto.Changeset{} = changeset} -> - conn |> render("new.html", changeset: changeset, invite_token: invite_token) + {:error, %Changeset{} = changeset} -> + conn |> render(:new, changeset: changeset, invite_token: invite_token) end end end diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 453da5e..d2c7bb0 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -228,7 +228,7 @@ msgstr "" msgid "public signups" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:31 +#: lib/memex_web/controllers/user_registration_controller.ex:32 #, elixir-autogen, elixir-format msgid "register" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po index b9a0125..e793d4a 100644 --- a/priv/gettext/de/LC_MESSAGES/errors.po +++ b/priv/gettext/de/LC_MESSAGES/errors.po @@ -93,9 +93,9 @@ msgstr "" msgid "oops, something went wrong! please check the errors below." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:11 -#: lib/memex_web/controllers/user_registration_controller.ex:40 -#: lib/memex_web/controllers/user_registration_controller.ex:69 +#: lib/memex_web/controllers/user_registration_controller.ex:12 +#: lib/memex_web/controllers/user_registration_controller.ex:41 +#: lib/memex_web/controllers/user_registration_controller.ex:70 #, elixir-autogen, elixir-format, fuzzy msgid "sorry, this invite was not found or expired" msgstr "" @@ -136,8 +136,8 @@ msgstr "" msgid "reset password link is invalid or it has expired." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:21 -#: lib/memex_web/controllers/user_registration_controller.ex:50 +#: lib/memex_web/controllers/user_registration_controller.ex:22 +#: lib/memex_web/controllers/user_registration_controller.ex:51 #, elixir-autogen, elixir-format, fuzzy msgid "sorry, public registration is disabled" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 2829689..d637cfa 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -106,7 +106,7 @@ msgstr "" msgid "copied to clipboard" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:64 +#: lib/memex_web/controllers/user_registration_controller.ex:65 #, elixir-autogen, elixir-format, fuzzy msgid "please check your email to verify your account" msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 833af8b..30d6122 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -226,7 +226,7 @@ msgstr "" msgid "public signups" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:31 +#: lib/memex_web/controllers/user_registration_controller.ex:32 #, elixir-autogen, elixir-format msgid "register" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index a69306f..5e9759a 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -227,7 +227,7 @@ msgstr "" msgid "public signups" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:31 +#: lib/memex_web/controllers/user_registration_controller.ex:32 #, elixir-autogen, elixir-format msgid "register" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index 3d733aa..226bd09 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -94,9 +94,9 @@ msgstr "" msgid "oops, something went wrong! please check the errors below." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:11 -#: lib/memex_web/controllers/user_registration_controller.ex:40 -#: lib/memex_web/controllers/user_registration_controller.ex:69 +#: lib/memex_web/controllers/user_registration_controller.ex:12 +#: lib/memex_web/controllers/user_registration_controller.ex:41 +#: lib/memex_web/controllers/user_registration_controller.ex:70 #, elixir-autogen, elixir-format msgid "sorry, this invite was not found or expired" msgstr "" @@ -137,8 +137,8 @@ msgstr "" msgid "reset password link is invalid or it has expired." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:21 -#: lib/memex_web/controllers/user_registration_controller.ex:50 +#: lib/memex_web/controllers/user_registration_controller.ex:22 +#: lib/memex_web/controllers/user_registration_controller.ex:51 #, elixir-autogen, elixir-format, fuzzy msgid "sorry, public registration is disabled" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index 91c3f69..e39cc44 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -107,7 +107,7 @@ msgstr "" msgid "copied to clipboard" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:64 +#: lib/memex_web/controllers/user_registration_controller.ex:65 #, elixir-autogen, elixir-format msgid "please check your email to verify your account" msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index f3dfd3c..0672411 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -93,9 +93,9 @@ msgstr "" msgid "oops, something went wrong! please check the errors below." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:11 -#: lib/memex_web/controllers/user_registration_controller.ex:40 -#: lib/memex_web/controllers/user_registration_controller.ex:69 +#: lib/memex_web/controllers/user_registration_controller.ex:12 +#: lib/memex_web/controllers/user_registration_controller.ex:41 +#: lib/memex_web/controllers/user_registration_controller.ex:70 #, elixir-autogen, elixir-format msgid "sorry, this invite was not found or expired" msgstr "" @@ -136,8 +136,8 @@ msgstr "" msgid "reset password link is invalid or it has expired." msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:21 -#: lib/memex_web/controllers/user_registration_controller.ex:50 +#: lib/memex_web/controllers/user_registration_controller.ex:22 +#: lib/memex_web/controllers/user_registration_controller.ex:51 #, elixir-autogen, elixir-format msgid "sorry, public registration is disabled" msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index a6650af..7536d86 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -106,7 +106,7 @@ msgstr "" msgid "copied to clipboard" msgstr "" -#: lib/memex_web/controllers/user_registration_controller.ex:64 +#: lib/memex_web/controllers/user_registration_controller.ex:65 #, elixir-autogen, elixir-format msgid "please check your email to verify your account" msgstr ""