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

rename ammo groups to packs everywhere

Browse Source
This commit is contained in:
shibao
2023-03-29 23:49:45 -04:00
parent 0544b58ab6
commit 4b6d0952f8
35 changed files with 160 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cannery_web/components/move_pack_component.ex
View File

@@ -1,6 +1,6 @@
defmodule CanneryWeb.Components.MovePackComponent do
@moduledoc """
Livecomponent that can move an ammo group to another container
Livecomponent that can move a pack to another container
"""
use CanneryWeb, :live_component

2
lib/cannery_web/components/pack_table_component.ex
View File

@@ -1,6 +1,6 @@
defmodule CanneryWeb.Components.PackTableComponent do
@moduledoc """
A component that displays a list of ammo groups
A component that displays a list of packs
"""
use CanneryWeb, :live_component
alias Cannery.{Accounts.User, Ammo.Pack, ComparableDate}

4
lib/cannery_web/live/ammo_type_live/show.html.heex
View File

@@ -203,9 +203,7 @@
navigate={Routes.pack_show_path(Endpoint, :show, pack)}
class="text-primary-600 link"
aria-label={
dgettext("actions", "View ammo group of %{pack_count} bullets",
pack_count: pack_count
)
dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
}
>
<i class="fa-fw fa-lg fas fa-eye"></i>

2
lib/cannery_web/live/pack_live/form_component.ex
View File

@@ -4,7 +4,7 @@ defmodule CanneryWeb.PackLive.FormComponent do
"""
use CanneryWeb, :live_component
alias Cannery.Ammo.{Pack, AmmoType}
alias Cannery.Ammo.{AmmoType, Pack}
alias Cannery.{Accounts.User, Ammo, Containers, Containers.Container}
alias Ecto.Changeset
alias Phoenix.LiveView.Socket

2
lib/cannery_web/live/pack_live/index.ex
View File

@@ -148,7 +148,7 @@ defmodule CanneryWeb.PackLive.Index do
}
} = socket
) do
# get total number of ammo groups to determine whether to display onboarding
# get total number of packs to determine whether to display onboarding
# prompts
packs_count = Ammo.get_packs_count!(current_user, true)
packs = Ammo.list_packs(search, class, current_user, show_used)

12
lib/cannery_web/live/pack_live/index.html.heex
View File

@@ -151,9 +151,7 @@
navigate={Routes.pack_show_path(Endpoint, :show, pack)}
class="text-primary-600 link"
aria-label={
dgettext("actions", "View ammo group of %{pack_count} bullets",
pack_count: pack_count
)
dgettext("actions", "View pack of %{pack_count} bullets", pack_count: pack_count)
}
>
<i class="fa-fw fa-lg fas fa-eye"></i>
@@ -163,9 +161,7 @@
patch={Routes.pack_index_path(Endpoint, :edit, pack)}
class="text-primary-600 link"
aria-label={
dgettext("actions", "Edit ammo group of %{pack_count} bullets",
pack_count: pack_count
)
dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: pack_count)
}
>
<i class="fa-fw fa-lg fas fa-edit"></i>
@@ -175,7 +171,7 @@
patch={Routes.pack_index_path(Endpoint, :clone, pack)}
class="text-primary-600 link"
aria-label={
dgettext("actions", "Clone ammo group of %{pack_count} bullets",
dgettext("actions", "Clone pack of %{pack_count} bullets",
pack_count: pack_count
)
}
@@ -190,7 +186,7 @@
phx-value-id={pack.id}
data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
aria-label={
dgettext("actions", "Delete ammo group of %{pack_count} bullets",
dgettext("actions", "Delete pack of %{pack_count} bullets",
pack_count: pack_count
)
}

6
lib/cannery_web/live/pack_live/show.html.heex
View File

@@ -59,7 +59,7 @@
patch={Routes.pack_show_path(Endpoint, :edit, @pack)}
class="mx-4 my-2 text-primary-600 link"
aria-label={
dgettext("actions", "Edit ammo group of %{pack_count} bullets", pack_count: @pack.count)
dgettext("actions", "Edit pack of %{pack_count} bullets", pack_count: @pack.count)
}
>
<i class="fa-fw fa-lg fas fa-edit"></i>
@@ -71,9 +71,7 @@
phx-click="delete"
data-confirm={dgettext("prompts", "Are you sure you want to delete this ammo?")}
aria-label={
dgettext("actions", "Delete ammo group of %{pack_count} bullets",
pack_count: @pack.count
)
dgettext("actions", "Delete pack of %{pack_count} bullets", pack_count: @pack.count)
}
>
<i class="fa-fw fa-lg fas fa-trash"></i>