ee cummings even more
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
shibao 2023-04-14 19:19:58 -04:00
parent 1276635a3e
commit c49140e7f5
13 changed files with 159 additions and 173 deletions

View File

@ -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

View File

@ -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

View File

@ -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()

View File

@ -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

View File

@ -12,21 +12,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 3.7.4\n"
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
msgstr ""
#: lib/memex_web/components/layouts/live.html.heex:43
#, elixir-autogen, elixir-format
msgid "Reconnecting..."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:36
#, elixir-autogen, elixir-format
msgid "Reset your password"
msgstr ""
#: lib/memex_web/live/context_live/show.html.heex:15
#: lib/memex_web/live/note_live/show.html.heex:15
#: lib/memex_web/live/pipeline_live/show.html.heex:23
@ -711,3 +701,13 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "log out"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format, fuzzy
msgid "confirm your account"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:35
#, elixir-autogen, elixir-format, fuzzy
msgid "reset your password"
msgstr ""

View File

@ -15,33 +15,6 @@ msgstr ""
msgid "Error"
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format
msgid "Invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:63
#, elixir-autogen, elixir-format
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
#, elixir-autogen, elixir-format
msgid "Sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_registration_controller.ex:11
#: lib/memex_web/controllers/user_registration_controller.ex:40
#, elixir-autogen, elixir-format
msgid "Sorry, this invite was not found or expired"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:54
#, elixir-autogen, elixir-format
msgid "User confirmation link is invalid or it has expired."
msgstr ""
#: lib/memex_web/controllers/user_auth.ex:266
#, elixir-autogen, elixir-format
msgid "You are not authorized to view this page."
@ -120,6 +93,8 @@ 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
#, elixir-autogen, elixir-format, fuzzy
msgid "sorry, this invite was not found or expired"
@ -150,3 +125,24 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "You must log in to access this page."
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format, fuzzy
msgid "invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:62
#, elixir-autogen, elixir-format, fuzzy
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
#, elixir-autogen, elixir-format, fuzzy
msgid "sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:53
#, elixir-autogen, elixir-format, fuzzy
msgid "user confirmation link is invalid or it has expired."
msgstr ""

View File

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Language: de\n"
#: lib/memex_web/controllers/user_confirmation_controller.ex:38
#: lib/memex_web/controllers/user_confirmation_controller.ex:37
#, elixir-autogen, elixir-format
msgid "%{email} confirmed successfully."
msgstr ""
@ -40,21 +40,6 @@ msgstr ""
msgid "%{user_email} deleted succesfully"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format
msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format
msgid "If your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:46
#, elixir-autogen, elixir-format
msgid "Password reset successfully."
msgstr ""
#: lib/memex_web/controllers/user_settings_html/edit.html.heex:130
#, elixir-autogen, elixir-format
msgid "are you sure you want to change your language?"
@ -156,3 +141,18 @@ msgstr ""
#, elixir-autogen, elixir-format, fuzzy
msgid "saving..."
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format, fuzzy
msgid "if your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format, fuzzy
msgid "if your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:45
#, elixir-autogen, elixir-format, fuzzy
msgid "password reset successfully."
msgstr ""

View File

@ -10,21 +10,11 @@
msgid ""
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
msgstr ""
#: lib/memex_web/components/layouts/live.html.heex:43
#, elixir-autogen, elixir-format
msgid "Reconnecting..."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:36
#, elixir-autogen, elixir-format
msgid "Reset your password"
msgstr ""
#: lib/memex_web/live/context_live/show.html.heex:15
#: lib/memex_web/live/note_live/show.html.heex:15
#: lib/memex_web/live/pipeline_live/show.html.heex:23
@ -709,3 +699,13 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "log out"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "confirm your account"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:35
#, elixir-autogen, elixir-format
msgid "reset your password"
msgstr ""

View File

@ -11,21 +11,11 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
msgstr ""
#: lib/memex_web/components/layouts/live.html.heex:43
#, elixir-autogen, elixir-format
msgid "Reconnecting..."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:36
#, elixir-autogen, elixir-format
msgid "Reset your password"
msgstr ""
#: lib/memex_web/live/context_live/show.html.heex:15
#: lib/memex_web/live/note_live/show.html.heex:15
#: lib/memex_web/live/pipeline_live/show.html.heex:23
@ -710,3 +700,13 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "log out"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format, fuzzy
msgid "confirm your account"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:35
#, elixir-autogen, elixir-format, fuzzy
msgid "reset your password"
msgstr ""

View File

@ -16,33 +16,6 @@ msgstr ""
msgid "Error"
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format
msgid "Invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:63
#, elixir-autogen, elixir-format
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
#, elixir-autogen, elixir-format
msgid "Sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_registration_controller.ex:11
#: lib/memex_web/controllers/user_registration_controller.ex:40
#, elixir-autogen, elixir-format
msgid "Sorry, this invite was not found or expired"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:54
#, elixir-autogen, elixir-format
msgid "User confirmation link is invalid or it has expired."
msgstr ""
#: lib/memex_web/controllers/user_auth.ex:266
#, elixir-autogen, elixir-format
msgid "You are not authorized to view this page."
@ -121,6 +94,8 @@ 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
#, elixir-autogen, elixir-format
msgid "sorry, this invite was not found or expired"
@ -151,3 +126,24 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "You must log in to access this page."
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format, fuzzy
msgid "invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:62
#, elixir-autogen, elixir-format, fuzzy
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
#, elixir-autogen, elixir-format, fuzzy
msgid "sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:53
#, elixir-autogen, elixir-format, fuzzy
msgid "user confirmation link is invalid or it has expired."
msgstr ""

View File

@ -11,7 +11,7 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/memex_web/controllers/user_confirmation_controller.ex:38
#: lib/memex_web/controllers/user_confirmation_controller.ex:37
#, elixir-autogen, elixir-format
msgid "%{email} confirmed successfully."
msgstr ""
@ -41,21 +41,6 @@ msgstr ""
msgid "%{user_email} deleted succesfully"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format
msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format
msgid "If your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:46
#, elixir-autogen, elixir-format
msgid "Password reset successfully."
msgstr ""
#: lib/memex_web/controllers/user_settings_html/edit.html.heex:130
#, elixir-autogen, elixir-format
msgid "are you sure you want to change your language?"
@ -157,3 +142,18 @@ msgstr ""
#, elixir-autogen, elixir-format, fuzzy
msgid "saving..."
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format, fuzzy
msgid "if your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format, fuzzy
msgid "if your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:45
#, elixir-autogen, elixir-format, fuzzy
msgid "password reset successfully."
msgstr ""

View File

@ -15,33 +15,6 @@ msgstr ""
msgid "Error"
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format
msgid "Invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:63
#, elixir-autogen, elixir-format
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
#, elixir-autogen, elixir-format
msgid "Sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_registration_controller.ex:11
#: lib/memex_web/controllers/user_registration_controller.ex:40
#, elixir-autogen, elixir-format
msgid "Sorry, this invite was not found or expired"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:54
#, elixir-autogen, elixir-format
msgid "User confirmation link is invalid or it has expired."
msgstr ""
#: lib/memex_web/controllers/user_auth.ex:266
#, elixir-autogen, elixir-format
msgid "You are not authorized to view this page."
@ -120,6 +93,8 @@ 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
#, elixir-autogen, elixir-format
msgid "sorry, this invite was not found or expired"
@ -150,3 +125,24 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "You must log in to access this page."
msgstr ""
#: lib/memex_web/controllers/user_session_controller.ex:17
#, elixir-autogen, elixir-format
msgid "invalid email or password"
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:62
#, elixir-autogen, elixir-format
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
#, elixir-autogen, elixir-format
msgid "sorry, public registration is disabled"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:53
#, elixir-autogen, elixir-format
msgid "user confirmation link is invalid or it has expired."
msgstr ""

View File

@ -10,7 +10,7 @@
msgid ""
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:38
#: lib/memex_web/controllers/user_confirmation_controller.ex:37
#, elixir-autogen, elixir-format
msgid "%{email} confirmed successfully."
msgstr ""
@ -40,21 +40,6 @@ msgstr ""
msgid "%{user_email} deleted succesfully"
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format
msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format
msgid "If your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:46
#, elixir-autogen, elixir-format
msgid "Password reset successfully."
msgstr ""
#: lib/memex_web/controllers/user_settings_html/edit.html.heex:130
#, elixir-autogen, elixir-format
msgid "are you sure you want to change your language?"
@ -156,3 +141,18 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "saving..."
msgstr ""
#: lib/memex_web/controllers/user_confirmation_controller.ex:23
#, elixir-autogen, elixir-format
msgid "if your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:24
#, elixir-autogen, elixir-format
msgid "if your email is in our system, you will receive instructions to reset your password shortly."
msgstr ""
#: lib/memex_web/controllers/user_reset_password_controller.ex:45
#, elixir-autogen, elixir-format
msgid "password reset successfully."
msgstr ""