From 3ce8eda712547ed6d92a9f40cdfc090eb009cd67 Mon Sep 17 00:00:00 2001 From: shibao Date: Sun, 20 Feb 2022 20:40:24 -0500 Subject: [PATCH] mix format --- .../ammo_type_live/form_component.html.heex | 32 +++------ lib/cannery_web/live/live_helpers.ex | 4 +- priv/gettext/actions.pot | 2 +- priv/gettext/default.pot | 70 +++++++++++++------ priv/gettext/en/LC_MESSAGES/actions.po | 2 +- priv/gettext/en/LC_MESSAGES/default.po | 70 +++++++++++++------ priv/gettext/en/LC_MESSAGES/errors.po | 8 +-- priv/gettext/en/LC_MESSAGES/prompts.po | 10 +-- priv/gettext/errors.pot | 8 +-- priv/gettext/prompts.pot | 10 +-- 10 files changed, 127 insertions(+), 89 deletions(-) diff --git a/lib/cannery_web/live/ammo_type_live/form_component.html.heex b/lib/cannery_web/live/ammo_type_live/form_component.html.heex index b7f6a38..2d5a549 100644 --- a/lib/cannery_web/live/ammo_type_live/form_component.html.heex +++ b/lib/cannery_web/live/ammo_type_live/form_component.html.heex @@ -34,18 +34,14 @@ > <%= gettext("Example bullet type abbreviations") %> - <%= label(f, :bullet_type, gettext("Bullet type"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :bullet_type, gettext("Bullet type"), class: "title text-lg text-primary-600") %> <%= text_input(f, :bullet_type, class: "text-center col-span-2 input input-primary", placeholder: gettext("FMJ") ) %> <%= error_tag(f, :bullet_type, "col-span-3 text-center") %> - <%= label(f, :bullet_core, gettext("Bullet core"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :bullet_core, gettext("Bullet core"), class: "title text-lg text-primary-600") %> <%= text_input(f, :bullet_core, class: "text-center col-span-2 input input-primary", placeholder: gettext("Steel") @@ -66,18 +62,14 @@ ) %> <%= error_tag(f, :caliber, "col-span-3 text-center") %> - <%= label(f, :case_material, gettext("Case material"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :case_material, gettext("Case material"), class: "title text-lg text-primary-600") %> <%= text_input(f, :case_material, class: "text-center col-span-2 input input-primary", placeholder: gettext("Brass") ) %> <%= error_tag(f, :case_material, "col-span-3 text-center") %> - <%= label(f, :jacket_type, gettext("Jacket type"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :jacket_type, gettext("Jacket type"), class: "title text-lg text-primary-600") %> <%= text_input(f, :jacket_type, class: "text-center col-span-2 input input-primary", placeholder: gettext("Bimetal") @@ -94,9 +86,7 @@ ) %> <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %> - <%= label(f, :powder_type, gettext("Powder type"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :powder_type, gettext("Powder type"), class: "title text-lg text-primary-600") %> <%= text_input(f, :powder_type, class: "text-center col-span-2 input input-primary") %> <%= error_tag(f, :powder_type, "col-span-3 text-center") %> @@ -125,18 +115,14 @@ ) %> <%= error_tag(f, :pressure, "col-span-3 text-center") %> - <%= label(f, :primer_type, gettext("Primer type"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :primer_type, gettext("Primer type"), class: "title text-lg text-primary-600") %> <%= text_input(f, :primer_type, class: "text-center col-span-2 input input-primary", placeholder: "Boxer" ) %> <%= error_tag(f, :primer_type, "col-span-3 text-center") %> - <%= label(f, :firing_type, gettext("Firing type"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :firing_type, gettext("Firing type"), class: "title text-lg text-primary-600") %> <%= text_input(f, :firing_type, class: "text-center col-span-2 input input-primary", placeholder: "Centerfire" @@ -159,9 +145,7 @@ <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %> <%= error_tag(f, :corrosive, "col-span-3 text-center") %> - <%= label(f, :manufacturer, gettext("Manufacturer"), - class: "title text-lg text-primary-600" - ) %> + <%= label(f, :manufacturer, gettext("Manufacturer"), class: "title text-lg text-primary-600") %> <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %> <%= error_tag(f, :manufacturer, "col-span-3 text-center") %> diff --git a/lib/cannery_web/live/live_helpers.ex b/lib/cannery_web/live/live_helpers.ex index 7e278a2..f5c5c5d 100644 --- a/lib/cannery_web/live/live_helpers.ex +++ b/lib/cannery_web/live/live_helpers.ex @@ -74,7 +74,9 @@ defmodule CanneryWeb.LiveHelpers do <% end %> -
+
<%= render_slot(@inner_block) %>
diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index ae84f44..2621bf0 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -126,7 +126,7 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/add_shot_group_component.html.heex:42 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54 -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:172 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156 #: lib/cannery_web/live/container_live/form_component.html.heex:50 #: lib/cannery_web/live/invite_live/form_component.html.heex:28 #: lib/cannery_web/live/range_live/form_component.html.heex:40 diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index d4a3407..3dab3e4 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -54,19 +54,19 @@ msgid "Background color" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140 #: lib/cannery_web/live/ammo_type_live/index.ex:67 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55 msgid "Blank" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68 msgid "Brass" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44 #: lib/cannery_web/live/ammo_type_live/index.ex:53 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41 msgid "Bullet core" @@ -80,21 +80,21 @@ msgid "Bullet type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58 #: lib/cannery_web/live/ammo_type_live/index.ex:55 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43 msgid "Caliber" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51 #: lib/cannery_web/live/ammo_type_live/index.ex:54 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42 msgid "Cartridge" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65 #: lib/cannery_web/live/ammo_type_live/index.ex:56 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44 msgid "Case material" @@ -114,7 +114,7 @@ msgid "Containers" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144 #: lib/cannery_web/live/ammo_type_live/index.ex:68 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56 msgid "Corrosive" @@ -187,19 +187,19 @@ msgid "Example bullet type abbreviations" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40 msgid "FMJ" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103 #: lib/cannery_web/live/ammo_type_live/index.ex:61 #: lib/cannery_web/live/ammo_type_live/show.html.heex:49 msgid "Grains" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136 #: lib/cannery_web/live/ammo_type_live/index.ex:66 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54 msgid "Incendiary" @@ -274,7 +274,7 @@ msgid "Manage" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148 #: lib/cannery_web/live/ammo_type_live/index.ex:69 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57 msgid "Manufacturer" @@ -376,7 +376,7 @@ msgid "On the bookshelf" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111 #: lib/cannery_web/live/ammo_type_live/index.ex:62 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50 msgid "Pressure" @@ -394,7 +394,7 @@ msgid "Price paid:" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118 #: lib/cannery_web/live/ammo_type_live/index.ex:63 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51 msgid "Primer type" @@ -421,6 +421,7 @@ msgid "Set Unlimited" msgstr "" #, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_settings_controller.ex:10 #: lib/cannery_web/templates/user_settings/edit.html.heex:3 msgid "Settings" msgstr "" @@ -441,7 +442,7 @@ msgid "Simple:" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47 msgid "Steel" msgstr "" @@ -477,7 +478,7 @@ msgid "This ammo group is not in a container" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132 #: lib/cannery_web/live/ammo_type_live/index.ex:65 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53 msgid "Tracer" @@ -654,40 +655,40 @@ msgid "$%{amount}" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75 msgid "Bimetal" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72 #: lib/cannery_web/live/ammo_type_live/index.ex:57 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45 msgid "Jacket type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79 #: lib/cannery_web/live/ammo_type_live/index.ex:58 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46 msgid "Muzzle velocity" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93 #: lib/cannery_web/live/ammo_type_live/index.ex:60 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48 msgid "Powder grains per charge" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89 #: lib/cannery_web/live/ammo_type_live/index.ex:59 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47 msgid "Powder type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152 #: lib/cannery_web/live/ammo_type_live/index.ex:70 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58 msgid "UPC" @@ -720,7 +721,7 @@ msgid "Unstage" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125 #: lib/cannery_web/live/ammo_type_live/index.ex:64 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52 msgid "Firing type" @@ -807,3 +808,28 @@ msgstr "" #: lib/cannery_web/live/ammo_type_live/show.html.heex:85 msgid "Total rounds shot:" msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +msgid "Confirm your account" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_reset_password_controller.ex:9 +msgid "Forgot your password?" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_session_controller.ex:8 +msgid "Log in" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_registration_controller.ex:35 +msgid "Register" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_reset_password_controller.ex:36 +msgid "Reset your password" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/actions.po b/priv/gettext/en/LC_MESSAGES/actions.po index 53ce958..3d4cead 100644 --- a/priv/gettext/en/LC_MESSAGES/actions.po +++ b/priv/gettext/en/LC_MESSAGES/actions.po @@ -127,7 +127,7 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/add_shot_group_component.html.heex:42 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:54 -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:172 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:156 #: lib/cannery_web/live/container_live/form_component.html.heex:50 #: lib/cannery_web/live/invite_live/form_component.html.heex:28 #: lib/cannery_web/live/range_live/form_component.html.heex:40 diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index a80c846..98a5412 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -55,19 +55,19 @@ msgid "Background color" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:154 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:140 #: lib/cannery_web/live/ammo_type_live/index.ex:67 #: lib/cannery_web/live/ammo_type_live/show.html.heex:55 msgid "Blank" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:74 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:68 msgid "Brass" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:46 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:44 #: lib/cannery_web/live/ammo_type_live/index.ex:53 #: lib/cannery_web/live/ammo_type_live/show.html.heex:41 msgid "Bullet core" @@ -81,21 +81,21 @@ msgid "Bullet type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:62 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:58 #: lib/cannery_web/live/ammo_type_live/index.ex:55 #: lib/cannery_web/live/ammo_type_live/show.html.heex:43 msgid "Caliber" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:55 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51 #: lib/cannery_web/live/ammo_type_live/index.ex:54 #: lib/cannery_web/live/ammo_type_live/show.html.heex:42 msgid "Cartridge" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:69 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:65 #: lib/cannery_web/live/ammo_type_live/index.ex:56 #: lib/cannery_web/live/ammo_type_live/show.html.heex:44 msgid "Case material" @@ -115,7 +115,7 @@ msgid "Containers" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:158 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:144 #: lib/cannery_web/live/ammo_type_live/index.ex:68 #: lib/cannery_web/live/ammo_type_live/show.html.heex:56 msgid "Corrosive" @@ -188,19 +188,19 @@ msgid "Example bullet type abbreviations" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:42 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:40 msgid "FMJ" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:113 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103 #: lib/cannery_web/live/ammo_type_live/index.ex:61 #: lib/cannery_web/live/ammo_type_live/show.html.heex:49 msgid "Grains" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:150 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:136 #: lib/cannery_web/live/ammo_type_live/index.ex:66 #: lib/cannery_web/live/ammo_type_live/show.html.heex:54 msgid "Incendiary" @@ -275,7 +275,7 @@ msgid "Manage" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:162 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:148 #: lib/cannery_web/live/ammo_type_live/index.ex:69 #: lib/cannery_web/live/ammo_type_live/show.html.heex:57 msgid "Manufacturer" @@ -377,7 +377,7 @@ msgid "On the bookshelf" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:121 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:111 #: lib/cannery_web/live/ammo_type_live/index.ex:62 #: lib/cannery_web/live/ammo_type_live/show.html.heex:50 msgid "Pressure" @@ -395,7 +395,7 @@ msgid "Price paid:" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:128 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:118 #: lib/cannery_web/live/ammo_type_live/index.ex:63 #: lib/cannery_web/live/ammo_type_live/show.html.heex:51 msgid "Primer type" @@ -422,6 +422,7 @@ msgid "Set Unlimited" msgstr "" #, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_settings_controller.ex:10 #: lib/cannery_web/templates/user_settings/edit.html.heex:3 msgid "Settings" msgstr "" @@ -442,7 +443,7 @@ msgid "Simple:" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:51 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:47 msgid "Steel" msgstr "" @@ -478,7 +479,7 @@ msgid "This ammo group is not in a container" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:146 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:132 #: lib/cannery_web/live/ammo_type_live/index.ex:65 #: lib/cannery_web/live/ammo_type_live/show.html.heex:53 msgid "Tracer" @@ -655,40 +656,40 @@ msgid "$%{amount}" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:83 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:75 msgid "Bimetal" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:78 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:72 #: lib/cannery_web/live/ammo_type_live/index.ex:57 #: lib/cannery_web/live/ammo_type_live/show.html.heex:45 msgid "Jacket type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:87 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:79 #: lib/cannery_web/live/ammo_type_live/index.ex:58 #: lib/cannery_web/live/ammo_type_live/show.html.heex:46 msgid "Muzzle velocity" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:103 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:93 #: lib/cannery_web/live/ammo_type_live/index.ex:60 #: lib/cannery_web/live/ammo_type_live/show.html.heex:48 msgid "Powder grains per charge" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:97 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:89 #: lib/cannery_web/live/ammo_type_live/index.ex:59 #: lib/cannery_web/live/ammo_type_live/show.html.heex:47 msgid "Powder type" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:168 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:152 #: lib/cannery_web/live/ammo_type_live/index.ex:70 #: lib/cannery_web/live/ammo_type_live/show.html.heex:58 msgid "UPC" @@ -721,7 +722,7 @@ msgid "Unstage" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:137 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:125 #: lib/cannery_web/live/ammo_type_live/index.ex:64 #: lib/cannery_web/live/ammo_type_live/show.html.heex:52 msgid "Firing type" @@ -808,3 +809,28 @@ msgstr "" #: lib/cannery_web/live/ammo_type_live/show.html.heex:85 msgid "Total rounds shot:" msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_confirmation_controller.ex:8 +msgid "Confirm your account" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_reset_password_controller.ex:9 +msgid "Forgot your password?" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_session_controller.ex:8 +msgid "Log in" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_registration_controller.ex:35 +msgid "Register" +msgstr "" + +#, elixir-autogen, elixir-format +#: lib/cannery_web/controllers/user_reset_password_controller.ex:36 +msgid "Reset your password" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/errors.po b/priv/gettext/en/LC_MESSAGES/errors.po index 3c6f064..93bdcaa 100644 --- a/priv/gettext/en/LC_MESSAGES/errors.po +++ b/priv/gettext/en/LC_MESSAGES/errors.po @@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_reset_password_controller.ex:60 +#: lib/cannery_web/controllers/user_reset_password_controller.ex:63 msgid "Reset password link is invalid or it has expired." msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/controllers/user_registration_controller.ex:25 -#: lib/cannery_web/controllers/user_registration_controller.ex:53 +#: lib/cannery_web/controllers/user_registration_controller.ex:56 msgid "Sorry, public registration is disabled" msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/controllers/user_registration_controller.ex:15 -#: lib/cannery_web/controllers/user_registration_controller.ex:43 +#: lib/cannery_web/controllers/user_registration_controller.ex:46 msgid "Sorry, this invite was not found or expired" msgstr "" @@ -92,7 +92,7 @@ msgid "Unauthorized" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:54 msgid "User confirmation link is invalid or it has expired." msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index db488de..d19dcea 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -125,7 +125,7 @@ msgid "Email changed successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:22 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -140,7 +140,7 @@ msgid "Logged out successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_reset_password_controller.ex:43 +#: lib/cannery_web/controllers/user_reset_password_controller.ex:46 msgid "Password reset successfully." msgstr "" @@ -150,7 +150,7 @@ msgid "Password updated successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_registration_controller.ex:71 +#: lib/cannery_web/controllers/user_registration_controller.ex:74 msgid "Please check your email to verify your account" msgstr "" @@ -162,7 +162,7 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/add_shot_group_component.html.heex:44 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55 -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157 #: lib/cannery_web/live/container_live/form_component.html.heex:52 #: lib/cannery_web/live/invite_live/form_component.html.heex:30 #: lib/cannery_web/live/range_live/form_component.html.heex:42 @@ -226,7 +226,7 @@ msgid "Shot records updated successfully" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:38 msgid "%{email} confirmed successfully." msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 57ec414..68fc268 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -65,19 +65,19 @@ msgid "Oops, something went wrong! Please check the errors below." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_reset_password_controller.ex:60 +#: lib/cannery_web/controllers/user_reset_password_controller.ex:63 msgid "Reset password link is invalid or it has expired." msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/controllers/user_registration_controller.ex:25 -#: lib/cannery_web/controllers/user_registration_controller.ex:53 +#: lib/cannery_web/controllers/user_registration_controller.ex:56 msgid "Sorry, public registration is disabled" msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/controllers/user_registration_controller.ex:15 -#: lib/cannery_web/controllers/user_registration_controller.ex:43 +#: lib/cannery_web/controllers/user_registration_controller.ex:46 msgid "Sorry, this invite was not found or expired" msgstr "" @@ -92,7 +92,7 @@ msgid "Unauthorized" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:53 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:54 msgid "User confirmation link is invalid or it has expired." msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index f6346b7..1013ccb 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -124,7 +124,7 @@ msgid "Email changed successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:22 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:23 msgid "If your email is in our system and it has not been confirmed yet, you will receive an email with instructions shortly." msgstr "" @@ -139,7 +139,7 @@ msgid "Logged out successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_reset_password_controller.ex:43 +#: lib/cannery_web/controllers/user_reset_password_controller.ex:46 msgid "Password reset successfully." msgstr "" @@ -149,7 +149,7 @@ msgid "Password updated successfully." msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_registration_controller.ex:71 +#: lib/cannery_web/controllers/user_registration_controller.ex:74 msgid "Please check your email to verify your account" msgstr "" @@ -161,7 +161,7 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/add_shot_group_component.html.heex:44 #: lib/cannery_web/live/ammo_group_live/form_component.html.heex:55 -#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:173 +#: lib/cannery_web/live/ammo_type_live/form_component.html.heex:157 #: lib/cannery_web/live/container_live/form_component.html.heex:52 #: lib/cannery_web/live/invite_live/form_component.html.heex:30 #: lib/cannery_web/live/range_live/form_component.html.heex:42 @@ -225,7 +225,7 @@ msgid "Shot records updated successfully" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/controllers/user_confirmation_controller.ex:37 +#: lib/cannery_web/controllers/user_confirmation_controller.ex:38 msgid "%{email} confirmed successfully." msgstr ""