aaron_nad/cannery
1
0
Fork 0
forked from shibao/cannery
Code Pull Requests Activity

use better wording

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cannery_web/live/ammo_type_live/index.ex
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
}

36
lib/cannery_web/live/ammo_type_live/show.html.heex
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>