From 81e448afc40eb538054516ce571346e9de9c78c0 Mon Sep 17 00:00:00 2001 From: shibao Date: Sat, 19 Nov 2022 15:04:56 -0500 Subject: [PATCH] improve some wording --- CHANGELOG.md | 1 + lib/cannery/activity_log/shot_group.ex | 2 +- lib/cannery_web/live/ammo_group_live/index.ex | 8 ++--- .../live/ammo_type_live/index.html.heex | 2 +- .../live/range_live/form_component.html.heex | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 36 +++++++------------ priv/gettext/de/LC_MESSAGES/errors.po | 10 +++--- priv/gettext/de/LC_MESSAGES/prompts.po | 6 +--- priv/gettext/default.pot | 36 +++++++------------ priv/gettext/en/LC_MESSAGES/default.po | 36 +++++++------------ priv/gettext/en/LC_MESSAGES/errors.po | 10 +++--- priv/gettext/en/LC_MESSAGES/prompts.po | 6 +--- priv/gettext/errors.pot | 10 +++--- priv/gettext/es/LC_MESSAGES/default.po | 36 +++++++------------ priv/gettext/es/LC_MESSAGES/errors.po | 10 +++--- priv/gettext/es/LC_MESSAGES/prompts.po | 6 +--- priv/gettext/fr/LC_MESSAGES/default.po | 36 +++++++------------ priv/gettext/fr/LC_MESSAGES/errors.po | 10 +++--- priv/gettext/fr/LC_MESSAGES/prompts.po | 6 +--- priv/gettext/ga/LC_MESSAGES/default.po | 36 +++++++------------ priv/gettext/ga/LC_MESSAGES/errors.po | 10 +++--- priv/gettext/ga/LC_MESSAGES/prompts.po | 6 +--- priv/gettext/prompts.pot | 6 +--- .../cannery_web/live/ammo_group_live_test.exs | 2 +- 24 files changed, 117 insertions(+), 212 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eb872eb..91f8f9c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Improve container index table - Fix bug with ammo not updating after deleting shot group - Replace ammo "added on" with "purchased on" +- Miscellaneous wording improvements # v0.7.1 - Add shading to table component diff --git a/lib/cannery/activity_log/shot_group.ex b/lib/cannery/activity_log/shot_group.ex index 769f4f69..c3221d12 100644 --- a/lib/cannery/activity_log/shot_group.ex +++ b/lib/cannery/activity_log/shot_group.ex @@ -74,7 +74,7 @@ defmodule Cannery.ActivityLog.ShotGroup do |> cast(attrs, [:count, :notes, :date]) |> validate_number(:count, greater_than: 0) |> validate_required([:count, :ammo_group_id, :user_id]) - |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo group")) + |> add_error(:invalid, dgettext("errors", "Please select a valid user and ammo pack")) end defp validate_create_shot_group_count(changeset, %AmmoGroup{count: ammo_group_count}) do diff --git a/lib/cannery_web/live/ammo_group_live/index.ex b/lib/cannery_web/live/ammo_group_live/index.ex index 4d7aefb7..0f4c1830 100644 --- a/lib/cannery_web/live/ammo_group_live/index.ex +++ b/lib/cannery_web/live/ammo_group_live/index.ex @@ -29,13 +29,13 @@ defmodule CanneryWeb.AmmoGroupLive.Index do defp apply_action(%{assigns: %{current_user: current_user}} = socket, :move, %{"id" => id}) do socket - |> assign(:page_title, gettext("Move Ammo group")) + |> assign(:page_title, gettext("Move ammo")) |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user)) end defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do socket - |> assign(:page_title, gettext("Edit Ammo group")) + |> assign(:page_title, gettext("Edit ammo")) |> assign(:ammo_group, Ammo.get_ammo_group!(id, current_user)) end @@ -53,7 +53,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do defp apply_action(socket, :index, _params) do socket - |> assign(:page_title, gettext("Ammo groups")) + |> assign(:page_title, gettext("Ammo")) |> assign(:ammo_group, nil) end @@ -61,7 +61,7 @@ defmodule CanneryWeb.AmmoGroupLive.Index do def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do Ammo.get_ammo_group!(id, current_user) |> Ammo.delete_ammo_group!(current_user) - prompt = dgettext("prompts", "Ammo group deleted succesfully") + prompt = dgettext("prompts", "Ammo deleted succesfully") {:noreply, socket |> put_flash(:info, prompt) |> display_ammo_groups()} end diff --git a/lib/cannery_web/live/ammo_type_live/index.html.heex b/lib/cannery_web/live/ammo_type_live/index.html.heex index 3eee3849..bc2a0bf1 100644 --- a/lib/cannery_web/live/ammo_type_live/index.html.heex +++ b/lib/cannery_web/live/ammo_type_live/index.html.heex @@ -5,7 +5,7 @@ <%= if @rows |> Enum.empty?() do %>

- <%= gettext("No Ammo Types") %> + <%= gettext("No Ammo types") %> <%= display_emoji("😔") %>

diff --git a/lib/cannery_web/live/range_live/form_component.html.heex b/lib/cannery_web/live/range_live/form_component.html.heex index dc9dbce9..a41816b3 100644 --- a/lib/cannery_web/live/range_live/form_component.html.heex +++ b/lib/cannery_web/live/range_live/form_component.html.heex @@ -33,7 +33,7 @@ ) %> <%= error_tag(f, :notes, "col-span-3") %> - <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %> + <%= label(f, :date, gettext("Date"), class: "title text-lg text-primary-600") %> <%= date_input(f, :date, class: "input input-primary col-span-2") %> <%= error_tag(f, :notes, "col-span-3") %> diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 28f95534..7667fceb 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -46,6 +46,7 @@ msgid "Admins:" msgstr "Admins:" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -155,11 +156,6 @@ msgstr "Beschreibung:" msgid "Easy to Use:" msgstr "Einfache Anwendung:" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "Munitionsgruppe bearbeiten" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -295,11 +291,6 @@ msgstr "Neuer Tag" msgid "No Ammo" msgstr "Keine Munition" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "Keine Munitionsarten" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -488,6 +479,7 @@ msgstr "Range Day" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -509,16 +501,6 @@ msgstr "Keine Munition selektiert" msgid "Record shots" msgstr "Schüsse dokumentieren" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "Munitionsgruppen" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "Zeit (UTC)" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -554,10 +536,6 @@ msgid "Shot Records" msgstr "Schießkladde" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "Munitionsgruppe verschieben" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1132,3 +1110,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit ammo" +msgstr "Munitionstyp bearbeiten" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format, fuzzy +msgid "No Ammo types" +msgstr "Keine Munitionsarten" diff --git a/priv/gettext/de/LC_MESSAGES/errors.po b/priv/gettext/de/LC_MESSAGES/errors.po index a91e2894..e5745078 100644 --- a/priv/gettext/de/LC_MESSAGES/errors.po +++ b/priv/gettext/de/LC_MESSAGES/errors.po @@ -197,12 +197,12 @@ msgstr "" msgid "Please select an ammo type and container" msgstr "" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "" + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format, fuzzy +msgid "Please select a valid user and ammo pack" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index c680740c..47af8cdb 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -74,11 +74,6 @@ msgstr "%{name} erfolgreich aktualisiert" msgid "A link to confirm your email change has been sent to the new address." msgstr "Eine Mail zum Bestätigen ihre Mailadresse wurde Ihnen zugesandt." -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "Munitionsgruppe erfolgreich gelöscht" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -271,6 +266,7 @@ msgstr "Möchten Sie die Sprache wechseln?" msgid "Language updated successfully." msgstr "Spracheinstellung gespeichert." +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format, fuzzy msgid "Ammo deleted succesfully" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index fd72fd38..865c1496 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -31,6 +31,7 @@ msgid "Admins:" msgstr "" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -140,11 +141,6 @@ msgstr "" msgid "Easy to Use:" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -280,11 +276,6 @@ msgstr "" msgid "No Ammo" msgstr "" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -471,6 +462,7 @@ msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -492,16 +484,6 @@ msgstr "" msgid "Record shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -537,10 +519,6 @@ msgid "Shot Records" msgstr "" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1115,3 +1093,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format +msgid "Edit ammo" +msgstr "" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format +msgid "No Ammo types" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index cc20333e..e20a0709 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -32,6 +32,7 @@ msgid "Admins:" msgstr "" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -141,11 +142,6 @@ msgstr "" msgid "Easy to Use:" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -281,11 +277,6 @@ msgstr "" msgid "No Ammo" msgstr "" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -472,6 +463,7 @@ msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -493,16 +485,6 @@ msgstr "" msgid "Record shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -538,10 +520,6 @@ msgid "Shot Records" msgstr "" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1116,3 +1094,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit ammo" +msgstr "" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format, fuzzy +msgid "No Ammo types" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index f5057136..da1c4ec7 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -180,12 +180,12 @@ msgstr "" msgid "Please select an ammo type and container" msgstr "" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "" + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format, fuzzy +msgid "Please select a valid user and ammo pack" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index d194c4d4..792a9e49 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -62,11 +62,6 @@ msgstr "" msgid "A link to confirm your email change has been sent to the new address." msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -251,6 +246,7 @@ msgstr "" msgid "Language updated successfully." msgstr "" +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format, fuzzy msgid "Ammo deleted succesfully" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 3a4666d9..892f6bbc 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -179,12 +179,12 @@ msgstr "" msgid "Please select an ammo type and container" msgstr "" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "" + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format +msgid "Please select a valid user and ammo pack" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index ae4b67b0..432d5070 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -46,6 +46,7 @@ msgid "Admins:" msgstr "" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -155,11 +156,6 @@ msgstr "" msgid "Easy to Use:" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -295,11 +291,6 @@ msgstr "" msgid "No Ammo" msgstr "" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -486,6 +477,7 @@ msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -507,16 +499,6 @@ msgstr "" msgid "Record shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -552,10 +534,6 @@ msgid "Shot Records" msgstr "" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1130,3 +1108,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit ammo" +msgstr "" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format, fuzzy +msgid "No Ammo types" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/errors.po b/priv/gettext/es/LC_MESSAGES/errors.po index 1a5e6a1f..1a9c367f 100644 --- a/priv/gettext/es/LC_MESSAGES/errors.po +++ b/priv/gettext/es/LC_MESSAGES/errors.po @@ -195,12 +195,12 @@ msgstr "Multiplicador inválido" msgid "Please select an ammo type and container" msgstr "" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "Su navegador no es compatible con el elemento lienzo." + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format, fuzzy +msgid "Please select a valid user and ammo pack" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/prompts.po b/priv/gettext/es/LC_MESSAGES/prompts.po index d2918fae..0068f052 100644 --- a/priv/gettext/es/LC_MESSAGES/prompts.po +++ b/priv/gettext/es/LC_MESSAGES/prompts.po @@ -76,11 +76,6 @@ msgstr "" "Un enlace para confirmar el correo electrónico ha sido enviado a la nueva " "dirección." -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "Grupo de Munición borrado exitosamente" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -270,6 +265,7 @@ msgstr "" msgid "Language updated successfully." msgstr "" +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format, fuzzy msgid "Ammo deleted succesfully" diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index debe48fd..26441e78 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -46,6 +46,7 @@ msgid "Admins:" msgstr "Administrateur·ices :" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -155,11 +156,6 @@ msgstr "Description :" msgid "Easy to Use:" msgstr "Simple à utiliser :" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "Éditer le groupe de munition" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -295,11 +291,6 @@ msgstr "Nouveau tag" msgid "No Ammo" msgstr "Aucune munition" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "Aucun type de munition" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -490,6 +481,7 @@ msgstr "Journée de stand" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -511,16 +503,6 @@ msgstr "Aucune munition sélectionnée" msgid "Record shots" msgstr "Tirs enregistrés" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "Groupes de munition" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "Date (UTC)" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -556,10 +538,6 @@ msgid "Shot Records" msgstr "Enregistrements de tir" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "Déplacer le groupe de munition" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1135,3 +1113,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit ammo" +msgstr "Éditer le type de munition" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format, fuzzy +msgid "No Ammo types" +msgstr "Aucun type de munition" diff --git a/priv/gettext/fr/LC_MESSAGES/errors.po b/priv/gettext/fr/LC_MESSAGES/errors.po index 507c0df4..94b851a9 100644 --- a/priv/gettext/fr/LC_MESSAGES/errors.po +++ b/priv/gettext/fr/LC_MESSAGES/errors.po @@ -196,12 +196,12 @@ msgstr "Multiplicateur invalide" msgid "Please select an ammo type and container" msgstr "Veuillez choisir un type de munitions et un conteneur" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "" + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format, fuzzy +msgid "Please select a valid user and ammo pack" +msgstr "Veuillez choisir un utilisateur valide et un groupe de munitions" diff --git a/priv/gettext/fr/LC_MESSAGES/prompts.po b/priv/gettext/fr/LC_MESSAGES/prompts.po index 5aedba98..6934bd86 100644 --- a/priv/gettext/fr/LC_MESSAGES/prompts.po +++ b/priv/gettext/fr/LC_MESSAGES/prompts.po @@ -76,11 +76,6 @@ msgstr "" "Un lien pour confirmer votre changement de mél a été envoyé à la nouvelle " "adresse." -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "Groupe de munition supprimé avec succès" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -272,6 +267,7 @@ msgstr "Êtes-vous certain·e de vouloir changer votre langue ?" msgid "Language updated successfully." msgstr "Langue mise à jour avec succès." +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format, fuzzy msgid "Ammo deleted succesfully" diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po index 5a2ace77..d2f28190 100644 --- a/priv/gettext/ga/LC_MESSAGES/default.po +++ b/priv/gettext/ga/LC_MESSAGES/default.po @@ -42,6 +42,7 @@ msgid "Admins:" msgstr "" #: lib/cannery_web/components/topbar.ex:73 +#: lib/cannery_web/live/ammo_group_live/index.ex:56 #: lib/cannery_web/live/ammo_group_live/index.html.heex:3 #: lib/cannery_web/live/range_live/index.ex:80 #, elixir-autogen, elixir-format @@ -151,11 +152,6 @@ msgstr "" msgid "Easy to Use:" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:38 -#, elixir-autogen, elixir-format -msgid "Edit Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/index.ex:23 #, elixir-autogen, elixir-format msgid "Edit Ammo type" @@ -291,11 +287,6 @@ msgstr "" msgid "No Ammo" msgstr "" -#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 -#, elixir-autogen, elixir-format -msgid "No Ammo Types" -msgstr "" - #: lib/cannery_web/live/ammo_type_live/show.html.heex:166 #, elixir-autogen, elixir-format msgid "No ammo for this type" @@ -482,6 +473,7 @@ msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:45 #: lib/cannery_web/live/ammo_group_live/show.ex:94 +#: lib/cannery_web/live/range_live/form_component.html.heex:36 #: lib/cannery_web/live/range_live/index.ex:83 #, elixir-autogen, elixir-format msgid "Date" @@ -503,16 +495,6 @@ msgstr "" msgid "Record shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:56 -#, elixir-autogen, elixir-format -msgid "Ammo groups" -msgstr "" - -#: lib/cannery_web/live/range_live/form_component.html.heex:36 -#, elixir-autogen, elixir-format -msgid "Date (UTC)" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/show.ex:42 #: lib/cannery_web/live/range_live/index.ex:32 #, elixir-autogen, elixir-format @@ -548,10 +530,6 @@ msgid "Shot Records" msgstr "" #: lib/cannery_web/live/ammo_group_live/index.ex:32 -#, elixir-autogen, elixir-format -msgid "Move Ammo group" -msgstr "" - #: lib/cannery_web/live/ammo_group_live/index.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -1126,3 +1104,13 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Purchased on:" msgstr "" + +#: lib/cannery_web/live/ammo_group_live/index.ex:38 +#, elixir-autogen, elixir-format, fuzzy +msgid "Edit ammo" +msgstr "" + +#: lib/cannery_web/live/ammo_type_live/index.html.heex:8 +#, elixir-autogen, elixir-format, fuzzy +msgid "No Ammo types" +msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/errors.po b/priv/gettext/ga/LC_MESSAGES/errors.po index 97a1554d..6cb6b2c8 100644 --- a/priv/gettext/ga/LC_MESSAGES/errors.po +++ b/priv/gettext/ga/LC_MESSAGES/errors.po @@ -195,12 +195,12 @@ msgstr "" msgid "Please select an ammo type and container" msgstr "" -#: lib/cannery/activity_log/shot_group.ex:77 -#, elixir-autogen, elixir-format -msgid "Please select a valid user and ammo group" -msgstr "" - #: lib/cannery_web/live/range_live/index.html.heex:67 #, elixir-autogen, elixir-format msgid "Your browser does not support the canvas element." msgstr "" + +#: lib/cannery/activity_log/shot_group.ex:77 +#, elixir-autogen, elixir-format, fuzzy +msgid "Please select a valid user and ammo pack" +msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/prompts.po b/priv/gettext/ga/LC_MESSAGES/prompts.po index 54fb8539..40e0d05a 100644 --- a/priv/gettext/ga/LC_MESSAGES/prompts.po +++ b/priv/gettext/ga/LC_MESSAGES/prompts.po @@ -72,11 +72,6 @@ msgstr "" msgid "A link to confirm your email change has been sent to the new address." msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -261,6 +256,7 @@ msgstr "" msgid "Language updated successfully." msgstr "" +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Ammo deleted succesfully" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 27747c6c..fa016a35 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -61,11 +61,6 @@ msgstr "" msgid "A link to confirm your email change has been sent to the new address." msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.ex:64 -#, elixir-autogen, elixir-format -msgid "Ammo group deleted succesfully" -msgstr "" - #: lib/cannery_web/live/invite_live/index.html.heex:103 #: lib/cannery_web/live/invite_live/index.html.heex:133 #, elixir-autogen, elixir-format @@ -250,6 +245,7 @@ msgstr "" msgid "Language updated successfully." msgstr "" +#: lib/cannery_web/live/ammo_group_live/index.ex:64 #: lib/cannery_web/live/ammo_group_live/show.ex:55 #, elixir-autogen, elixir-format msgid "Ammo deleted succesfully" diff --git a/test/cannery_web/live/ammo_group_live_test.exs b/test/cannery_web/live/ammo_group_live_test.exs index 3f15ff47..f10c87ea 100644 --- a/test/cannery_web/live/ammo_group_live_test.exs +++ b/test/cannery_web/live/ammo_group_live_test.exs @@ -156,7 +156,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do assert index_live |> element("[data-qa=\"edit-#{ammo_group.id}\"]") |> render_click() =~ - gettext("Edit Ammo") + gettext("Edit ammo") assert_patch(index_live, Routes.ammo_group_index_path(conn, :edit, ammo_group))