use better wording

This commit is contained in:
shibao 2022-11-10 21:25:03 -05:00
parent c828def2b2
commit 0dbd1af553
9 changed files with 268 additions and 212 deletions

View File

@ -94,18 +94,18 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
end)
end)
|> Kernel.++([
%{label: gettext("Total # of rounds"), key: :round_count, type: :round_count}
%{label: gettext("Rounds"), key: :round_count, type: :round_count}
])
|> Kernel.++(
if show_used do
[
%{
label: gettext("Used Total # of rounds"),
label: gettext("Used rounds"),
key: :used_round_count,
type: :used_round_count
},
%{
label: gettext("Historical Total # of rounds"),
label: gettext("Total ever rounds"),
key: :historical_round_count,
type: :historical_round_count
}
@ -114,17 +114,17 @@ defmodule CanneryWeb.AmmoTypeLive.Index do
[]
end
)
|> Kernel.++([%{label: gettext("Total # of ammo"), key: :ammo_count, type: :ammo_count}])
|> Kernel.++([%{label: gettext("Packs"), key: :ammo_count, type: :ammo_count}])
|> Kernel.++(
if show_used do
[
%{
label: gettext("Used Total # of ammo"),
label: gettext("Used packs"),
key: :used_ammo_count,
type: :used_ammo_count
},
%{
label: gettext("Historical Total # of ammo"),
label: gettext("Total ever packs"),
key: :historical_ammo_count,
type: :historical_ammo_count
}

View File

@ -78,7 +78,7 @@
<% end %>
<h3 class="title text-lg">
<%= gettext("Current # of rounds:") %>
<%= gettext("Rounds:") %>
</h3>
<span class="text-primary-600">
@ -86,13 +86,45 @@
</span>
<h3 class="title text-lg">
<%= gettext("Total rounds shot:") %>
<%= gettext("Used rounds:") %>
</h3>
<span class="text-primary-600">
<%= @ammo_type |> Ammo.get_used_count_for_ammo_type(@current_user) %>
</span>
<h3 class="title text-lg">
<%= gettext("Total ever rounds:") %>
</h3>
<span class="text-primary-600">
<%= @ammo_type |> Ammo.get_historical_count_for_ammo_type(@current_user) %>
</span>
<h3 class="title text-lg">
<%= gettext("Packs:") %>
</h3>
<span class="text-primary-600">
<%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user) %>
</span>
<h3 class="title text-lg">
<%= gettext("Used packs:") %>
</h3>
<span class="text-primary-600">
<%= @ammo_type |> Ammo.get_used_ammo_groups_count_for_type(@current_user) %>
</span>
<h3 class="title text-lg">
<%= gettext("Total ever packs:") %>
</h3>
<span class="text-primary-600">
<%= @ammo_type |> Ammo.get_ammo_groups_count_for_type(@current_user, true) %>
</span>
<h3 class="title text-lg">
<%= gettext("Added on:") %>
</h3>

View File

@ -59,7 +59,7 @@ msgid "Ammo type"
msgstr "Munitionsarten"
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr "Durchschnittlicher Kaufpreis"
@ -317,7 +317,7 @@ msgstr "Keine Munition"
msgid "No Ammo Types"
msgstr "Keine Munitionsarten"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr "Keine Munition dieser Art"
@ -600,7 +600,7 @@ msgstr "Schießkladde"
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr "$%{amount}"
@ -701,6 +701,7 @@ msgid "Edit %{name} tags"
msgstr "Editiere %{name} Tags"
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format
msgid "Rounds:"
@ -712,7 +713,7 @@ msgid "Show %{name}"
msgstr "Zeige %{name}"
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr "Keine Preisinformationen"
@ -747,21 +748,6 @@ msgstr "Prozent verbleibend:"
msgid "Rounds used"
msgstr "Patronen verbraucht"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr "Derzeitige # an Patronen:"
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr "Summe aller Patronen"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr "Summe abgegebener Schüsse:"
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -810,7 +796,7 @@ msgstr "Hinzugefügt am"
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr "Hinzugefügt am:"
@ -895,6 +881,7 @@ msgid "This ammo is not in a container"
msgstr "Diese Munitionsgruppe ist nicht in einem Behälter"
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -916,11 +903,6 @@ msgstr ""
msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format, fuzzy
msgid "Total # of ammo"
msgstr "Summe aller Patronen"
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format, fuzzy
msgid "Container:"
@ -928,7 +910,7 @@ msgstr "Behälter"
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -974,11 +956,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr "Patronen abgefeuert"
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format, fuzzy
msgid "Packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds"
@ -991,20 +975,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
msgstr ""
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds"
msgstr "Summe aller Patronen"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds:"
msgstr "Summe abgegebener Schüsse:"
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of ammo"
msgstr "Summe aller Patronen"
#, elixir-autogen, elixir-format
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of rounds"
msgstr "Summe aller Patronen"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format, fuzzy
msgid "Used rounds:"
msgstr ""

View File

@ -44,7 +44,7 @@ msgid "Ammo type"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr ""
@ -302,7 +302,7 @@ msgstr ""
msgid "No Ammo Types"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr ""
@ -583,7 +583,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr ""
@ -684,6 +684,7 @@ msgid "Edit %{name} tags"
msgstr ""
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format
msgid "Rounds:"
@ -695,7 +696,7 @@ msgid "Show %{name}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr ""
@ -730,21 +731,6 @@ msgstr ""
msgid "Rounds used"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr ""
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -793,7 +779,7 @@ msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr ""
@ -878,6 +864,7 @@ msgid "This ammo is not in a container"
msgstr ""
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -899,11 +886,6 @@ msgstr ""
msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format
msgid "Total # of ammo"
msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format
msgid "Container:"
@ -911,7 +893,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -957,11 +939,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format
msgid "Packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format
msgid "Rounds"
@ -974,20 +958,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
msgid "Total ever rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format
msgid "Total ever rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format
msgid "Used Total # of ammo"
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format
msgid "Used Total # of rounds"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Used rounds:"
msgstr ""

View File

@ -45,7 +45,7 @@ msgid "Ammo type"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr ""
@ -303,7 +303,7 @@ msgstr ""
msgid "No Ammo Types"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr ""
@ -584,7 +584,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr ""
@ -685,6 +685,7 @@ msgid "Edit %{name} tags"
msgstr ""
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds:"
@ -696,7 +697,7 @@ msgid "Show %{name}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr ""
@ -731,21 +732,6 @@ msgstr ""
msgid "Rounds used"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr ""
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -794,7 +780,7 @@ msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr ""
@ -879,6 +865,7 @@ msgid "This ammo is not in a container"
msgstr ""
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -900,11 +887,6 @@ msgstr ""
msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format, fuzzy
msgid "Total # of ammo"
msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format, fuzzy
msgid "Container:"
@ -912,7 +894,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -958,11 +940,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format, fuzzy
msgid "Packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds"
@ -975,20 +959,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of ammo"
#, elixir-autogen, elixir-format
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of rounds"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format, fuzzy
msgid "Used rounds:"
msgstr ""

View File

@ -59,7 +59,7 @@ msgid "Ammo type"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr ""
@ -317,7 +317,7 @@ msgstr ""
msgid "No Ammo Types"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr ""
@ -598,7 +598,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr ""
@ -699,6 +699,7 @@ msgid "Edit %{name} tags"
msgstr ""
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format
msgid "Rounds:"
@ -710,7 +711,7 @@ msgid "Show %{name}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr ""
@ -745,21 +746,6 @@ msgstr ""
msgid "Rounds used"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr ""
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -808,7 +794,7 @@ msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr ""
@ -893,6 +879,7 @@ msgid "This ammo is not in a container"
msgstr ""
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -914,11 +901,6 @@ msgstr ""
msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format, fuzzy
msgid "Total # of ammo"
msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format, fuzzy
msgid "Container:"
@ -926,7 +908,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -972,11 +954,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format, fuzzy
msgid "Packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds"
@ -989,20 +973,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of ammo"
#, elixir-autogen, elixir-format
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of rounds"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format, fuzzy
msgid "Used rounds:"
msgstr ""

View File

@ -59,7 +59,7 @@ msgid "Ammo type"
msgstr "Type de munition"
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr "Prix acheté moyen"
@ -317,7 +317,7 @@ msgstr "Aucune munition"
msgid "No Ammo Types"
msgstr "Aucun type de munition"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr "Aucune munition pour ce type"
@ -602,7 +602,7 @@ msgstr "Évènements de tir"
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr "%{amount}$"
@ -703,6 +703,7 @@ msgid "Edit %{name} tags"
msgstr "Éditer les tags de %{name}"
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format
msgid "Rounds:"
@ -714,7 +715,7 @@ msgid "Show %{name}"
msgstr "Montrer %{name}"
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr "Aucune information de prix"
@ -749,21 +750,6 @@ msgstr "Pourcentage restant:"
msgid "Rounds used"
msgstr "Cartouches utilisées"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr "Quantité actuelle de cartouches:"
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr "Quantité de cartouches"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr "Nombre totale de cartouches tirées:"
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -812,7 +798,7 @@ msgstr "Ajouté le"
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr "Ajouté le:"
@ -897,6 +883,7 @@ msgid "This ammo is not in a container"
msgstr "Ce groupe de munition nest pas dans un conteneur"
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -919,11 +906,6 @@ msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
"Laissez \"Utilisations restantes\" vide pour rendre l'invitation illimitée"
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format, fuzzy
msgid "Total # of ammo"
msgstr "Quantité de cartouches"
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format, fuzzy
msgid "Container:"
@ -931,7 +913,7 @@ msgstr "Conteneur"
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -977,11 +959,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr "Cartouches tirées"
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format, fuzzy
msgid "Packs"
msgstr "Packages:"
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds"
@ -994,20 +978,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
msgstr ""
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds"
msgstr "Quantité de cartouches"
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds:"
msgstr "Nombre totale de cartouches tirées:"
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of ammo"
msgstr "Quantité de cartouches"
#, elixir-autogen, elixir-format
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of rounds"
msgstr "Quantité de cartouches"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format, fuzzy
msgid "Used rounds:"
msgstr ""

View File

@ -55,7 +55,7 @@ msgid "Ammo type"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:137
#: lib/cannery_web/live/ammo_type_live/show.html.heex:106
#: lib/cannery_web/live/ammo_type_live/show.html.heex:138
#, elixir-autogen, elixir-format
msgid "Average Price paid"
msgstr ""
@ -313,7 +313,7 @@ msgstr ""
msgid "No Ammo Types"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:134
#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
#, elixir-autogen, elixir-format
msgid "No ammo for this type"
msgstr ""
@ -594,7 +594,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/show.html.heex:37
#: lib/cannery_web/live/ammo_group_live/show.html.heex:44
#: lib/cannery_web/live/ammo_type_live/index.ex:179
#: lib/cannery_web/live/ammo_type_live/show.html.heex:110
#: lib/cannery_web/live/ammo_type_live/show.html.heex:142
#, elixir-autogen, elixir-format
msgid "$%{amount}"
msgstr ""
@ -695,6 +695,7 @@ msgid "Edit %{name} tags"
msgstr ""
#: lib/cannery_web/components/container_card.ex:63
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#: lib/cannery_web/live/container_live/show.html.heex:32
#, elixir-autogen, elixir-format
msgid "Rounds:"
@ -706,7 +707,7 @@ msgid "Show %{name}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:178
#: lib/cannery_web/live/ammo_type_live/show.html.heex:116
#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
#, elixir-autogen, elixir-format
msgid "No cost information"
msgstr ""
@ -741,21 +742,6 @@ msgstr ""
msgid "Rounds used"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:81
#, elixir-autogen, elixir-format
msgid "Current # of rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#, elixir-autogen, elixir-format
msgid "Total # of rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format
msgid "Total rounds shot:"
msgstr ""
#: lib/cannery_web/controllers/user_confirmation_controller.ex:8
#, elixir-autogen, elixir-format
msgid "Confirm your account"
@ -804,7 +790,7 @@ msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:49
#: lib/cannery_web/live/ammo_group_live/show.html.heex:30
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#: lib/cannery_web/live/ammo_type_live/show.html.heex:129
#, elixir-autogen, elixir-format
msgid "Added on:"
msgstr ""
@ -889,6 +875,7 @@ msgid "This ammo is not in a container"
msgstr ""
#: lib/cannery_web/components/container_card.ex:58
#: lib/cannery_web/live/ammo_type_live/show.html.heex:105
#: lib/cannery_web/live/container_live/show.html.heex:27
#, elixir-autogen, elixir-format
msgid "Packs:"
@ -910,11 +897,6 @@ msgstr ""
msgid "Leave \"Uses left\" blank to make invite unlimited"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#, elixir-autogen, elixir-format
msgid "Total # of ammo"
msgstr ""
#: lib/cannery_web/components/ammo_group_card.ex:71
#, elixir-autogen, elixir-format
msgid "Container:"
@ -922,7 +904,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_group_live/index.html.heex:48
#: lib/cannery_web/live/ammo_type_live/index.html.heex:23
#: lib/cannery_web/live/ammo_type_live/show.html.heex:126
#: lib/cannery_web/live/ammo_type_live/show.html.heex:158
#, elixir-autogen, elixir-format
msgid "Show used"
msgstr ""
@ -968,11 +950,13 @@ msgstr ""
msgid "Rounds shot: %{count}"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:117
#: lib/cannery_web/live/container_live/index.ex:125
#, elixir-autogen, elixir-format, fuzzy
msgid "Packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:97
#: lib/cannery_web/live/container_live/index.ex:126
#, elixir-autogen, elixir-format, fuzzy
msgid "Rounds"
@ -985,20 +969,40 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:127
#, elixir-autogen, elixir-format
msgid "Historical Total # of ammo"
msgid "Total ever packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:121
#, elixir-autogen, elixir-format
msgid "Total ever packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:108
#, elixir-autogen, elixir-format
msgid "Historical Total # of rounds"
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:97
#, elixir-autogen, elixir-format, fuzzy
msgid "Total ever rounds:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:122
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of ammo"
#, elixir-autogen, elixir-format
msgid "Used packs"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
#, elixir-autogen, elixir-format
msgid "Used packs:"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.ex:103
#, elixir-autogen, elixir-format, fuzzy
msgid "Used Total # of rounds"
msgid "Used rounds"
msgstr ""
#: lib/cannery_web/live/ammo_type_live/show.html.heex:89
#, elixir-autogen, elixir-format, fuzzy
msgid "Used rounds:"
msgstr ""

View File

@ -189,17 +189,17 @@ defmodule CanneryWeb.AmmoTypeLiveTest do
{:ok, show_live, html} = live(conn, Routes.ammo_type_index_path(conn, :index))
assert html =~ dgettext("actions", "Show used")
refute html =~ gettext("Used Total # of rounds")
refute html =~ gettext("Historical Total # of rounds")
refute html =~ gettext("Used Total # of ammo")
refute html =~ gettext("Historical Total # of ammo")
refute html =~ gettext("Used rounds")
refute html =~ gettext("Total ever rounds")
refute html =~ gettext("Used packs")
refute html =~ gettext("Total ever packs")
html = show_live |> element("[data-qa=\"toggle_show_used\"]") |> render_click()
assert html =~ gettext("Used Total # of rounds")
assert html =~ gettext("Historical Total # of rounds")
assert html =~ gettext("Used Total # of ammo")
assert html =~ gettext("Historical Total # of ammo")
assert html =~ gettext("Used rounds")
assert html =~ gettext("Total ever rounds")
assert html =~ gettext("Used packs")
assert html =~ gettext("Total ever packs")
assert html =~ "20"
assert html =~ "0"