Compare commits
No commits in common. "a0389db9efe601640b7218d1bcd5e1a12baf817c" and "4791a2849ebcb76cd9baff6ec73939beee5af632" have entirely different histories.
a0389db9ef
...
4791a2849e
@ -1,11 +1,3 @@
|
||||
# v0.5.2
|
||||
- Add "Added on" date to ammo groups
|
||||
- Add "Added on" date to ammo types
|
||||
- Add "Registered on" date to user information
|
||||
- Add language in user settings. The `LOCALE` environment variable will continue
|
||||
to set the default locale for the application.
|
||||
- Add involvement links to home page
|
||||
|
||||
# v0.5.1
|
||||
- Add French translation: Thank you [duponin](https://udongein.xyz/users/duponin)!
|
||||
|
||||
|
||||
@ -63,7 +63,8 @@ And as always, thank you!
|
||||
[`phx_gen_auth`](https://hexdocs.pm/phx_gen_auth/).
|
||||
- `Dockerfile` and example `docker-compose.yml`
|
||||
- Automatic migrations in `MIX_ENV=prod` or Docker image
|
||||
- JS linting with [standard.js](https://standardjs.com)
|
||||
- JS linting with [standard.js](https://standardjs.com), HEEx linting with
|
||||
[heex_formatter](https://github.com/feliperenan/heex_formatter)
|
||||
|
||||
## Docs
|
||||
|
||||
@ -108,7 +109,7 @@ In `dev` mode, Cannery will listen for these environment variables at runtime.
|
||||
Defaults to `false`.
|
||||
- `POOL_SIZE`: Controls the pool size to use with PostgreSQL. Defaults to `10`.
|
||||
- `REGISTRATION`: Controls if user sign-up should be invite only or set to public. Set to `public` to enable public registration. Defaults to `invite`.
|
||||
- `LOCALE`: Sets a custom default locale. Defaults to `en_US`.
|
||||
- `LOCALE`: Sets a custom locale. Defaults to `en_US`.
|
||||
- Available options: `en_US`, `de`, and `fr`
|
||||
|
||||
## `MIX_ENV=test`
|
||||
|
||||
@ -63,7 +63,7 @@ You can use the following environment variables to configure Cannery in
|
||||
with `docker run -it shibaobun/cannery mix phx.gen.secret` and set for server to start.
|
||||
- `REGISTRATION`: Controls if user sign-up should be invite only or set to
|
||||
public. Set to `public` to enable public registration. Defaults to `invite`.
|
||||
- `LOCALE`: Sets a custom default locale. Defaults to `en_US`
|
||||
- `LOCALE`: Sets a custom locale. Defaults to `en_US`
|
||||
- Available options: `en_US`, `de`, and `fr`
|
||||
- `SMTP_HOST`: The url for your SMTP email provider. Must be set
|
||||
- `SMTP_PORT`: The port for your SMTP relay. Defaults to `587`.
|
||||
|
||||
41
assets/package-lock.json
generated
41
assets/package-lock.json
generated
@ -4,7 +4,6 @@
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "assets",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "^5.15.4",
|
||||
@ -41,7 +40,7 @@
|
||||
}
|
||||
},
|
||||
"../deps/phoenix": {
|
||||
"version": "1.6.7",
|
||||
"version": "1.6.6",
|
||||
"integrity": "sha512-KLNHVlrZH8UAoEzeCS1XBI9z5juWz0gZ/+No7j5p/byVINnd+del9H5vtBMzQgZa3ZcUjVVZcQR8bKdnH/FmMg==",
|
||||
"license": "MIT"
|
||||
},
|
||||
@ -50,7 +49,7 @@
|
||||
"integrity": "sha512-zv7PIZk0MPkF0ax8n465Q6w86+sGAy5cTem6KcbkUbdgxGc0y3WZmzkM2bSlYdSGbLEZfjXxos1G72xXsha6xA=="
|
||||
},
|
||||
"../deps/phoenix_live_view": {
|
||||
"version": "0.17.9",
|
||||
"version": "0.17.6",
|
||||
"integrity": "sha512-2C/Gq+QaBp4h/ZVHhzHqIoVsVShJfZkGAHlR4dtjXM5yZA313sghfaf8a48T/xLHF3j/ObPR/xajmNO856sCsw==",
|
||||
"license": "MIT"
|
||||
},
|
||||
@ -2618,9 +2617,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/async": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
|
||||
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
|
||||
"version": "2.6.3",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
|
||||
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"lodash": "^4.17.14"
|
||||
@ -7607,9 +7606,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/minimist": {
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/minimist-options": {
|
||||
@ -7814,9 +7813,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/node-forge": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
|
||||
"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
|
||||
"integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">= 6.13.0"
|
||||
@ -14690,9 +14689,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"async": {
|
||||
"version": "2.6.4",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
|
||||
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
|
||||
"version": "2.6.3",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
|
||||
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"lodash": "^4.17.14"
|
||||
@ -18454,9 +18453,9 @@
|
||||
}
|
||||
},
|
||||
"minimist": {
|
||||
"version": "1.2.6",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
|
||||
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
|
||||
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
|
||||
"dev": true
|
||||
},
|
||||
"minimist-options": {
|
||||
@ -18614,9 +18613,9 @@
|
||||
}
|
||||
},
|
||||
"node-forge": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
|
||||
"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
|
||||
"integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
|
||||
"dev": true
|
||||
},
|
||||
"node-gyp": {
|
||||
|
||||
@ -269,35 +269,6 @@ defmodule Cannery.Accounts do
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns an `%Changeset{}` for changing the user locale.
|
||||
|
||||
## Examples
|
||||
|
||||
iex> change_user_locale(user)
|
||||
%Changeset{data: %User{}}
|
||||
|
||||
"""
|
||||
@spec change_user_locale(User.t()) :: Changeset.t(User.t())
|
||||
def change_user_locale(%{locale: locale} = user), do: User.locale_changeset(user, locale)
|
||||
|
||||
@doc """
|
||||
Updates the user locale.
|
||||
|
||||
## Examples
|
||||
|
||||
iex> update_user_locale(user, "valid locale")
|
||||
{:ok, %User{}}
|
||||
|
||||
iex> update_user_password(user, "invalid locale")
|
||||
{:error, %Changeset{}}
|
||||
|
||||
"""
|
||||
@spec update_user_locale(User.t(), locale :: String.t()) ::
|
||||
{:ok, User.t()} | {:error, Changeset.t(User.t())}
|
||||
def update_user_locale(user, locale),
|
||||
do: user |> User.locale_changeset(locale) |> Repo.update()
|
||||
|
||||
@doc """
|
||||
Deletes a user. must be performed by an admin or the same user!
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@ defmodule Cannery.Accounts.User do
|
||||
field :hashed_password, :string
|
||||
field :confirmed_at, :naive_datetime
|
||||
field :role, Ecto.Enum, values: [:admin, :user], default: :user
|
||||
field :locale, :string
|
||||
|
||||
has_many :invites, Invite, on_delete: :delete_all
|
||||
|
||||
@ -32,7 +31,6 @@ defmodule Cannery.Accounts.User do
|
||||
hashed_password: String.t(),
|
||||
confirmed_at: NaiveDateTime.t(),
|
||||
role: atom(),
|
||||
locale: String.t() | nil,
|
||||
invites: [Invite.t()],
|
||||
inserted_at: NaiveDateTime.t(),
|
||||
updated_at: NaiveDateTime.t()
|
||||
@ -62,7 +60,7 @@ defmodule Cannery.Accounts.User do
|
||||
Changeset.t(t() | new_user())
|
||||
def registration_changeset(user, attrs, opts \\ []) do
|
||||
user
|
||||
|> cast(attrs, [:email, :password, :role, :locale])
|
||||
|> cast(attrs, [:email, :password, :role])
|
||||
|> validate_email()
|
||||
|> validate_password(opts)
|
||||
end
|
||||
@ -187,14 +185,4 @@ defmodule Cannery.Accounts.User do
|
||||
do: changeset,
|
||||
else: changeset |> add_error(:current_password, dgettext("errors", "is not valid"))
|
||||
end
|
||||
|
||||
@doc """
|
||||
A changeset for changing the user's locale
|
||||
"""
|
||||
@spec locale_changeset(t() | Changeset.t(t()), locale :: String.t() | nil) :: Changeset.t(t())
|
||||
def locale_changeset(user_or_changeset, locale) do
|
||||
user_or_changeset
|
||||
|> cast(%{"locale" => locale}, [:locale])
|
||||
|> validate_required(:locale)
|
||||
end
|
||||
end
|
||||
|
||||
@ -47,7 +47,6 @@ defmodule CanneryWeb do
|
||||
use Phoenix.LiveView,
|
||||
layout: {CanneryWeb.LayoutView, "live.html"}
|
||||
|
||||
on_mount CanneryWeb.InitAssigns
|
||||
unquote(view_helpers())
|
||||
end
|
||||
end
|
||||
|
||||
@ -37,11 +37,6 @@ defmodule CanneryWeb.Components.AmmoGroupCard do
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<span class="rounded-lg title text-lg">
|
||||
<%= gettext("Added on:") %>
|
||||
<%= @ammo_group.inserted_at |> display_datetime() %>
|
||||
</span>
|
||||
|
||||
<%= if @ammo_group.price_paid do %>
|
||||
<span class="rounded-lg title text-lg">
|
||||
<%= gettext("Price paid:") %>
|
||||
|
||||
@ -18,18 +18,12 @@ defmodule CanneryWeb.Components.UserCard do
|
||||
</h1>
|
||||
|
||||
<h3 class="px-4 py-2 rounded-lg title text-lg">
|
||||
<p>
|
||||
<%= if @user.confirmed_at |> is_nil() do %>
|
||||
Email unconfirmed
|
||||
<% else %>
|
||||
User was confirmed at <%= @user.confirmed_at |> display_datetime() %>
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<%= gettext("User registered on") %>
|
||||
<%= @user.inserted_at |> display_datetime() %>
|
||||
</p>
|
||||
<%= if @user.confirmed_at |> is_nil() do %>
|
||||
Email unconfirmed
|
||||
<% else %>
|
||||
<p>User was confirmed at</p>
|
||||
<%= @user.confirmed_at |> display_datetime() %>
|
||||
<% end %>
|
||||
</h3>
|
||||
|
||||
<%= if @inner_block do %>
|
||||
|
||||
@ -10,11 +10,10 @@ defmodule CanneryWeb.UserSettingsController do
|
||||
render(conn, "edit.html", page_title: gettext("Settings"))
|
||||
end
|
||||
|
||||
def update(%{assigns: %{current_user: user}} = conn, %{
|
||||
"action" => "update_email",
|
||||
"current_password" => password,
|
||||
"user" => user_params
|
||||
}) do
|
||||
def update(conn, %{"action" => "update_email"} = params) do
|
||||
%{"current_password" => password, "user" => user_params} = params
|
||||
user = conn.assigns.current_user
|
||||
|
||||
case Accounts.apply_user_email(user, password, user_params) do
|
||||
{:ok, applied_user} ->
|
||||
Accounts.deliver_update_email_instructions(
|
||||
@ -34,15 +33,14 @@ defmodule CanneryWeb.UserSettingsController do
|
||||
|> redirect(to: Routes.user_settings_path(conn, :edit))
|
||||
|
||||
{:error, changeset} ->
|
||||
conn |> render("edit.html", email_changeset: changeset)
|
||||
render(conn, "edit.html", email_changeset: changeset)
|
||||
end
|
||||
end
|
||||
|
||||
def update(%{assigns: %{current_user: user}} = conn, %{
|
||||
"action" => "update_password",
|
||||
"current_password" => password,
|
||||
"user" => user_params
|
||||
}) do
|
||||
def update(conn, %{"action" => "update_password"} = params) do
|
||||
%{"current_password" => password, "user" => user_params} = params
|
||||
user = conn.assigns.current_user
|
||||
|
||||
case Accounts.update_user_password(user, password, user_params) do
|
||||
{:ok, user} ->
|
||||
conn
|
||||
@ -51,27 +49,12 @@ defmodule CanneryWeb.UserSettingsController do
|
||||
|> UserAuth.log_in_user(user)
|
||||
|
||||
{:error, changeset} ->
|
||||
conn |> render("edit.html", password_changeset: changeset)
|
||||
render(conn, "edit.html", password_changeset: changeset)
|
||||
end
|
||||
end
|
||||
|
||||
def update(
|
||||
%{assigns: %{current_user: user}} = conn,
|
||||
%{"action" => "update_locale", "user" => %{"locale" => locale}}
|
||||
) do
|
||||
case Accounts.update_user_locale(user, locale) do
|
||||
{:ok, _user} ->
|
||||
conn
|
||||
|> put_flash(:info, dgettext("prompts", "Language updated successfully."))
|
||||
|> redirect(to: Routes.user_settings_path(conn, :edit))
|
||||
|
||||
{:error, changeset} ->
|
||||
conn |> render("edit.html", locale_changeset: changeset)
|
||||
end
|
||||
end
|
||||
|
||||
def confirm_email(%{assigns: %{current_user: user}} = conn, %{"token" => token}) do
|
||||
case Accounts.update_user_email(user, token) do
|
||||
def confirm_email(conn, %{"token" => token}) do
|
||||
case Accounts.update_user_email(conn.assigns.current_user, token) do
|
||||
:ok ->
|
||||
conn
|
||||
|> put_flash(:info, dgettext("prompts", "Email changed successfully."))
|
||||
@ -101,10 +84,11 @@ defmodule CanneryWeb.UserSettingsController do
|
||||
end
|
||||
end
|
||||
|
||||
defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do
|
||||
defp assign_email_and_password_changesets(conn, _opts) do
|
||||
user = conn.assigns.current_user
|
||||
|
||||
conn
|
||||
|> assign(:email_changeset, Accounts.change_user_email(user))
|
||||
|> assign(:password_changeset, Accounts.change_user_password(user))
|
||||
|> assign(:locale_changeset, Accounts.change_user_locale(user))
|
||||
end
|
||||
end
|
||||
|
||||
@ -8,8 +8,8 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
|
||||
alias CanneryWeb.Endpoint
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket) do
|
||||
{:ok, socket |> display_ammo_groups()}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session) |> display_ammo_groups()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@ -83,7 +83,6 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
|
||||
%{label: gettext("% left"), key: "remaining"},
|
||||
%{label: gettext("Range"), key: "range"},
|
||||
%{label: gettext("Container"), key: "container"},
|
||||
%{label: gettext("Added on"), key: "added_on"},
|
||||
%{label: nil, key: "actions", sortable: false}
|
||||
]
|
||||
|
||||
@ -117,15 +116,6 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
|
||||
defp get_value_for_key("price_paid", %{price_paid: price_paid}),
|
||||
do: gettext("$%{amount}", amount: price_paid |> :erlang.float_to_binary(decimals: 2))
|
||||
|
||||
defp get_value_for_key("added_on", %{inserted_at: inserted_at}) do
|
||||
assigns = %{inserted_at: inserted_at}
|
||||
|
||||
{inserted_at,
|
||||
~H"""
|
||||
<%= @inserted_at |> display_datetime() %>
|
||||
"""}
|
||||
end
|
||||
|
||||
defp get_value_for_key("range", %{staged: staged} = ammo_group) do
|
||||
assigns = %{ammo_group: ammo_group}
|
||||
|
||||
|
||||
@ -10,7 +10,9 @@ defmodule CanneryWeb.AmmoGroupLive.Show do
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(
|
||||
|
||||
@ -26,11 +26,6 @@
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<span class="rounded-lg title text-lg">
|
||||
<%= gettext("Added on:") %>
|
||||
<%= @ammo_group.inserted_at |> display_datetime() %>
|
||||
</span>
|
||||
|
||||
<%= if @ammo_group.price_paid do %>
|
||||
<span class="rounded-lg title text-lg">
|
||||
<%= gettext("Original cost:") %>
|
||||
|
||||
@ -9,8 +9,8 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
|
||||
alias CanneryWeb.Endpoint
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket) do
|
||||
{:ok, socket |> list_ammo_types()}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session) |> list_ammo_types()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
|
||||
@ -9,7 +9,9 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
|
||||
alias CanneryWeb.Endpoint
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do
|
||||
|
||||
@ -87,14 +87,6 @@
|
||||
<%= @ammo_type |> Ammo.get_used_count_for_ammo_type(@current_user) %>
|
||||
</span>
|
||||
|
||||
<h3 class="title text-lg">
|
||||
<%= gettext("Added on:") %>
|
||||
</h3>
|
||||
|
||||
<span class="text-primary-600">
|
||||
<%= @ammo_type.inserted_at |> display_datetime() %>
|
||||
</span>
|
||||
|
||||
<%= if @avg_cost_per_round do %>
|
||||
<h3 class="title text-lg">
|
||||
<%= gettext("Average Price paid") %>:
|
||||
|
||||
@ -10,7 +10,9 @@ defmodule CanneryWeb.ContainerLive.Index do
|
||||
alias Ecto.Changeset
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
|
||||
|
||||
@ -11,7 +11,9 @@ defmodule CanneryWeb.ContainerLive.Show do
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session)}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(
|
||||
|
||||
@ -7,9 +7,14 @@ defmodule CanneryWeb.HomeLive do
|
||||
alias Cannery.Accounts
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket) do
|
||||
def mount(_params, session, socket) do
|
||||
admins = Accounts.list_users_by_role(:admin)
|
||||
socket = socket |> assign(page_title: "Home", query: "", results: %{}, admins: admins)
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign_defaults(session)
|
||||
|> assign(page_title: "Home", query: "", results: %{}, admins: admins)
|
||||
|
||||
{:ok, socket}
|
||||
end
|
||||
|
||||
@ -126,47 +131,11 @@ defmodule CanneryWeb.HomeLive do
|
||||
to: "https://gitea.bubbletea.dev/shibao/cannery/src/branch/stable/CHANGELOG.md",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do %>
|
||||
<p>0.5.2</p>
|
||||
<p>0.5.1</p>
|
||||
<i class="fas fa-md fa-info-circle"></i>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<hr class="hr" />
|
||||
|
||||
<ul class="flex flex-col space-y-2 text-center justify-center">
|
||||
<h2 class="title text-primary-600 text-lg">
|
||||
<%= gettext("Get involved!") %>
|
||||
</h2>
|
||||
|
||||
<li class="flex flex-col justify-center space-x-2">
|
||||
<%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
|
||||
to: "https://gitea.bubbletea.dev/shibao/cannery",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do %>
|
||||
<p><%= gettext("View the source code") %></p>
|
||||
<i class="fas fa-md fa-code"></i>
|
||||
<% end %>
|
||||
</li>
|
||||
<li class="flex flex-col justify-center space-x-2">
|
||||
<%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
|
||||
to: "https://weblate.bubbletea.dev/engage/cannery",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do %>
|
||||
<p><%= gettext("Help translate") %></p>
|
||||
<i class="fas fa-md fa-language"></i>
|
||||
<% end %>
|
||||
</li>
|
||||
<li class="flex flex-col justify-center space-x-2">
|
||||
<%= link class: "flex flex-row justify-center items-center space-x-2 hover:underline",
|
||||
to: "https://gitea.bubbletea.dev/shibao/cannery/issues/new",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer" do %>
|
||||
<p><%= gettext("Report bugs or request features") %></p>
|
||||
<i class="fas fa-md fa-spider"></i>
|
||||
<% end %>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
"""
|
||||
end
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
defmodule CanneryWeb.InitAssigns do
|
||||
@moduledoc """
|
||||
Ensures common `assigns` are applied to all LiveViews attaching this hook.
|
||||
"""
|
||||
import Phoenix.LiveView
|
||||
alias Cannery.Accounts
|
||||
|
||||
def on_mount(:default, _params, %{"locale" => locale, "user_token" => user_token}, socket) do
|
||||
Gettext.put_locale(locale)
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
|
||||
|
||||
{:cont, socket}
|
||||
end
|
||||
|
||||
def on_mount(:default, _params, _session, socket), do: {:cont, socket}
|
||||
end
|
||||
@ -10,7 +10,9 @@ defmodule CanneryWeb.InviteLive.Index do
|
||||
alias Phoenix.LiveView.JS
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, %{assigns: %{current_user: current_user}} = socket) do
|
||||
def mount(_params, session, socket) do
|
||||
%{assigns: %{current_user: current_user}} = socket = socket |> assign_defaults(session)
|
||||
|
||||
socket =
|
||||
if current_user |> Map.get(:role) == :admin do
|
||||
socket |> display_invites()
|
||||
|
||||
@ -3,9 +3,20 @@ defmodule CanneryWeb.LiveHelpers do
|
||||
Contains common helper functions for liveviews
|
||||
"""
|
||||
|
||||
import Phoenix.LiveView
|
||||
import Phoenix.LiveView.Helpers
|
||||
alias Cannery.Accounts
|
||||
alias Phoenix.LiveView.JS
|
||||
|
||||
def assign_defaults(socket, %{"user_token" => user_token} = _session) do
|
||||
socket
|
||||
|> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
|
||||
end
|
||||
|
||||
def assign_defaults(socket, _session) do
|
||||
socket
|
||||
end
|
||||
|
||||
@doc """
|
||||
Renders a live component inside a modal.
|
||||
|
||||
|
||||
@ -10,7 +10,9 @@ defmodule CanneryWeb.RangeLive.Index do
|
||||
alias Phoenix.LiveView.Socket
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket |> display_shot_groups()}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session) |> display_shot_groups()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
|
||||
|
||||
@ -9,7 +9,9 @@ defmodule CanneryWeb.TagLive.Index do
|
||||
alias CanneryWeb.Endpoint
|
||||
|
||||
@impl true
|
||||
def mount(_params, _session, socket), do: {:ok, socket |> display_tags()}
|
||||
def mount(_params, session, socket) do
|
||||
{:ok, socket |> assign_defaults(session) |> display_tags()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
|
||||
|
||||
@ -11,17 +11,8 @@ defmodule CanneryWeb.Router do
|
||||
plug :protect_from_forgery
|
||||
plug :put_secure_browser_headers
|
||||
plug :fetch_current_user
|
||||
plug :put_user_locale, default: Application.get_env(:gettext, :default_locale, "en_US")
|
||||
end
|
||||
|
||||
defp put_user_locale(%{assigns: %{current_user: %{locale: locale}}} = conn, default: default) do
|
||||
Gettext.put_locale(locale || default)
|
||||
conn |> put_session(:locale, locale || default)
|
||||
end
|
||||
|
||||
defp put_user_locale(conn, default: default) do
|
||||
Gettext.put_locale(default)
|
||||
conn |> put_session(:locale, default)
|
||||
Gettext.put_locale(Application.get_env(:gettext, :default_locale, "en_US"))
|
||||
end
|
||||
|
||||
pipeline :require_admin do
|
||||
|
||||
@ -30,15 +30,6 @@
|
||||
<%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
|
||||
<%= error_tag(f, :password, "col-span-3") %>
|
||||
|
||||
<%= label(f, :locale, gettext("Language"), class: "title text-lg text-primary-600") %>
|
||||
<%= select(
|
||||
f,
|
||||
:locale,
|
||||
[{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
|
||||
class: "input input-primary col-span-2"
|
||||
) %>
|
||||
<%= error_tag(f, :locale) %>
|
||||
|
||||
<%= submit(dgettext("actions", "Register"), class: "mx-auto btn btn-primary col-span-3") %>
|
||||
<% end %>
|
||||
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center text-center space-y-4">
|
||||
<div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4">
|
||||
<h1 class="pb-4 title text-primary-600 text-xl">
|
||||
<%= gettext("Settings") %>
|
||||
</h1>
|
||||
|
||||
<hr class="hr" />
|
||||
|
||||
<.form
|
||||
let={f}
|
||||
for={@email_changeset}
|
||||
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"
|
||||
>
|
||||
<%= form_for @email_changeset,
|
||||
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"
|
||||
],
|
||||
fn f -> %>
|
||||
<h3 class="title text-primary-600 text-lg col-span-3">
|
||||
<%= dgettext("actions", "Change email") %>
|
||||
</h3>
|
||||
@ -44,16 +45,17 @@
|
||||
<%= submit(dgettext("actions", "Change email"),
|
||||
class: "mx-auto btn btn-primary col-span-3"
|
||||
) %>
|
||||
</.form>
|
||||
<% end %>
|
||||
|
||||
<hr class="hr" />
|
||||
|
||||
<.form
|
||||
let={f}
|
||||
for={@password_changeset}
|
||||
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"
|
||||
>
|
||||
<%= form_for @password_changeset,
|
||||
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"
|
||||
],
|
||||
fn f -> %>
|
||||
<h3 class="title text-primary-600 text-lg col-span-3">
|
||||
<%= dgettext("actions", "Change password") %>
|
||||
</h3>
|
||||
@ -99,43 +101,7 @@
|
||||
<%= submit(dgettext("actions", "Change password"),
|
||||
class: "mx-auto btn btn-primary col-span-3"
|
||||
) %>
|
||||
</.form>
|
||||
|
||||
<hr class="hr" />
|
||||
|
||||
<.form
|
||||
let={f}
|
||||
for={@locale_changeset}
|
||||
action={Routes.user_settings_path(@conn, :update)}
|
||||
class="flex flex-col space-y-4 justify-center items-center"
|
||||
>
|
||||
<h3 class="title text-primary-600 text-lg">
|
||||
<%= dgettext("actions", "Change Language") %>
|
||||
</h3>
|
||||
|
||||
<%= if @locale_changeset.action && not @locale_changeset.valid? do %>
|
||||
<div class="alert alert-danger">
|
||||
<p>
|
||||
<%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= hidden_input(f, :action, name: "action", value: "update_locale") %>
|
||||
|
||||
<%= select(
|
||||
f,
|
||||
:locale,
|
||||
[{gettext("English"), "en_US"}, {gettext("German"), "de"}, {gettext("French"), "fr"}],
|
||||
class: "mx-2 my-1 min-w-md input input-primary"
|
||||
) %>
|
||||
<%= error_tag(f, :locale) %>
|
||||
|
||||
<%= submit(dgettext("actions", "Change language"),
|
||||
class: "whitespace-nowrap mx-auto btn btn-primary",
|
||||
data: [qa: dgettext("prompts", "Are you sure you want to change your language?")]
|
||||
) %>
|
||||
</.form>
|
||||
<% end %>
|
||||
|
||||
<hr class="hr" />
|
||||
|
||||
|
||||
4
mix.exs
4
mix.exs
@ -4,7 +4,7 @@ defmodule Cannery.MixProject do
|
||||
def project do
|
||||
[
|
||||
app: :cannery,
|
||||
version: "0.5.2",
|
||||
version: "0.5.1",
|
||||
elixir: "1.13.4",
|
||||
elixirc_paths: elixirc_paths(Mix.env()),
|
||||
compilers: [:gettext] ++ Mix.compilers(),
|
||||
@ -13,7 +13,6 @@ defmodule Cannery.MixProject do
|
||||
deps: deps(),
|
||||
dialyzer: [plt_add_apps: [:ex_unit]],
|
||||
consolidate_protocols: Mix.env() not in [:dev, :test],
|
||||
preferred_cli_env: [test: :test],
|
||||
# ExDoc
|
||||
name: "Cannery",
|
||||
source_url: "https://gitea.bubbletea.dev/shibao/cannery",
|
||||
@ -92,7 +91,6 @@ defmodule Cannery.MixProject do
|
||||
"dialyzer",
|
||||
"credo --strict",
|
||||
"format --check-formatted",
|
||||
"ecto.drop --quiet",
|
||||
"ecto.create --quiet",
|
||||
"ecto.migrate --quiet",
|
||||
"test"
|
||||
|
||||
@ -31,14 +31,14 @@ msgid "Add your first type!"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:15
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:44
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:16
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:45
|
||||
msgid "Change email"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:58
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:99
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:60
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:101
|
||||
msgid "Change password"
|
||||
msgstr ""
|
||||
|
||||
@ -48,12 +48,12 @@ msgid "Create Invite"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:142
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:108
|
||||
msgid "Delete User"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:52
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:43
|
||||
#: lib/cannery_web/templates/user_reset_password/new.html.heex:3
|
||||
#: lib/cannery_web/templates/user_session/new.html.heex:45
|
||||
msgid "Forgot your password?"
|
||||
@ -67,7 +67,7 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:106
|
||||
#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:48
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:39
|
||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
|
||||
#: lib/cannery_web/templates/user_reset_password/new.html.heex:30
|
||||
#: lib/cannery_web/templates/user_session/new.html.heex:3
|
||||
@ -104,7 +104,7 @@ msgstr ""
|
||||
#: lib/cannery_web/components/topbar.ex:99
|
||||
#: lib/cannery_web/templates/user_confirmation/new.html.heex:25
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:3
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:42
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:33
|
||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
|
||||
#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
|
||||
#: lib/cannery_web/templates/user_session/new.html.heex:40
|
||||
@ -160,14 +160,14 @@ msgid "Why not get some ready to shoot?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:144
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:91
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:134
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:86
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:36
|
||||
msgid "Record shots"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:55
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:50
|
||||
msgid "Ammo Details"
|
||||
msgstr ""
|
||||
|
||||
@ -177,7 +177,7 @@ msgid "Add another container!"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:85
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:80
|
||||
msgid "Move containers"
|
||||
msgstr ""
|
||||
|
||||
@ -201,13 +201,3 @@ msgstr ""
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:66
|
||||
msgid "Create"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:113
|
||||
msgid "Change Language"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:134
|
||||
msgid "Change language"
|
||||
msgstr ""
|
||||
|
||||
@ -11,12 +11,12 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:56
|
||||
#: lib/cannery_web/live/home_live.ex:61
|
||||
msgid "%{name} lets you easily keep an eye on your ammo levels before and after range day"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:78
|
||||
#: lib/cannery_web/live/home_live.ex:83
|
||||
msgid "Access from any internet-capable device"
|
||||
msgstr ""
|
||||
|
||||
@ -26,14 +26,14 @@ msgid "Admins"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:92
|
||||
#: lib/cannery_web/live/home_live.ex:97
|
||||
msgid "Admins:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:50
|
||||
#: lib/cannery_web/live/ammo_group_live/index.html.heex:3
|
||||
#: lib/cannery_web/live/range_live/index.ex:80
|
||||
#: lib/cannery_web/live/range_live/index.ex:82
|
||||
msgid "Ammo"
|
||||
msgstr ""
|
||||
|
||||
@ -45,7 +45,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:87
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:100
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:92
|
||||
msgid "Average Price paid"
|
||||
msgstr ""
|
||||
|
||||
@ -110,7 +110,7 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:44
|
||||
#: lib/cannery_web/live/container_live/index.ex:36
|
||||
#: lib/cannery_web/live/container_live/index.ex:38
|
||||
#: lib/cannery_web/live/container_live/index.html.heex:3
|
||||
msgid "Containers"
|
||||
msgstr ""
|
||||
@ -152,29 +152,29 @@ msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:53
|
||||
#: lib/cannery_web/live/home_live.ex:58
|
||||
msgid "Easy to Use:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:38
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:40
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:42
|
||||
msgid "Edit Ammo group"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:23
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:45
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:47
|
||||
msgid "Edit Ammo type"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:33
|
||||
#: lib/cannery_web/live/invite_live/index.ex:35
|
||||
msgid "Edit Invite"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/tag_live/index.ex:21
|
||||
#: lib/cannery_web/live/tag_live/index.ex:23
|
||||
msgid "Edit Tag"
|
||||
msgstr ""
|
||||
|
||||
@ -208,7 +208,7 @@ msgid "Incendiary"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:87
|
||||
#: lib/cannery_web/live/home_live.ex:92
|
||||
msgid "Instance Information"
|
||||
msgstr ""
|
||||
|
||||
@ -218,13 +218,13 @@ msgid "Invite Disabled"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:118
|
||||
#: lib/cannery_web/live/home_live.ex:123
|
||||
msgid "Invite Only"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:69
|
||||
#: lib/cannery_web/live/invite_live/index.ex:41
|
||||
#: lib/cannery_web/live/invite_live/index.ex:43
|
||||
#: lib/cannery_web/live/invite_live/index.html.heex:3
|
||||
msgid "Invites"
|
||||
msgstr ""
|
||||
@ -288,17 +288,17 @@ msgid "New Ammo type"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:31
|
||||
#: lib/cannery_web/live/container_live/index.ex:33
|
||||
msgid "New Container"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:37
|
||||
#: lib/cannery_web/live/invite_live/index.ex:39
|
||||
msgid "New Invite"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/tag_live/index.ex:27
|
||||
#: lib/cannery_web/live/tag_live/index.ex:29
|
||||
msgid "New Tag"
|
||||
msgstr ""
|
||||
|
||||
@ -313,7 +313,7 @@ msgid "No Ammo Types"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:120
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:112
|
||||
msgid "No ammo for this type"
|
||||
msgstr ""
|
||||
|
||||
@ -341,9 +341,9 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/add_shot_group_component.html.heex:30
|
||||
#: lib/cannery_web/live/ammo_group_live/form_component.html.heex:41
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:88
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:90
|
||||
#: lib/cannery_web/live/range_live/form_component.html.heex:29
|
||||
#: lib/cannery_web/live/range_live/index.ex:82
|
||||
#: lib/cannery_web/live/range_live/index.ex:84
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
|
||||
@ -372,7 +372,7 @@ msgid "Price paid"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:47
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:42
|
||||
msgid "Price paid:"
|
||||
msgstr ""
|
||||
|
||||
@ -384,17 +384,17 @@ msgid "Primer type"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:117
|
||||
#: lib/cannery_web/live/home_live.ex:122
|
||||
msgid "Public Signups"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:65
|
||||
#: lib/cannery_web/live/home_live.ex:70
|
||||
msgid "Secure:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:68
|
||||
#: lib/cannery_web/live/home_live.ex:73
|
||||
msgid "Self-host your own instance, or use an instance from someone you trust."
|
||||
msgstr ""
|
||||
|
||||
@ -410,17 +410,17 @@ msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:39
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:41
|
||||
msgid "Show Ammo group"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:44
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:46
|
||||
msgid "Show Ammo type"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:75
|
||||
#: lib/cannery_web/live/home_live.ex:80
|
||||
msgid "Simple:"
|
||||
msgstr ""
|
||||
|
||||
@ -430,13 +430,13 @@ msgid "Steel"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:98
|
||||
msgid "Stored in"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/topbar.ex:38
|
||||
#: lib/cannery_web/live/tag_live/index.ex:32
|
||||
#: lib/cannery_web/live/tag_live/index.ex:34
|
||||
#: lib/cannery_web/live/tag_live/index.html.heex:3
|
||||
msgid "Tags"
|
||||
msgstr ""
|
||||
@ -452,12 +452,12 @@ msgid "Text color"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:44
|
||||
#: lib/cannery_web/live/home_live.ex:49
|
||||
msgid "The self-hosted firearm tracker website"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:108
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:103
|
||||
msgid "This ammo group is not in a container"
|
||||
msgstr ""
|
||||
|
||||
@ -496,12 +496,12 @@ msgid "Uses left"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:40
|
||||
#: lib/cannery_web/live/home_live.ex:45
|
||||
msgid "Welcome to %{name}"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:69
|
||||
#: lib/cannery_web/live/home_live.ex:74
|
||||
msgid "Your data stays with you, period"
|
||||
msgstr ""
|
||||
|
||||
@ -522,8 +522,8 @@ msgid "Range day"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:89
|
||||
#: lib/cannery_web/live/range_live/index.ex:83
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:91
|
||||
#: lib/cannery_web/live/range_live/index.ex:85
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
@ -538,13 +538,13 @@ msgid "No ammo staged"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:82
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:77
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:33
|
||||
msgid "Stage for range"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:81
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:76
|
||||
#: lib/cannery_web/live/range_live/index.html.heex:32
|
||||
msgid "Unstage from range"
|
||||
msgstr ""
|
||||
@ -572,13 +572,13 @@ msgid "Date (UTC)"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:37
|
||||
#: lib/cannery_web/live/range_live/index.ex:32
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:39
|
||||
#: lib/cannery_web/live/range_live/index.ex:34
|
||||
msgid "Edit Shot Records"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/range_live/index.ex:38
|
||||
#: lib/cannery_web/live/range_live/index.ex:40
|
||||
msgid "New Shot Records"
|
||||
msgstr ""
|
||||
|
||||
@ -593,19 +593,19 @@ msgid "Rounds left"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:87
|
||||
#: lib/cannery_web/live/range_live/index.ex:81
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:89
|
||||
#: lib/cannery_web/live/range_live/index.ex:83
|
||||
msgid "Rounds shot"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/range_live/index.ex:44
|
||||
#: lib/cannery_web/live/range_live/index.ex:46
|
||||
msgid "Shot Records"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:32
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:38
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:40
|
||||
msgid "Move Ammo group"
|
||||
msgstr ""
|
||||
|
||||
@ -625,12 +625,12 @@ msgid "Shot log"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:48
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:118
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:43
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:117
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:32
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:39
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:114
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:96
|
||||
msgid "$%{amount}"
|
||||
msgstr ""
|
||||
|
||||
@ -675,28 +675,28 @@ msgid "UPC"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:78
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:80
|
||||
msgid "Confirm new password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:32
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:87
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:33
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:89
|
||||
msgid "Current password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:71
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:73
|
||||
msgid "New password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:141
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:131
|
||||
msgid "Stage"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:141
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:131
|
||||
msgid "Unstage"
|
||||
msgstr ""
|
||||
|
||||
@ -718,14 +718,14 @@ msgid "Loading..."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:27
|
||||
#: lib/cannery_web/live/container_live/show.ex:95
|
||||
#: lib/cannery_web/live/container_live/index.ex:29
|
||||
#: lib/cannery_web/live/container_live/show.ex:97
|
||||
msgid "Edit %{name}"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:46
|
||||
#: lib/cannery_web/live/container_live/show.ex:96
|
||||
#: lib/cannery_web/live/container_live/index.ex:48
|
||||
#: lib/cannery_web/live/container_live/show.ex:98
|
||||
msgid "Edit %{name} tags"
|
||||
msgstr ""
|
||||
|
||||
@ -735,13 +735,13 @@ msgid "Rounds:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/show.ex:94
|
||||
#: lib/cannery_web/live/container_live/show.ex:96
|
||||
msgid "Show %{name}"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:113
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:102
|
||||
msgid "No cost information"
|
||||
msgstr ""
|
||||
|
||||
@ -751,12 +751,12 @@ msgid "% left"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:43
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:38
|
||||
msgid "Current value:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:36
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:31
|
||||
msgid "Original cost:"
|
||||
msgstr ""
|
||||
|
||||
@ -771,7 +771,7 @@ msgid "Percentage left:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:116
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:111
|
||||
msgid "Rounds used"
|
||||
msgstr ""
|
||||
|
||||
@ -816,8 +816,8 @@ msgid "Reset your password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:36
|
||||
#: lib/cannery_web/live/range_live/index.ex:26
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:38
|
||||
#: lib/cannery_web/live/range_live/index.ex:28
|
||||
msgid "Record Shots"
|
||||
msgstr ""
|
||||
|
||||
@ -830,63 +830,3 @@ msgstr ""
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:34
|
||||
msgid "Ammo types"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:86
|
||||
msgid "Added on"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/ammo_group_card.ex:41
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
|
||||
#: lib/cannery_web/live/ammo_type_live/show.html.heex:91
|
||||
msgid "Added on:"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/components/user_card.ex:30
|
||||
msgid "User registered on"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:37
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:129
|
||||
msgid "English"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:37
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:129
|
||||
msgid "French"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:37
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:129
|
||||
msgid "German"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:33
|
||||
msgid "Language"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:139
|
||||
msgid "Get involved!"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:156
|
||||
msgid "Help translate"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:165
|
||||
msgid "Report bugs or request features"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:147
|
||||
msgid "View the source code"
|
||||
msgstr ""
|
||||
|
||||
@ -16,18 +16,18 @@ msgid "Container must be empty before deleting"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:69
|
||||
#: lib/cannery_web/live/container_live/show.ex:71
|
||||
#: lib/cannery_web/live/container_live/index.ex:71
|
||||
#: lib/cannery_web/live/container_live/show.ex:73
|
||||
msgid "Could not delete %{name}: %{error}"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:57
|
||||
#: lib/cannery_web/live/container_live/index.ex:59
|
||||
msgid "Could not find that container"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:84
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:67
|
||||
msgid "Email change link is invalid or it has expired."
|
||||
msgstr ""
|
||||
|
||||
@ -59,9 +59,8 @@ msgstr ""
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_registration/new.html.heex:16
|
||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:21
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:64
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:119
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:22
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:66
|
||||
msgid "Oops, something went wrong! Please check the errors below."
|
||||
msgstr ""
|
||||
|
||||
@ -83,7 +82,7 @@ msgid "Sorry, this invite was not found or expired"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:99
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:82
|
||||
msgid "Unable to delete user"
|
||||
msgstr ""
|
||||
|
||||
@ -98,7 +97,7 @@ msgid "User confirmation link is invalid or it has expired."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:18
|
||||
#: lib/cannery_web/live/invite_live/index.ex:20
|
||||
msgid "You are not authorized to view this page"
|
||||
msgstr ""
|
||||
|
||||
@ -108,22 +107,22 @@ msgid "You are not authorized to view this page."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery/accounts/user.ex:130
|
||||
#: lib/cannery/accounts/user.ex:128
|
||||
msgid "did not change"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery/accounts/user.ex:151
|
||||
#: lib/cannery/accounts/user.ex:149
|
||||
msgid "does not match password"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery/accounts/user.ex:188
|
||||
#: lib/cannery/accounts/user.ex:186
|
||||
msgid "is not valid"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery/accounts/user.ex:84
|
||||
#: lib/cannery/accounts/user.ex:82
|
||||
msgid "must have the @ sign and no spaces"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -20,31 +20,31 @@ msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:41
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:38
|
||||
#: lib/cannery_web/live/invite_live/index.ex:53
|
||||
#: lib/cannery_web/live/invite_live/index.ex:133
|
||||
#: lib/cannery_web/live/tag_live/index.ex:38
|
||||
#: lib/cannery_web/live/ammo_type_live/show.ex:40
|
||||
#: lib/cannery_web/live/invite_live/index.ex:55
|
||||
#: lib/cannery_web/live/invite_live/index.ex:135
|
||||
#: lib/cannery_web/live/tag_live/index.ex:40
|
||||
msgid "%{name} deleted succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:109
|
||||
#: lib/cannery_web/live/invite_live/index.ex:111
|
||||
msgid "%{name} disabled succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:87
|
||||
#: lib/cannery_web/live/invite_live/index.ex:89
|
||||
msgid "%{name} enabled succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/index.ex:62
|
||||
#: lib/cannery_web/live/container_live/show.ex:61
|
||||
#: lib/cannery_web/live/container_live/index.ex:64
|
||||
#: lib/cannery_web/live/container_live/show.ex:63
|
||||
msgid "%{name} has been deleted"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:67
|
||||
#: lib/cannery_web/live/invite_live/index.ex:69
|
||||
msgid "%{name} updated succesfully"
|
||||
msgstr ""
|
||||
|
||||
@ -57,13 +57,13 @@ msgid "%{name} updated successfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:29
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:28
|
||||
msgid "A link to confirm your email change has been sent to the new address."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:56
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:50
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:52
|
||||
msgid "Ammo group deleted succesfully"
|
||||
msgstr ""
|
||||
|
||||
@ -92,14 +92,14 @@ msgid "Are you sure you want to delete the invite for %{name}?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:177
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:71
|
||||
#: lib/cannery_web/live/ammo_group_live/index.ex:167
|
||||
#: lib/cannery_web/live/ammo_group_live/show.html.heex:66
|
||||
#: lib/cannery_web/live/ammo_type_live/index.ex:140
|
||||
msgid "Are you sure you want to delete this ammo?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:146
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:112
|
||||
msgid "Are you sure you want to delete your account?"
|
||||
msgstr ""
|
||||
|
||||
@ -114,7 +114,7 @@ msgid "Are you sure you want to make %{name} unlimited?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:77
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:60
|
||||
msgid "Email changed successfully."
|
||||
msgstr ""
|
||||
|
||||
@ -139,7 +139,7 @@ msgid "Password reset successfully."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:49
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:47
|
||||
msgid "Password updated successfully."
|
||||
msgstr ""
|
||||
|
||||
@ -149,7 +149,7 @@ msgid "Please check your email to verify your account"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/home_live.ex:96
|
||||
#: lib/cannery_web/live/home_live.ex:101
|
||||
msgid "Register to setup %{name}"
|
||||
msgstr ""
|
||||
|
||||
@ -165,7 +165,7 @@ msgid "Saving..."
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:95
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:78
|
||||
msgid "Your account has been deleted"
|
||||
msgstr ""
|
||||
|
||||
@ -180,7 +180,7 @@ msgid "%{name} added successfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/container_live/show.ex:37
|
||||
#: lib/cannery_web/live/container_live/show.ex:39
|
||||
msgid "%{tag_name} has been removed from %{container_name}"
|
||||
msgstr ""
|
||||
|
||||
@ -200,19 +200,19 @@ msgid "Are you sure you want to unstage this ammo?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/range_live/index.ex:68
|
||||
#: lib/cannery_web/live/range_live/index.ex:70
|
||||
msgid "Ammo group unstaged succesfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:130
|
||||
#: lib/cannery_web/live/range_live/index.ex:128
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:132
|
||||
#: lib/cannery_web/live/range_live/index.ex:130
|
||||
msgid "Are you sure you want to delete this shot record?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:78
|
||||
#: lib/cannery_web/live/range_live/index.ex:54
|
||||
#: lib/cannery_web/live/ammo_group_live/show.ex:80
|
||||
#: lib/cannery_web/live/range_live/index.ex:56
|
||||
msgid "Shot records deleted succesfully"
|
||||
msgstr ""
|
||||
|
||||
@ -232,7 +232,7 @@ msgid "Ammo moved to %{name} successfully"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/live/invite_live/index.ex:121
|
||||
#: lib/cannery_web/live/invite_live/index.ex:123
|
||||
msgid "Copied to clipboard"
|
||||
msgstr ""
|
||||
|
||||
@ -258,13 +258,3 @@ msgid "Ammo group created successfully"
|
||||
msgid_plural "Ammo groups created successfully"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:136
|
||||
msgid "Are you sure you want to change your language?"
|
||||
msgstr ""
|
||||
|
||||
#, elixir-autogen, elixir-format
|
||||
#: lib/cannery_web/controllers/user_settings_controller.ex:65
|
||||
msgid "Language updated successfully."
|
||||
msgstr ""
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
defmodule Cannery.Repo.Migrations.AddLocaleSetting do
|
||||
use Ecto.Migration
|
||||
|
||||
def change do
|
||||
alter table("users") do
|
||||
add :locale, :string
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user