shibao/cannery
shibao/cannery
1
2
Fork 1
Code Issues 16 Pull Requests Projects 1 Releases 36 Wiki Activity

Compare commits

base: shibao:07ff796553a54d12cc163e649200af5dcef6fa87
Branches Tags
shibao:dev
shibao:stable
shibao:weblate
shibao:0.9.12
shibao:0.9.11
shibao:0.9.10
shibao:0.9.9
shibao:0.9.8
shibao:0.9.7
shibao:0.9.6
shibao:0.9.5
shibao:0.9.4
shibao:0.9.3
shibao:0.9.2
shibao:0.9.1
shibao:0.9.0
shibao:0.8.6
shibao:0.8.5
shibao:0.8.4
shibao:0.8.3
shibao:0.8.2
shibao:0.8.1
shibao:0.8.0
shibao:0.7.1
shibao:0.7.0
shibao:0.6.0
shibao:0.5.5
shibao:0.5.4
shibao:0.5.3
shibao:0.5.2
shibao:0.5.1
shibao:0.5.0
shibao:0.4.1
shibao:0.4.0
shibao:0.3.0
shibao:0.2.3
shibao:0.2.2
shibao:0.2.1
shibao:0.2.0
shibao:0.1.0
..
compare: shibao:9c4a32896f2329d72a7d9e5d4828aa4fe6151c95
Branches Tags
shibao:dev
shibao:stable
shibao:weblate
shibao:0.9.12
shibao:0.9.11
shibao:0.9.10
shibao:0.9.9
shibao:0.9.8
shibao:0.9.7
shibao:0.9.6
shibao:0.9.5
shibao:0.9.4
shibao:0.9.3
shibao:0.9.2
shibao:0.9.1
shibao:0.9.0
shibao:0.8.6
shibao:0.8.5
shibao:0.8.4
shibao:0.8.3
shibao:0.8.2
shibao:0.8.1
shibao:0.8.0
shibao:0.7.1
shibao:0.7.0
shibao:0.6.0
shibao:0.5.5
shibao:0.5.4
shibao:0.5.3
shibao:0.5.2
shibao:0.5.1
shibao:0.5.0
shibao:0.4.1
shibao:0.4.0
shibao:0.3.0
shibao:0.2.3
shibao:0.2.2
shibao:0.2.1
shibao:0.2.0
shibao:0.1.0

No commits in common. "07ff796553a54d12cc163e649200af5dcef6fa87" and "9c4a32896f2329d72a7d9e5d4828aa4fe6151c95" have entirely different histories.
07ff796553 ... 9c4a32896f

34 changed files with 261 additions and 311 deletions
Show Stats Expand all files Collapse all files

4
CHANGELOG.md
View File

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

172
lib/cannery/accounts.ex
View File

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

2
lib/cannery_web/templates/user_confirmation/new.html.heex
View File

@ -9,7 +9,7 @@
action={Routes.user_confirmation_path(@conn, :create)} 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" 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, gettext("Email"), class: "title text-lg text-primary-600") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= submit(dgettext("actions", "Resend confirmation instructions"), <%= submit(dgettext("actions", "Resend confirmation instructions"),

4
lib/cannery_web/templates/user_registration/new.html.heex
View File

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

4
lib/cannery_web/templates/user_reset_password/edit.html.heex
View File

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

2
lib/cannery_web/templates/user_reset_password/new.html.heex
View File

@ -9,7 +9,7 @@
action={Routes.user_reset_password_path(@conn, :create)} 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" 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, gettext("Email"), class: "title text-lg text-primary-600") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= submit(dgettext("actions", "Send instructions to reset password"), <%= submit(dgettext("actions", "Send instructions to reset password"),

4
lib/cannery_web/templates/user_session/new.html.heex
View File

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

34
lib/cannery_web/templates/user_settings/edit.html.heex
View File

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

2
mix.exs
View File

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

14
priv/gettext/actions.pot
View File

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

14
priv/gettext/de/LC_MESSAGES/actions.po
View File

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

33
priv/gettext/de/LC_MESSAGES/default.po
View File

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

6
priv/gettext/de/LC_MESSAGES/errors.po
View File

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

4
priv/gettext/de/LC_MESSAGES/prompts.po
View File

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

33
priv/gettext/default.pot
View File

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

14
priv/gettext/en/LC_MESSAGES/actions.po
View File

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

33
priv/gettext/en/LC_MESSAGES/default.po
View File

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

6
priv/gettext/en/LC_MESSAGES/errors.po
View File

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

4
priv/gettext/en/LC_MESSAGES/prompts.po
View File

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

6
priv/gettext/errors.pot
View File

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

14
priv/gettext/es/LC_MESSAGES/actions.po
View File

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

33
priv/gettext/es/LC_MESSAGES/default.po
View File

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

6
priv/gettext/es/LC_MESSAGES/errors.po
View File

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

4
priv/gettext/es/LC_MESSAGES/prompts.po
View File

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

14
priv/gettext/fr/LC_MESSAGES/actions.po
View File

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

33
priv/gettext/fr/LC_MESSAGES/default.po
View File

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

6
priv/gettext/fr/LC_MESSAGES/errors.po
View File

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

4
priv/gettext/fr/LC_MESSAGES/prompts.po
View File

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

14
priv/gettext/ga/LC_MESSAGES/actions.po
View File

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

33
priv/gettext/ga/LC_MESSAGES/default.po
View File

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

6
priv/gettext/ga/LC_MESSAGES/errors.po
View File

@ -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_registration/new.html.heex:13
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:14 #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14
#: lib/cannery_web/templates/user_settings/edit.html.heex:22 #: lib/cannery_web/templates/user_settings/edit.html.heex:23
#: lib/cannery_web/templates/user_settings/edit.html.heex:64 #: lib/cannery_web/templates/user_settings/edit.html.heex:67
#: lib/cannery_web/templates/user_settings/edit.html.heex:118 #: lib/cannery_web/templates/user_settings/edit.html.heex:123
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Oops, something went wrong! Please check the errors below." msgid "Oops, something went wrong! Please check the errors below."
msgstr "" msgstr ""

4
priv/gettext/ga/LC_MESSAGES/prompts.po
View File

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

4
priv/gettext/prompts.pot
View File

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

2
test/cannery/accounts_test.exs
View File

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