From 2987e4ff372db16166d9b62c8a06748918690cfe Mon Sep 17 00:00:00 2001 From: shibao Date: Sun, 19 Mar 2023 14:11:01 -0400 Subject: [PATCH] hide more ammo group table fields when not viewing historical information --- CHANGELOG.md | 1 + .../components/ammo_group_table_component.ex | 60 ++++++++++++------- .../live/ammo_group_live/index.html.heex | 1 + .../live/ammo_type_live/show.html.heex | 1 + .../live/container_live/show.html.heex | 1 + priv/gettext/actions.pot | 16 ++--- priv/gettext/de/LC_MESSAGES/actions.po | 16 ++--- priv/gettext/de/LC_MESSAGES/default.po | 41 +++++++------ priv/gettext/de/LC_MESSAGES/prompts.po | 2 +- priv/gettext/default.pot | 41 +++++++------ priv/gettext/en/LC_MESSAGES/actions.po | 16 ++--- priv/gettext/en/LC_MESSAGES/default.po | 41 +++++++------ priv/gettext/en/LC_MESSAGES/prompts.po | 2 +- priv/gettext/es/LC_MESSAGES/actions.po | 16 ++--- priv/gettext/es/LC_MESSAGES/default.po | 41 +++++++------ priv/gettext/es/LC_MESSAGES/prompts.po | 2 +- priv/gettext/fr/LC_MESSAGES/actions.po | 16 ++--- priv/gettext/fr/LC_MESSAGES/default.po | 41 +++++++------ priv/gettext/fr/LC_MESSAGES/prompts.po | 2 +- priv/gettext/ga/LC_MESSAGES/actions.po | 16 ++--- priv/gettext/ga/LC_MESSAGES/default.po | 41 +++++++------ priv/gettext/ga/LC_MESSAGES/prompts.po | 2 +- priv/gettext/prompts.pot | 2 +- .../cannery_web/live/ammo_group_live_test.exs | 8 +-- test/cannery_web/live/container_live_test.exs | 12 ++-- 25 files changed, 246 insertions(+), 192 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f3ae2fd..443c2c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix duplicate entries showing up - Show ammo groups under a type in a table by default - Only show historical ammo type information when displaying "Show used" in table +- Only show historical ammo group information when displaying "Show used" in table # v0.8.5 - Add link in readme to github mirror diff --git a/lib/cannery_web/components/ammo_group_table_component.ex b/lib/cannery_web/components/ammo_group_table_component.ex index 6408ce9e..194d5eaf 100644 --- a/lib/cannery_web/components/ammo_group_table_component.ex +++ b/lib/cannery_web/components/ammo_group_table_component.ex @@ -14,6 +14,7 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do required(:id) => UUID.t(), required(:current_user) => User.t(), required(:ammo_groups) => [AmmoGroup.t()], + required(:show_used) => boolean(), optional(:ammo_type) => Rendered.t(), optional(:range) => Rendered.t(), optional(:container) => Rendered.t(), @@ -22,7 +23,11 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do }, Socket.t() ) :: {:ok, Socket.t()} - def update(%{id: _id, ammo_groups: _ammo_group, current_user: _current_user} = assigns, socket) do + def update( + %{id: _id, ammo_groups: _ammo_group, current_user: _current_user, show_used: _show_used} = + assigns, + socket + ) do socket = socket |> assign(assigns) @@ -43,7 +48,8 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do ammo_type: ammo_type, range: range, container: container, - actions: actions + actions: actions, + show_used: show_used } } = socket ) do @@ -74,12 +80,24 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do end columns = [ - %{label: gettext("Count"), key: :count}, - %{label: gettext("Original Count"), key: :original_count}, %{label: gettext("Price paid"), key: :price_paid}, - %{label: gettext("CPR"), key: :cpr}, - %{label: gettext("% left"), key: :remaining}, - %{label: gettext("Notes"), key: :notes} + %{label: gettext("CPR"), key: :cpr} + | columns + ] + + columns = + if show_used do + [ + %{label: gettext("Original Count"), key: :original_count}, + %{label: gettext("% left"), key: :remaining} + | columns + ] + else + columns + end + + columns = [ + %{label: if(show_used, do: gettext("Current Count"), else: gettext("Count")), key: :count} | columns ] @@ -148,7 +166,8 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do """} end - defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), do: {"", nil} + defp get_value_for_key(:price_paid, %{price_paid: nil}, _additional_data), + do: {nil, gettext("No cost information")} defp get_value_for_key(:price_paid, %{price_paid: price_paid}, _additional_data), do: gettext("$%{amount}", amount: display_currency(price_paid)) @@ -183,11 +202,11 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do """} end - defp get_value_for_key(:remaining, ammo_group, %{current_user: current_user}), - do: - gettext("%{percentage}%", - percentage: ammo_group |> Ammo.get_percentage_remaining(current_user) - ) + defp get_value_for_key(:remaining, ammo_group, %{current_user: current_user}) do + gettext("%{percentage}%", + percentage: ammo_group |> Ammo.get_percentage_remaining(current_user) + ) + end defp get_value_for_key(:actions, ammo_group, %{actions: actions}) do assigns = %{actions: actions, ammo_group: ammo_group} @@ -217,18 +236,19 @@ defmodule CanneryWeb.Components.AmmoGroupTableComponent do """} end - defp get_value_for_key(:original_count, %{id: ammo_group_id}, %{ - original_counts: original_counts - }) do + defp get_value_for_key( + :original_count, + %{id: ammo_group_id}, + %{original_counts: original_counts} + ) do Map.fetch!(original_counts, ammo_group_id) end defp get_value_for_key(:cpr, %{price_paid: nil}, _additional_data), - do: gettext("No cost information") + do: {nil, gettext("No cost information")} - defp get_value_for_key(:cpr, %{id: ammo_group_id}, %{cprs: cprs}) do - gettext("$%{amount}", amount: display_currency(Map.fetch!(cprs, ammo_group_id))) - end + defp get_value_for_key(:cpr, %{id: ammo_group_id}, %{cprs: cprs}), + do: gettext("$%{amount}", amount: display_currency(Map.fetch!(cprs, ammo_group_id))) defp get_value_for_key(:count, %{count: count}, _additional_data), do: if(count == 0, do: gettext("Empty"), else: count) diff --git a/lib/cannery_web/live/ammo_group_live/index.html.heex b/lib/cannery_web/live/ammo_group_live/index.html.heex index 01b5b642..ee45254f 100644 --- a/lib/cannery_web/live/ammo_group_live/index.html.heex +++ b/lib/cannery_web/live/ammo_group_live/index.html.heex @@ -78,6 +78,7 @@ id="ammo-group-index-table" ammo_groups={@ammo_groups} current_user={@current_user} + show_used={@show_used} > <:ammo_type :let={%{name: ammo_type_name} = ammo_type}> <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link"> diff --git a/lib/cannery_web/live/ammo_type_live/show.html.heex b/lib/cannery_web/live/ammo_type_live/show.html.heex index d118e09b..3b536e1a 100644 --- a/lib/cannery_web/live/ammo_type_live/show.html.heex +++ b/lib/cannery_web/live/ammo_type_live/show.html.heex @@ -170,6 +170,7 @@ id="ammo-type-show-table" ammo_groups={@ammo_groups} current_user={@current_user} + show_used={@show_used} > <:container :let={{_ammo_group, %{name: container_name} = container}}> <.link diff --git a/lib/cannery_web/live/container_live/show.html.heex b/lib/cannery_web/live/container_live/show.html.heex index 1f2a6a9b..824f1d82 100644 --- a/lib/cannery_web/live/container_live/show.html.heex +++ b/lib/cannery_web/live/container_live/show.html.heex @@ -118,6 +118,7 @@ id="ammo-type-show-table" ammo_groups={@ammo_groups} current_user={@current_user} + show_used={@show_used} > <:ammo_type :let={%{name: ammo_type_name} = ammo_type}> <.link navigate={Routes.ammo_type_show_path(Endpoint, :show, ammo_type)} class="link"> diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index 2c80b7b2..fcadfa82 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -156,7 +156,7 @@ msgstr "" msgid "Why not get some ready to shoot?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -209,7 +209,7 @@ msgid "add an ammo type first" msgstr "" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -300,7 +300,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -321,7 +321,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format msgid "Stage" msgstr "" @@ -332,7 +332,7 @@ msgstr "" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -342,18 +342,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/actions.po b/priv/gettext/de/LC_MESSAGES/actions.po index 3e6391f7..0540423f 100644 --- a/priv/gettext/de/LC_MESSAGES/actions.po +++ b/priv/gettext/de/LC_MESSAGES/actions.po @@ -169,7 +169,7 @@ msgstr "Munition markieren" msgid "Why not get some ready to shoot?" msgstr "Warum nicht einige für den Schießstand auswählen?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -222,7 +222,7 @@ msgid "add an ammo type first" msgstr "" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -313,7 +313,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -334,7 +334,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Stage" msgstr "Munition markieren" @@ -345,7 +345,7 @@ msgstr "Munition markieren" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -355,18 +355,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format, fuzzy msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format, fuzzy msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format, fuzzy msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index d9f38d53..83efbabf 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -38,7 +38,7 @@ msgstr "Admins:" msgid "Ammo" msgstr "Munition" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -90,7 +90,7 @@ msgstr "Patrone" msgid "Case material" msgstr "Gehäusematerial" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -111,7 +111,7 @@ msgstr "Behälter" msgid "Corrosive" msgstr "Korrosiv" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -296,7 +296,6 @@ msgid "No tags" msgstr "Keine Tags" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -322,7 +321,7 @@ msgstr "Auf dem Bücherregal" msgid "Pressure" msgstr "Druck" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -440,7 +439,7 @@ msgstr "Ihre Daten bleiben bei Ihnen, Punkt" msgid "No tags for this container" msgstr "Keine Tags für diesen Behälter" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -526,8 +525,8 @@ msgstr "Kein weiterer Behälter" msgid "Shot log" msgstr "Schießkladde" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -621,14 +620,15 @@ msgstr "Editiere %{name} Tags" msgid "Rounds:" msgstr "Patronen:" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "Keine Preisinformationen" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "% verbleibend" @@ -809,7 +809,7 @@ msgstr "Behälter" msgid "Show used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -996,13 +996,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "%{name} bearbeiten" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1012,7 +1012,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format, fuzzy msgid "Original Count" msgstr "Ursprüngliche Anzahl:" @@ -1032,7 +1032,7 @@ msgstr "" msgid "Total packs:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "" @@ -1042,12 +1042,12 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1230,7 +1230,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1249,3 +1249,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 1884bd4a..5009027f 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -73,7 +73,7 @@ msgstr "" msgid "Are you sure you want to delete %{name}?" msgstr "Sind Sie sicher, dass sie %{name} löschen möchten?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index c944c844..df126c2e 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -34,7 +34,7 @@ msgstr "" msgid "Ammo" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -86,7 +86,7 @@ msgstr "" msgid "Case material" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -107,7 +107,7 @@ msgstr "" msgid "Corrosive" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -292,7 +292,6 @@ msgid "No tags" msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -318,7 +317,7 @@ msgstr "" msgid "Pressure" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -434,7 +433,7 @@ msgstr "" msgid "No tags for this container" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -520,8 +519,8 @@ msgstr "" msgid "Shot log" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -615,14 +614,15 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "" @@ -803,7 +803,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -990,13 +990,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1006,7 +1006,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format msgid "Original Count" msgstr "" @@ -1026,7 +1026,7 @@ msgstr "" msgid "Total packs:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "" @@ -1036,12 +1036,12 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1213,7 +1213,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1232,3 +1232,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/actions.po b/priv/gettext/en/LC_MESSAGES/actions.po index e5ac44fc..e22e8800 100644 --- a/priv/gettext/en/LC_MESSAGES/actions.po +++ b/priv/gettext/en/LC_MESSAGES/actions.po @@ -156,7 +156,7 @@ msgstr "" msgid "Why not get some ready to shoot?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -209,7 +209,7 @@ msgid "add an ammo type first" msgstr "" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -300,7 +300,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -321,7 +321,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Stage" msgstr "" @@ -332,7 +332,7 @@ msgstr "" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -342,18 +342,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format, fuzzy msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format, fuzzy msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format, fuzzy msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 6cbd8396..a97a5fc8 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -34,7 +34,7 @@ msgstr "" msgid "Ammo" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -86,7 +86,7 @@ msgstr "" msgid "Case material" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -107,7 +107,7 @@ msgstr "" msgid "Corrosive" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -292,7 +292,6 @@ msgid "No tags" msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -318,7 +317,7 @@ msgstr "" msgid "Pressure" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -434,7 +433,7 @@ msgstr "" msgid "No tags for this container" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -520,8 +519,8 @@ msgstr "" msgid "Shot log" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -615,14 +614,15 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "" @@ -803,7 +803,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -990,13 +990,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1006,7 +1006,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format, fuzzy msgid "Original Count" msgstr "" @@ -1026,7 +1026,7 @@ msgstr "" msgid "Total packs:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "" @@ -1036,12 +1036,12 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1213,7 +1213,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1232,3 +1232,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index 370ef1ca..bb8d33ba 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -58,7 +58,7 @@ msgstr "" msgid "Are you sure you want to delete %{name}?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/priv/gettext/es/LC_MESSAGES/actions.po b/priv/gettext/es/LC_MESSAGES/actions.po index 4c19290b..43961847 100644 --- a/priv/gettext/es/LC_MESSAGES/actions.po +++ b/priv/gettext/es/LC_MESSAGES/actions.po @@ -169,7 +169,7 @@ msgstr "Preparar munición" msgid "Why not get some ready to shoot?" msgstr "¿Por qué no preparar parte para disparar?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -222,7 +222,7 @@ msgid "add an ammo type first" msgstr "añade primero un tipo de munición" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -313,7 +313,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -334,7 +334,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Stage" msgstr "Preparar munición" @@ -345,7 +345,7 @@ msgstr "Preparar munición" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -355,18 +355,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format, fuzzy msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format, fuzzy msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format, fuzzy msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po index 55130406..9f446806 100644 --- a/priv/gettext/es/LC_MESSAGES/default.po +++ b/priv/gettext/es/LC_MESSAGES/default.po @@ -38,7 +38,7 @@ msgstr "Aministradores:" msgid "Ammo" msgstr "Munición" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -90,7 +90,7 @@ msgstr "Cartucho" msgid "Case material" msgstr "Material del casquillo" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -111,7 +111,7 @@ msgstr "Contenedores" msgid "Corrosive" msgstr "Corrosiva" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -296,7 +296,6 @@ msgid "No tags" msgstr "Sin etiquetas" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -322,7 +321,7 @@ msgstr "En la estantería" msgid "Pressure" msgstr "Presión" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -441,7 +440,7 @@ msgstr "Tus datos se quedan contigo, sin excepciones" msgid "No tags for this container" msgstr "Contenedor sin etiquetas" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -527,8 +526,8 @@ msgstr "No hay otros contenedores" msgid "Shot log" msgstr "Registro de tiros" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -622,14 +621,15 @@ msgstr "Editar etiquetas de %{name}" msgid "Rounds:" msgstr "Balas:" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "No hay información de coste" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "% restantes" @@ -811,7 +811,7 @@ msgstr "Contenedor:" msgid "Show used" msgstr "Mostrar usadas" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -998,13 +998,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "Editar %{ammo_type_name}" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "Vacio" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1014,7 +1014,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format msgid "Original Count" msgstr "Cantidad Original" @@ -1034,7 +1034,7 @@ msgstr "Menu principal" msgid "Total packs:" msgstr "Paquetes totales:" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "Usada por última vez en" @@ -1044,12 +1044,12 @@ msgstr "Usada por última vez en" msgid "Last used on:" msgstr "Usada por última vez en:" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "Nunca usada" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1232,7 +1232,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1251,3 +1251,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/es/LC_MESSAGES/prompts.po b/priv/gettext/es/LC_MESSAGES/prompts.po index d38b5783..fc41be76 100644 --- a/priv/gettext/es/LC_MESSAGES/prompts.po +++ b/priv/gettext/es/LC_MESSAGES/prompts.po @@ -73,7 +73,7 @@ msgstr "Está seguro que desea eliminar %{email}? Esta acción es permanente!" msgid "Are you sure you want to delete %{name}?" msgstr "Está seguro que desea eliminar %{name}?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/priv/gettext/fr/LC_MESSAGES/actions.po b/priv/gettext/fr/LC_MESSAGES/actions.po index 51946c53..2e704dcd 100644 --- a/priv/gettext/fr/LC_MESSAGES/actions.po +++ b/priv/gettext/fr/LC_MESSAGES/actions.po @@ -169,7 +169,7 @@ msgstr "Munition préparée" msgid "Why not get some ready to shoot?" msgstr "Pourquoi pas en préparer pour tirer ?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -222,7 +222,7 @@ msgid "add an ammo type first" msgstr "Ajoutez d'abord un type de munitions" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -313,7 +313,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -334,7 +334,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Stage" msgstr "Munition préparée" @@ -345,7 +345,7 @@ msgstr "Munition préparée" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -355,18 +355,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format, fuzzy msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format, fuzzy msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format, fuzzy msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po index e7b3e2e5..6b2e2123 100644 --- a/priv/gettext/fr/LC_MESSAGES/default.po +++ b/priv/gettext/fr/LC_MESSAGES/default.po @@ -38,7 +38,7 @@ msgstr "Administrateur·ices :" msgid "Ammo" msgstr "Munition" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -90,7 +90,7 @@ msgstr "Cartouche" msgid "Case material" msgstr "Matériau de la caisse" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -111,7 +111,7 @@ msgstr "Conteneurs" msgid "Corrosive" msgstr "Corrosive" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -296,7 +296,6 @@ msgid "No tags" msgstr "Aucun tag" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -322,7 +321,7 @@ msgstr "Sur l’étagère" msgid "Pressure" msgstr "Pression" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -442,7 +441,7 @@ msgstr "Vos données restent avec vous, point final" msgid "No tags for this container" msgstr "Aucun tag pour ce conteneur" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -528,8 +527,8 @@ msgstr "Aucun autre conteneur" msgid "Shot log" msgstr "Évènements de tir" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -623,14 +622,15 @@ msgstr "Éditer les tags de %{name}" msgid "Rounds:" msgstr "Cartouches :" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "Aucune information de prix" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "% restante" @@ -812,7 +812,7 @@ msgstr "Conteneur" msgid "Show used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -999,13 +999,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "Éditer %{name}" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1015,7 +1015,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format, fuzzy msgid "Original Count" msgstr "Nombre original :" @@ -1035,7 +1035,7 @@ msgstr "" msgid "Total packs:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "" @@ -1045,12 +1045,12 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1233,7 +1233,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1252,3 +1252,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/fr/LC_MESSAGES/prompts.po b/priv/gettext/fr/LC_MESSAGES/prompts.po index bef6acd3..665c711d 100644 --- a/priv/gettext/fr/LC_MESSAGES/prompts.po +++ b/priv/gettext/fr/LC_MESSAGES/prompts.po @@ -74,7 +74,7 @@ msgstr "" msgid "Are you sure you want to delete %{name}?" msgstr "Êtes-vous certain·e de supprimer %{name} ?" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/priv/gettext/ga/LC_MESSAGES/actions.po b/priv/gettext/ga/LC_MESSAGES/actions.po index 60bf65d2..4857c5cc 100644 --- a/priv/gettext/ga/LC_MESSAGES/actions.po +++ b/priv/gettext/ga/LC_MESSAGES/actions.po @@ -167,7 +167,7 @@ msgstr "" msgid "Why not get some ready to shoot?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:104 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:105 #: lib/cannery_web/live/ammo_group_live/show.html.heex:103 #: lib/cannery_web/live/range_live/index.html.heex:45 #, elixir-autogen, elixir-format @@ -220,7 +220,7 @@ msgid "add an ammo type first" msgstr "" #: lib/cannery_web/components/move_ammo_group_component.ex:80 -#: lib/cannery_web/live/ammo_group_live/index.html.heex:121 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:122 #: lib/cannery_web/live/ammo_group_live/show.html.heex:96 #, elixir-autogen, elixir-format msgid "Move ammo" @@ -311,7 +311,7 @@ msgstr "" msgid "Edit %{tag_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:143 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:144 #: lib/cannery_web/live/ammo_group_live/show.html.heex:62 #, elixir-autogen, elixir-format msgid "Edit ammo group of %{ammo_group_count} bullets" @@ -332,7 +332,7 @@ msgstr "" msgid "Edit shot record of %{shot_group_count} shots" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:98 #, elixir-autogen, elixir-format, fuzzy msgid "Stage" msgstr "" @@ -343,7 +343,7 @@ msgstr "" msgid "Tag %{container_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:96 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:97 #, elixir-autogen, elixir-format msgid "Unstage" msgstr "" @@ -353,18 +353,18 @@ msgstr "" msgid "View %{ammo_type_name}" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:155 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:156 #, elixir-autogen, elixir-format, fuzzy msgid "Clone ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:170 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:171 #: lib/cannery_web/live/ammo_group_live/show.html.heex:76 #, elixir-autogen, elixir-format, fuzzy msgid "Delete ammo group of %{ammo_group_count} bullets" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:131 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:132 #, elixir-autogen, elixir-format, fuzzy msgid "View ammo group of %{ammo_group_count} bullets" msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/default.po b/priv/gettext/ga/LC_MESSAGES/default.po index 31e4d4bd..4e0b4aa2 100644 --- a/priv/gettext/ga/LC_MESSAGES/default.po +++ b/priv/gettext/ga/LC_MESSAGES/default.po @@ -36,7 +36,7 @@ msgstr "" msgid "Ammo" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:90 +#: lib/cannery_web/components/ammo_group_table_component.ex:108 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:22 #, elixir-autogen, elixir-format msgid "Ammo type" @@ -88,7 +88,7 @@ msgstr "" msgid "Case material" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:66 +#: lib/cannery_web/components/ammo_group_table_component.ex:72 #: lib/cannery_web/components/move_ammo_group_component.ex:67 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:59 #, elixir-autogen, elixir-format @@ -109,7 +109,7 @@ msgstr "" msgid "Corrosive" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:77 +#: lib/cannery_web/components/ammo_group_table_component.ex:100 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:28 #, elixir-autogen, elixir-format msgid "Count" @@ -294,7 +294,6 @@ msgid "No tags" msgstr "" #: lib/cannery_web/components/add_shot_group_component.html.heex:38 -#: lib/cannery_web/components/ammo_group_table_component.ex:82 #: lib/cannery_web/components/shot_group_table_component.ex:43 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:50 #: lib/cannery_web/live/ammo_group_live/show.ex:92 @@ -320,7 +319,7 @@ msgstr "" msgid "Pressure" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:79 +#: lib/cannery_web/components/ammo_group_table_component.ex:83 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:35 #, elixir-autogen, elixir-format msgid "Price paid" @@ -436,7 +435,7 @@ msgstr "" msgid "No tags for this container" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:73 +#: lib/cannery_web/components/ammo_group_table_component.ex:79 #: lib/cannery_web/components/core_components/topbar.html.heex:66 #, elixir-autogen, elixir-format msgid "Range" @@ -522,8 +521,8 @@ msgstr "" msgid "Shot log" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:154 -#: lib/cannery_web/components/ammo_group_table_component.ex:230 +#: lib/cannery_web/components/ammo_group_table_component.ex:173 +#: lib/cannery_web/components/ammo_group_table_component.ex:251 #: lib/cannery_web/components/ammo_type_table_component.ex:235 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:45 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:50 @@ -617,14 +616,15 @@ msgstr "" msgid "Rounds:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:227 +#: lib/cannery_web/components/ammo_group_table_component.ex:170 +#: lib/cannery_web/components/ammo_group_table_component.ex:248 #: lib/cannery_web/components/ammo_type_table_component.ex:234 #: lib/cannery_web/live/ammo_type_live/show.html.heex:139 #, elixir-autogen, elixir-format msgid "No cost information" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:81 +#: lib/cannery_web/components/ammo_group_table_component.ex:92 #, elixir-autogen, elixir-format msgid "% left" msgstr "" @@ -805,7 +805,7 @@ msgstr "" msgid "Show used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:188 +#: lib/cannery_web/components/ammo_group_table_component.ex:206 #: lib/cannery_web/live/ammo_group_live/show.html.heex:19 #, elixir-autogen, elixir-format msgid "%{percentage}%" @@ -992,13 +992,13 @@ msgstr "" msgid "Edit %{ammo_type_name}" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:234 +#: lib/cannery_web/components/ammo_group_table_component.ex:254 #: lib/cannery_web/components/core_components/ammo_group_card.html.heex:17 #, elixir-autogen, elixir-format msgid "Empty" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:80 +#: lib/cannery_web/components/ammo_group_table_component.ex:84 #, elixir-autogen, elixir-format msgid "CPR" msgstr "" @@ -1008,7 +1008,7 @@ msgstr "" msgid "CPR:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:78 +#: lib/cannery_web/components/ammo_group_table_component.ex:91 #, elixir-autogen, elixir-format, fuzzy msgid "Original Count" msgstr "" @@ -1028,7 +1028,7 @@ msgstr "" msgid "Total packs:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:59 +#: lib/cannery_web/components/ammo_group_table_component.ex:65 #, elixir-autogen, elixir-format msgid "Last used on" msgstr "" @@ -1038,12 +1038,12 @@ msgstr "" msgid "Last used on:" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:172 +#: lib/cannery_web/components/ammo_group_table_component.ex:191 #, elixir-autogen, elixir-format msgid "Never used" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:58 +#: lib/cannery_web/components/ammo_group_table_component.ex:64 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:42 #, elixir-autogen, elixir-format msgid "Purchased on" @@ -1224,7 +1224,7 @@ msgstr "" msgid "Really great weather" msgstr "" -#: lib/cannery_web/components/ammo_group_table_component.ex:54 +#: lib/cannery_web/components/ammo_group_table_component.ex:60 #: lib/cannery_web/components/ammo_type_table_component.ex:121 #: lib/cannery_web/components/container_table_component.ex:67 #: lib/cannery_web/components/move_ammo_group_component.ex:70 @@ -1243,3 +1243,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "Log out" msgstr "" + +#: lib/cannery_web/components/ammo_group_table_component.ex:100 +#, elixir-autogen, elixir-format +msgid "Current Count" +msgstr "" diff --git a/priv/gettext/ga/LC_MESSAGES/prompts.po b/priv/gettext/ga/LC_MESSAGES/prompts.po index 81c46602..30491bcb 100644 --- a/priv/gettext/ga/LC_MESSAGES/prompts.po +++ b/priv/gettext/ga/LC_MESSAGES/prompts.po @@ -69,7 +69,7 @@ msgstr "" msgid "Are you sure you want to delete %{name}?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index bfe606f4..45394eb1 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -58,7 +58,7 @@ msgstr "" msgid "Are you sure you want to delete %{name}?" msgstr "" -#: lib/cannery_web/live/ammo_group_live/index.html.heex:168 +#: lib/cannery_web/live/ammo_group_live/index.html.heex:169 #: lib/cannery_web/live/ammo_group_live/show.html.heex:74 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this ammo?" diff --git a/test/cannery_web/live/ammo_group_live_test.exs b/test/cannery_web/live/ammo_group_live_test.exs index c33fcdb7..4757d7cc 100644 --- a/test/cannery_web/live/ammo_group_live_test.exs +++ b/test/cannery_web/live/ammo_group_live_test.exs @@ -116,7 +116,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index)) assert html =~ dgettext("prompts", "Ammo added successfully") - assert html =~ "42" + assert html =~ "\n42\n" end test "saves multiple new ammo_groups", %{conn: conn, current_user: current_user} do @@ -202,7 +202,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index)) assert html =~ dgettext("prompts", "Ammo updated successfully") - assert html =~ "43" + assert html =~ "\n43\n" end test "clones ammo_group in listing", %{conn: conn, ammo_group: ammo_group} do @@ -229,7 +229,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index)) assert html =~ dgettext("prompts", "Ammo added successfully") - assert html =~ "42" + assert html =~ "\n42\n" assert html =~ gettext("$%{amount}", amount: display_currency(120.5)) end @@ -257,7 +257,7 @@ defmodule CanneryWeb.AmmoGroupLiveTest do |> follow_redirect(conn, Routes.ammo_group_index_path(conn, :index)) assert html =~ dgettext("prompts", "Ammo added successfully") - assert html =~ "43" + assert html =~ "\n43\n" assert html =~ gettext("$%{amount}", amount: display_currency(120.5)) end diff --git a/test/cannery_web/live/container_live_test.exs b/test/cannery_web/live/container_live_test.exs index 20c73042..2955c3a3 100644 --- a/test/cannery_web/live/container_live_test.exs +++ b/test/cannery_web/live/container_live_test.exs @@ -273,7 +273,7 @@ defmodule CanneryWeb.ContainerLiveTest do {:ok, _show_live, html} = live(conn, Routes.container_show_path(conn, :show, container)) assert html =~ ammo_type_name - assert html =~ "some ammo group" + assert html =~ "\n20\n" end test "displays ammo group in table", @@ -286,7 +286,7 @@ defmodule CanneryWeb.ContainerLiveTest do |> render_click() assert html =~ ammo_type_name - assert html =~ "some ammo group" + assert html =~ "\n20\n" end end @@ -298,7 +298,7 @@ defmodule CanneryWeb.ContainerLiveTest do {:ok, show_live, html} = live(conn, Routes.container_show_path(conn, :show, container)) assert html =~ dgettext("actions", "Show used") - refute html =~ "some ammo group" + refute html =~ "\n20\n" html = show_live @@ -306,7 +306,7 @@ defmodule CanneryWeb.ContainerLiveTest do |> render_click() assert html =~ ammo_type_name - assert html =~ "some ammo group" + assert html =~ "\n20\n" assert html =~ "Empty" end @@ -320,7 +320,7 @@ defmodule CanneryWeb.ContainerLiveTest do |> render_click() assert html =~ dgettext("actions", "Show used") - refute html =~ "some ammo group" + refute html =~ "\n20\n" html = show_live @@ -328,7 +328,7 @@ defmodule CanneryWeb.ContainerLiveTest do |> render_click() assert html =~ ammo_type_name - assert html =~ "some ammo group" + assert html =~ "\n20\n" assert html =~ "Empty" end end