rename ammo type to type

2023-03-30 21:53:52 -04:00
parent 98775359af
commit c33f15603b
59 changed files with 1616 additions and 1677 deletions
--- a/priv/gettext/en/LC_MESSAGES/actions.po
+++ b/priv/gettext/en/LC_MESSAGES/actions.po
@@ -82,11 +82,6 @@ msgstr ""
 msgid "Make your first tag!"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
-#, elixir-autogen, elixir-format
-msgid "New Ammo type"
-msgstr ""
-
 #: lib/cannery_web/live/container_live/index.html.heex:17
 #, elixir-autogen, elixir-format
 msgid "New Container"
@@ -203,11 +198,6 @@ msgstr ""
 msgid "View in Catalog"
 msgstr ""

-#: lib/cannery_web/live/pack_live/index.html.heex:24
-#, elixir-autogen, elixir-format
-msgid "add an ammo type first"
-msgstr ""
-
 #: lib/cannery_web/components/move_pack_component.ex:78
 #: lib/cannery_web/live/pack_live/index.html.heex:144
 #: lib/cannery_web/live/pack_live/show.html.heex:89
@@ -237,11 +227,6 @@ msgstr ""
 msgid "Export Data as JSON"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:110
-#, elixir-autogen, elixir-format
-msgid "Clone %{ammo_type_name}"
-msgstr ""
-
 #: lib/cannery_web/live/container_live/index.html.heex:87
 #: lib/cannery_web/live/container_live/index.html.heex:145
 #, elixir-autogen, elixir-format
@@ -253,12 +238,6 @@ msgstr ""
 msgid "Copy invite link for %{invite_name}"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:129
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:36
-#, elixir-autogen, elixir-format
-msgid "Delete %{ammo_type_name}"
-msgstr ""
-
 #: lib/cannery_web/live/container_live/index.html.heex:104
 #: lib/cannery_web/live/container_live/index.html.heex:162
 #: lib/cannery_web/live/container_live/show.html.heex:48
@@ -276,12 +255,6 @@ msgstr ""
 msgid "Delete invite for %{invite_name}"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:100
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:19
-#, elixir-autogen, elixir-format
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
 #: lib/cannery_web/live/container_live/index.html.heex:77
 #: lib/cannery_web/live/container_live/index.html.heex:135
 #: lib/cannery_web/live/container_live/show.html.heex:35
@@ -315,11 +288,6 @@ msgstr ""
 msgid "Unstage"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:90
-#, elixir-autogen, elixir-format
-msgid "View %{ammo_type_name}"
-msgstr ""
-
 #: lib/cannery_web/live/pack_live/index.html.heex:174
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Clone pack of %{pack_count} bullets"
@@ -337,7 +305,7 @@ msgstr ""
 msgid "Edit pack of %{pack_count} bullets"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:206
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:204
 #: lib/cannery_web/live/pack_live/index.html.heex:154
 #, elixir-autogen, elixir-format, fuzzy
 msgid "View pack of %{pack_count} bullets"
@@ -354,3 +322,35 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit shot record of %{shot_record_count} shots"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:105
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Clone %{type_name}"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:35
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Delete %{type_name}"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:97
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:19
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit %{type_name}"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:17
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Type"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:89
+#, elixir-autogen, elixir-format, fuzzy
+msgid "View %{type_name}"
+msgstr ""
+
+#: lib/cannery_web/live/pack_live/index.html.heex:24
+#, elixir-autogen, elixir-format, fuzzy
+msgid "add a type first"
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -34,12 +34,6 @@ msgstr ""
 msgid "Ammo"
 msgstr ""

-#: lib/cannery_web/components/pack_table_component.ex:95
-#: lib/cannery_web/live/pack_live/form_component.html.heex:22
-#, elixir-autogen, elixir-format
-msgid "Ammo type"
-msgstr ""
-
 #: lib/cannery_web/live/tag_live/form_component.html.heex:25
 #, elixir-autogen, elixir-format
 msgid "Background color"
@@ -236,12 +230,6 @@ msgstr ""
 msgid "Name"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.ex:36
-#: lib/cannery_web/live/ammo_type_live/index.ex:44
-#, elixir-autogen, elixir-format
-msgid "New Ammo type"
-msgstr ""
-
 #: lib/cannery_web/live/container_live/index.ex:32
 #: lib/cannery_web/live/container_live/index.ex:39
 #, elixir-autogen, elixir-format
@@ -263,7 +251,7 @@ msgstr ""
 msgid "No Ammo"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:180
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:178
 #, elixir-autogen, elixir-format
 msgid "No ammo for this type"
 msgstr ""
@@ -397,7 +385,9 @@ msgstr ""

 #: lib/cannery_web/components/container_table_component.ex:48
 #: lib/cannery_web/components/move_pack_component.ex:66
+#: lib/cannery_web/components/pack_table_component.ex:95
 #: lib/cannery_web/live/container_live/form_component.html.heex:39
+#: lib/cannery_web/live/pack_live/form_component.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
@@ -507,7 +497,7 @@ msgstr ""
 #: lib/cannery_web/components/core_components/pack_card.html.heex:47
 #: lib/cannery_web/components/pack_table_component.ex:163
 #: lib/cannery_web/components/pack_table_component.ex:246
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:152
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:150
 #: lib/cannery_web/live/pack_live/show.html.heex:37
 #: lib/cannery_web/live/pack_live/show.html.heex:42
 #, elixir-autogen, elixir-format
@@ -590,7 +580,7 @@ msgid "Edit %{name} tags"
 msgstr ""

 #: lib/cannery_web/components/core_components/container_card.html.heex:37
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:87
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:85
 #: lib/cannery_web/live/container_live/show.html.heex:27
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Rounds:"
@@ -599,7 +589,7 @@ msgstr ""
 #: lib/cannery_web/components/ammo_type_table_component.ex:260
 #: lib/cannery_web/components/pack_table_component.ex:160
 #: lib/cannery_web/components/pack_table_component.ex:242
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:156
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:154
 #, elixir-autogen, elixir-format
 msgid "No cost information"
 msgstr ""
@@ -670,7 +660,7 @@ msgstr ""
 msgid "Copies"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:139
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:137
 #, elixir-autogen, elixir-format
 msgid "Added on:"
 msgstr ""
@@ -750,7 +740,7 @@ msgid "This ammo is not in a container"
 msgstr ""

 #: lib/cannery_web/components/core_components/container_card.html.heex:32
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:113
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:111
 #: lib/cannery_web/live/container_live/show.html.heex:22
 #, elixir-autogen, elixir-format
 msgid "Packs:"
@@ -778,7 +768,7 @@ msgid "Container:"
 msgstr ""

 #: lib/cannery_web/live/ammo_type_live/index.html.heex:64
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:166
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:164
 #: lib/cannery_web/live/pack_live/index.html.heex:87
 #, elixir-autogen, elixir-format
 msgid "Show used"
@@ -807,7 +797,7 @@ msgstr ""
 msgid "Rounds"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:172
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:170
 #: lib/cannery_web/live/container_live/index.html.heex:40
 #: lib/cannery_web/live/container_live/show.html.heex:115
 #, elixir-autogen, elixir-format
@@ -819,7 +809,7 @@ msgstr ""
 msgid "Total ever packs"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:130
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:128
 #, elixir-autogen, elixir-format
 msgid "Total ever packs:"
 msgstr ""
@@ -829,7 +819,7 @@ msgstr ""
 msgid "Total ever rounds"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:104
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:102
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Total ever rounds:"
 msgstr ""
@@ -839,7 +829,7 @@ msgstr ""
 msgid "Used packs"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:120
 #, elixir-autogen, elixir-format
 msgid "Used packs:"
 msgstr ""
@@ -849,7 +839,7 @@ msgstr ""
 msgid "Used rounds"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:96
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:94
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Used rounds:"
 msgstr ""
@@ -955,17 +945,11 @@ msgid "UPC:"
 msgstr ""

 #: lib/cannery_web/components/ammo_type_table_component.ex:102
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:148
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:146
 #, elixir-autogen, elixir-format
 msgid "Average CPR"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.ex:28
-#: lib/cannery_web/live/ammo_type_live/show.ex:82
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Edit %{ammo_type_name}"
-msgstr ""
-
 #: lib/cannery_web/components/core_components/pack_card.html.heex:17
 #: lib/cannery_web/components/pack_table_component.ex:250
 #, elixir-autogen, elixir-format
@@ -1029,12 +1013,6 @@ msgstr ""
 msgid "Edit ammo"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:8
-#: lib/cannery_web/live/ammo_type_live/index.html.heex:71
-#, elixir-autogen, elixir-format, fuzzy
-msgid "No Ammo types"
-msgstr ""
-
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "Search catalog"
@@ -1294,14 +1272,14 @@ msgstr ""
 msgid "No ammo"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/show.html.heex:60
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
 #, elixir-autogen, elixir-format
 msgid "None specified"
 msgstr ""

 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:38
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:58
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
 #: lib/cannery_web/live/container_live/show.html.heex:106
 #: lib/cannery_web/live/pack_live/index.html.heex:61
 #: lib/cannery_web/live/range_live/index.html.heex:95
@@ -1326,7 +1304,7 @@ msgstr ""

 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:36
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:56
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
 #: lib/cannery_web/live/container_live/show.html.heex:104
 #: lib/cannery_web/live/pack_live/index.html.heex:59
 #: lib/cannery_web/live/range_live/index.html.heex:93
@@ -1380,7 +1358,7 @@ msgstr ""

 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:25
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:37
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:54
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:52
 #: lib/cannery_web/live/container_live/show.html.heex:105
 #: lib/cannery_web/live/pack_live/index.html.heex:60
 #: lib/cannery_web/live/range_live/index.html.heex:94
@@ -1424,7 +1402,7 @@ msgstr ""
 #: lib/cannery_web/components/ammo_type_table_component.ex:150
 #: lib/cannery_web/live/ammo_type_live/form_component.html.heex:21
 #: lib/cannery_web/live/ammo_type_live/index.html.heex:29
-#: lib/cannery_web/live/ammo_type_live/show.html.heex:48
+#: lib/cannery_web/live/ammo_type_live/show.html.heex:46
 #: lib/cannery_web/live/container_live/show.html.heex:97
 #: lib/cannery_web/live/pack_live/index.html.heex:50
 #: lib/cannery_web/live/range_live/index.html.heex:86
@@ -1448,3 +1426,21 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Edit Shot Record"
 msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:28
+#: lib/cannery_web/live/ammo_type_live/show.ex:82
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Edit %{type_name}"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.ex:36
+#: lib/cannery_web/live/ammo_type_live/index.ex:44
+#, elixir-autogen, elixir-format, fuzzy
+msgid "New Type"
+msgstr ""
+
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:8
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:71
+#, elixir-autogen, elixir-format, fuzzy
+msgid "No Types"
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/errors.po
+++ b/priv/gettext/en/LC_MESSAGES/errors.po
@@ -156,16 +156,11 @@ msgstr ""
 msgid "Invalid number of copies, must be between 1 and %{max}. Was %{multiplier}"
 msgstr ""

-#: lib/cannery/ammo.ex:1123
+#: lib/cannery/ammo.ex:1121
 #, elixir-autogen, elixir-format
 msgid "Invalid multiplier"
 msgstr ""

-#: lib/cannery/ammo/pack.ex:92
-#, elixir-autogen, elixir-format
-msgid "Please select an ammo type and container"
-msgstr ""
-
 #: lib/cannery_web/live/range_live/index.html.heex:74
 #, elixir-autogen, elixir-format
 msgid "Your browser does not support the canvas element."
@@ -195,3 +190,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "can't be blank"
 msgstr ""
+
+#: lib/cannery/ammo/pack.ex:92
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Please select a type and container"
+msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/prompts.po
+++ b/priv/gettext/en/LC_MESSAGES/prompts.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Language: en\n"

-#: lib/cannery_web/live/ammo_type_live/form_component.ex:89
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:88
 #: lib/cannery_web/live/container_live/form_component.ex:89
 #: lib/cannery_web/live/invite_live/form_component.ex:80
 #: lib/cannery_web/live/tag_live/form_component.ex:78
@@ -31,7 +31,7 @@ msgstr ""
 msgid "%{name} has been deleted"
 msgstr ""

-#: lib/cannery_web/live/ammo_type_live/form_component.ex:70
+#: lib/cannery_web/live/ammo_type_live/form_component.ex:69
 #: lib/cannery_web/live/container_live/form_component.ex:70
 #: lib/cannery_web/live/invite_live/form_component.ex:62
 #: lib/cannery_web/live/tag_live/form_component.ex:60
@@ -236,7 +236,7 @@ msgid_plural "Ammo added successfully"
 msgstr[0] ""
 msgstr[1] ""

-#: lib/cannery_web/live/ammo_type_live/index.html.heex:122
+#: lib/cannery_web/live/ammo_type_live/index.html.heex:116
 #: lib/cannery_web/live/ammo_type_live/show.html.heex:29
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Are you sure you want to delete %{name}? This will delete all %{name} type ammo as well!"