This commit is contained in:
		| @@ -5,7 +5,7 @@ defmodule MemexWeb.UserConfirmationController do | ||||
|   alias Memex.Accounts | ||||
|  | ||||
|   def new(conn, _params) do | ||||
|     render(conn, :new, page_title: gettext("Confirm your account")) | ||||
|     render(conn, :new, page_title: gettext("confirm your account")) | ||||
|   end | ||||
|  | ||||
|   def create(conn, %{"user" => %{"email" => email}}) do | ||||
| @@ -22,8 +22,7 @@ defmodule MemexWeb.UserConfirmationController do | ||||
|       :info, | ||||
|       dgettext( | ||||
|         "prompts", | ||||
|         "If your email is in our system and it has not been confirmed yet, " <> | ||||
|           "you will receive an email with instructions shortly." | ||||
|         "if your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." | ||||
|       ) | ||||
|     ) | ||||
|     |> redirect(to: "/") | ||||
| @@ -51,7 +50,7 @@ defmodule MemexWeb.UserConfirmationController do | ||||
|             conn | ||||
|             |> put_flash( | ||||
|               :error, | ||||
|               dgettext("errors", "User confirmation link is invalid or it has expired.") | ||||
|               dgettext("errors", "user confirmation link is invalid or it has expired.") | ||||
|             ) | ||||
|             |> redirect(to: "/") | ||||
|         end | ||||
|   | ||||
| @@ -8,7 +8,7 @@ defmodule MemexWeb.UserRegistrationController do | ||||
|       conn |> render_new(invite_token) | ||||
|     else | ||||
|       conn | ||||
|       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired")) | ||||
|       |> put_flash(:error, dgettext("errors", "sorry, this invite was not found or expired")) | ||||
|       |> redirect(to: ~p"/") | ||||
|     end | ||||
|   end | ||||
| @@ -18,7 +18,7 @@ defmodule MemexWeb.UserRegistrationController do | ||||
|       conn |> render_new() | ||||
|     else | ||||
|       conn | ||||
|       |> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled")) | ||||
|       |> put_flash(:error, dgettext("errors", "sorry, public registration is disabled")) | ||||
|       |> redirect(to: ~p"/") | ||||
|     end | ||||
|   end | ||||
| @@ -37,7 +37,7 @@ defmodule MemexWeb.UserRegistrationController do | ||||
|       conn |> create_user(attrs, invite_token) | ||||
|     else | ||||
|       conn | ||||
|       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired")) | ||||
|       |> put_flash(:error, dgettext("errors", "sorry, this invite was not found or expired")) | ||||
|       |> redirect(to: ~p"/") | ||||
|     end | ||||
|   end | ||||
| @@ -47,7 +47,7 @@ defmodule MemexWeb.UserRegistrationController do | ||||
|       conn |> create_user(attrs) | ||||
|     else | ||||
|       conn | ||||
|       |> put_flash(:error, dgettext("errors", "Sorry, public registration is disabled")) | ||||
|       |> put_flash(:error, dgettext("errors", "sorry, public registration is disabled")) | ||||
|       |> redirect(to: ~p"/") | ||||
|     end | ||||
|   end | ||||
|   | ||||
| @@ -23,8 +23,7 @@ defmodule MemexWeb.UserResetPasswordController do | ||||
|       :info, | ||||
|       dgettext( | ||||
|         "prompts", | ||||
|         "If your email is in our system, you will receive instructions to " <> | ||||
|           "reset your password shortly." | ||||
|         "if your email is in our system, you will receive instructions to reset your password shortly." | ||||
|       ) | ||||
|     ) | ||||
|     |> redirect(to: "/") | ||||
| @@ -33,7 +32,7 @@ defmodule MemexWeb.UserResetPasswordController do | ||||
|   def edit(conn, _params) do | ||||
|     render(conn, :edit, | ||||
|       changeset: Accounts.change_user_password(conn.assigns.user), | ||||
|       page_title: gettext("Reset your password") | ||||
|       page_title: gettext("reset your password") | ||||
|     ) | ||||
|   end | ||||
|  | ||||
| @@ -43,7 +42,7 @@ defmodule MemexWeb.UserResetPasswordController do | ||||
|     case Accounts.reset_user_password(conn.assigns.user, user_params) do | ||||
|       {:ok, _} -> | ||||
|         conn | ||||
|         |> put_flash(:info, dgettext("prompts", "Password reset successfully.")) | ||||
|         |> put_flash(:info, dgettext("prompts", "password reset successfully.")) | ||||
|         |> redirect(to: ~p"/users/log_in") | ||||
|  | ||||
|       {:error, changeset} -> | ||||
| @@ -60,7 +59,7 @@ defmodule MemexWeb.UserResetPasswordController do | ||||
|       conn | ||||
|       |> put_flash( | ||||
|         :error, | ||||
|         dgettext("errors", "Reset password link is invalid or it has expired.") | ||||
|         dgettext("errors", "reset password link is invalid or it has expired.") | ||||
|       ) | ||||
|       |> redirect(to: "/") | ||||
|       |> halt() | ||||
|   | ||||
| @@ -14,7 +14,7 @@ defmodule MemexWeb.UserSessionController do | ||||
|     if user = Accounts.get_user_by_email_and_password(email, password) do | ||||
|       UserAuth.log_in_user(conn, user, user_params) | ||||
|     else | ||||
|       render(conn, :new, error_message: dgettext("errors", "Invalid email or password")) | ||||
|       render(conn, :new, error_message: dgettext("errors", "invalid email or password")) | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user