diff --git a/lib/memex_web/live/context_live/form_component.ex b/lib/memex_web/live/context_live/form_component.ex index 9e188c1..ef54557 100644 --- a/lib/memex_web/live/context_live/form_component.ex +++ b/lib/memex_web/live/context_live/form_component.ex @@ -1,16 +1,18 @@ defmodule MemexWeb.ContextLive.FormComponent do use MemexWeb, :live_component - + alias Ecto.Changeset alias Memex.Contexts @impl true def update(%{context: context, current_user: current_user} = assigns, socket) do changeset = Contexts.change_context(context, current_user) - {:ok, - socket - |> assign(assigns) - |> assign(:changeset, changeset)} + socket = + socket + |> assign(assigns) + |> assign(:changeset, changeset) + + {:ok, socket} end @impl true @@ -19,10 +21,13 @@ defmodule MemexWeb.ContextLive.FormComponent do %{"context" => context_params}, %{assigns: %{context: context, current_user: current_user}} = socket ) do + changeset = context |> Contexts.change_context(context_params, current_user) + changeset = - context - |> Contexts.change_context(context_params, current_user) - |> Map.put(:action, :validate) + case changeset |> Changeset.apply_action(:validate) do + {:ok, _data} -> changeset + {:error, changeset} -> changeset + end {:noreply, assign(socket, :changeset, changeset)} end @@ -37,16 +42,18 @@ defmodule MemexWeb.ContextLive.FormComponent do :edit, context_params ) do - case Contexts.update_context(context, context_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} saved", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Contexts.update_context(context, context_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} saved", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, :changeset, changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, :changeset, changeset) + end + + {:noreply, socket} end defp save_context( @@ -54,15 +61,17 @@ defmodule MemexWeb.ContextLive.FormComponent do :new, context_params ) do - case Contexts.create_context(context_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} created", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Contexts.create_context(context_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} created", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, changeset: changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, changeset: changeset) + end + + {:noreply, socket} end end diff --git a/lib/memex_web/live/context_live/index.ex b/lib/memex_web/live/context_live/index.ex index f7d3ae3..21b3ff5 100644 --- a/lib/memex_web/live/context_live/index.ex +++ b/lib/memex_web/live/context_live/index.ex @@ -64,8 +64,8 @@ defmodule MemexWeb.ContextLive.Index do end def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do - {:noreply, - socket |> push_patch(to: Routes.context_index_path(Endpoint, :search, search_term))} + redirect_to = Routes.context_index_path(Endpoint, :search, search_term) + {:noreply, socket |> push_patch(to: redirect_to)} end defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket) diff --git a/lib/memex_web/live/invite_live/form_component.ex b/lib/memex_web/live/invite_live/form_component.ex index 41cde7b..f42f653 100644 --- a/lib/memex_web/live/invite_live/form_component.ex +++ b/lib/memex_web/live/invite_live/form_component.ex @@ -19,7 +19,7 @@ defmodule MemexWeb.InviteLive.FormComponent do @impl true def handle_event("validate", %{"invite" => invite_params}, socket) do - {:noreply, socket |> assign_changeset(invite_params)} + {:noreply, socket |> assign_changeset(invite_params, :validate)} end def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do @@ -28,22 +28,23 @@ defmodule MemexWeb.InviteLive.FormComponent do defp assign_changeset( %{assigns: %{action: action, current_user: user, invite: invite}} = socket, - invite_params + invite_params, + changeset_action \\ nil ) do - changeset_action = + default_action = case action do :new -> :insert :edit -> :update end changeset = - case action do - :new -> Invite.create_changeset(user, "example_token", invite_params) - :edit -> invite |> Invite.update_changeset(invite_params) + case default_action do + :insert -> Invite.create_changeset(user, "example_token", invite_params) + :update -> invite |> Invite.update_changeset(invite_params) end changeset = - case changeset |> Changeset.apply_action(changeset_action) do + case changeset |> Changeset.apply_action(changeset_action || default_action) do {:ok, _data} -> changeset {:error, changeset} -> changeset end diff --git a/lib/memex_web/live/invite_live/form_component.html.heex b/lib/memex_web/live/invite_live/form_component.html.heex index ab44912..44eba6e 100644 --- a/lib/memex_web/live/invite_live/form_component.html.heex +++ b/lib/memex_web/live/invite_live/form_component.html.heex @@ -26,12 +26,12 @@ <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %> <%= error_tag(f, :uses_left, "col-span-3") %> - <%= gettext(~s/Leave "Uses left" blank to make invite unlimited/) %> + <%= gettext(~s/leave "uses left" blank to make invite unlimited/) %> - <%= submit(dgettext("actions", "Save"), + <%= submit(dgettext("actions", "save"), class: "mx-auto btn btn-primary col-span-3", - phx_disable_with: dgettext("prompts", "Saving...") + phx_disable_with: dgettext("prompts", "saving...") ) %> diff --git a/lib/memex_web/live/invite_live/index.ex b/lib/memex_web/live/invite_live/index.ex index 784e14e..680b293 100644 --- a/lib/memex_web/live/invite_live/index.ex +++ b/lib/memex_web/live/invite_live/index.ex @@ -133,9 +133,7 @@ defmodule MemexWeb.InviteLive.Index do %{assigns: %{current_user: current_user}} = socket ) do %{email: user_email} = Accounts.get_user!(id) |> Accounts.delete_user!(current_user) - prompt = dgettext("prompts", "%{user_email} deleted succesfully", user_email: user_email) - {:noreply, socket |> put_flash(:info, prompt) |> display_invites()} end @@ -150,7 +148,6 @@ defmodule MemexWeb.InviteLive.Index do use_counts = invites |> Invites.get_use_counts(current_user) users = all_users |> Map.get(:user, []) - socket |> assign(invites: invites, use_counts: use_counts, admins: admins, users: users) end end diff --git a/lib/memex_web/live/note_live/form_component.ex b/lib/memex_web/live/note_live/form_component.ex index 1153927..e974884 100644 --- a/lib/memex_web/live/note_live/form_component.ex +++ b/lib/memex_web/live/note_live/form_component.ex @@ -1,16 +1,18 @@ defmodule MemexWeb.NoteLive.FormComponent do use MemexWeb, :live_component - + alias Ecto.Changeset alias Memex.Notes @impl true def update(%{note: note, current_user: current_user} = assigns, socket) do changeset = Notes.change_note(note, current_user) - {:ok, - socket - |> assign(assigns) - |> assign(:changeset, changeset)} + socket = + socket + |> assign(assigns) + |> assign(:changeset, changeset) + + {:ok, socket} end @impl true @@ -19,10 +21,13 @@ defmodule MemexWeb.NoteLive.FormComponent do %{"note" => note_params}, %{assigns: %{note: note, current_user: current_user}} = socket ) do + changeset = note |> Notes.change_note(note_params, current_user) + changeset = - note - |> Notes.change_note(note_params, current_user) - |> Map.put(:action, :validate) + case changeset |> Changeset.apply_action(:validate) do + {:ok, _data} -> changeset + {:error, changeset} -> changeset + end {:noreply, assign(socket, :changeset, changeset)} end @@ -36,16 +41,18 @@ defmodule MemexWeb.NoteLive.FormComponent do :edit, note_params ) do - case Notes.update_note(note, note_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} saved", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Notes.update_note(note, note_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} saved", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, :changeset, changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, :changeset, changeset) + end + + {:noreply, socket} end defp save_note( @@ -53,15 +60,17 @@ defmodule MemexWeb.NoteLive.FormComponent do :new, note_params ) do - case Notes.create_note(note_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} created", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Notes.create_note(note_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} created", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, changeset: changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, changeset: changeset) + end + + {:noreply, socket} end end diff --git a/lib/memex_web/live/pipeline_live/form_component.ex b/lib/memex_web/live/pipeline_live/form_component.ex index 0479b91..d4bf186 100644 --- a/lib/memex_web/live/pipeline_live/form_component.ex +++ b/lib/memex_web/live/pipeline_live/form_component.ex @@ -1,16 +1,18 @@ defmodule MemexWeb.PipelineLive.FormComponent do use MemexWeb, :live_component - + alias Ecto.Changeset alias Memex.Pipelines @impl true def update(%{pipeline: pipeline, current_user: current_user} = assigns, socket) do changeset = Pipelines.change_pipeline(pipeline, current_user) - {:ok, - socket - |> assign(assigns) - |> assign(:changeset, changeset)} + socket = + socket + |> assign(assigns) + |> assign(:changeset, changeset) + + {:ok, socket} end @impl true @@ -19,10 +21,13 @@ defmodule MemexWeb.PipelineLive.FormComponent do %{"pipeline" => pipeline_params}, %{assigns: %{pipeline: pipeline, current_user: current_user}} = socket ) do + changeset = pipeline |> Pipelines.change_pipeline(pipeline_params, current_user) + changeset = - pipeline - |> Pipelines.change_pipeline(pipeline_params, current_user) - |> Map.put(:action, :validate) + case changeset |> Changeset.apply_action(:validate) do + {:ok, _data} -> changeset + {:error, changeset} -> changeset + end {:noreply, assign(socket, :changeset, changeset)} end @@ -41,16 +46,18 @@ defmodule MemexWeb.PipelineLive.FormComponent do :edit, pipeline_params ) do - case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} saved", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} saved", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, :changeset, changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, :changeset, changeset) + end + + {:noreply, socket} end defp save_pipeline( @@ -58,15 +65,17 @@ defmodule MemexWeb.PipelineLive.FormComponent do :new, pipeline_params ) do - case Pipelines.create_pipeline(pipeline_params, current_user) do - {:ok, %{slug: slug}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{slug} created", slug: slug)) - |> push_navigate(to: return_to)} + socket = + case Pipelines.create_pipeline(pipeline_params, current_user) do + {:ok, %{slug: slug}} -> + socket + |> put_flash(:info, gettext("%{slug} created", slug: slug)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, changeset: changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, changeset: changeset) + end + + {:noreply, socket} end end diff --git a/lib/memex_web/live/pipeline_live/index.ex b/lib/memex_web/live/pipeline_live/index.ex index 6a34609..975edd2 100644 --- a/lib/memex_web/live/pipeline_live/index.ex +++ b/lib/memex_web/live/pipeline_live/index.ex @@ -64,8 +64,8 @@ defmodule MemexWeb.PipelineLive.Index do end def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do - {:noreply, - socket |> push_patch(to: Routes.pipeline_index_path(Endpoint, :search, search_term))} + redirect_to = Routes.pipeline_index_path(Endpoint, :search, search_term) + {:noreply, socket |> push_patch(to: redirect_to)} end defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket) diff --git a/lib/memex_web/live/step_live/form_component.ex b/lib/memex_web/live/step_live/form_component.ex index 32ab236..9bf6262 100644 --- a/lib/memex_web/live/step_live/form_component.ex +++ b/lib/memex_web/live/step_live/form_component.ex @@ -1,16 +1,18 @@ defmodule MemexWeb.StepLive.FormComponent do use MemexWeb, :live_component - + alias Ecto.Changeset alias Memex.Pipelines.Steps @impl true def update(%{step: step, current_user: current_user, pipeline: _pipeline} = assigns, socket) do changeset = Steps.change_step(step, current_user) - {:ok, - socket - |> assign(assigns) - |> assign(:changeset, changeset)} + socket = + socket + |> assign(assigns) + |> assign(:changeset, changeset) + + {:ok, socket} end @impl true @@ -19,10 +21,13 @@ defmodule MemexWeb.StepLive.FormComponent do %{"step" => step_params}, %{assigns: %{step: step, current_user: current_user}} = socket ) do + changeset = step |> Steps.change_step(step_params, current_user) + changeset = - step - |> Steps.change_step(step_params, current_user) - |> Map.put(:action, :validate) + case changeset |> Changeset.apply_action(:validate) do + {:ok, _data} -> changeset + {:error, changeset} -> changeset + end {:noreply, assign(socket, :changeset, changeset)} end @@ -36,16 +41,18 @@ defmodule MemexWeb.StepLive.FormComponent do :edit_step, step_params ) do - case Steps.update_step(step, step_params, current_user) do - {:ok, %{title: title}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{title} saved", title: title)) - |> push_navigate(to: return_to)} + socket = + case Steps.update_step(step, step_params, current_user) do + {:ok, %{title: title}} -> + socket + |> put_flash(:info, gettext("%{title} saved", title: title)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, :changeset, changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, :changeset, changeset) + end + + {:noreply, socket} end defp save_step( @@ -60,15 +67,17 @@ defmodule MemexWeb.StepLive.FormComponent do :add_step, step_params ) do - case Steps.create_step(step_params, position, pipeline, current_user) do - {:ok, %{title: title}} -> - {:noreply, - socket - |> put_flash(:info, gettext("%{title} created", title: title)) - |> push_navigate(to: return_to)} + socket = + case Steps.create_step(step_params, position, pipeline, current_user) do + {:ok, %{title: title}} -> + socket + |> put_flash(:info, gettext("%{title} created", title: title)) + |> push_navigate(to: return_to) - {:error, %Ecto.Changeset{} = changeset} -> - {:noreply, assign(socket, changeset: changeset)} - end + {:error, %Changeset{} = changeset} -> + assign(socket, changeset: changeset) + end + + {:noreply, socket} end end diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index 3549726..bcf3146 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -22,11 +22,6 @@ msgstr "" msgid "Reset password" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:32 -#, elixir-autogen, elixir-format -msgid "Save" -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:15 #: lib/memex_web/templates/user_settings/edit.html.heex:43 #, elixir-autogen, elixir-format @@ -120,6 +115,7 @@ msgid "register" msgstr "" #: lib/memex_web/live/context_live/form_component.html.heex:40 +#: lib/memex_web/live/invite_live/form_component.html.heex:32 #: lib/memex_web/live/note_live/form_component.html.heex:40 #: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #: lib/memex_web/live/step_live/form_component.html.heex:28 diff --git a/priv/gettext/de/LC_MESSAGES/actions.po b/priv/gettext/de/LC_MESSAGES/actions.po index b3bc4e7..a7a0a8f 100644 --- a/priv/gettext/de/LC_MESSAGES/actions.po +++ b/priv/gettext/de/LC_MESSAGES/actions.po @@ -22,11 +22,6 @@ msgstr "" msgid "Reset password" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:32 -#, elixir-autogen, elixir-format -msgid "Save" -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:15 #: lib/memex_web/templates/user_settings/edit.html.heex:43 #, elixir-autogen, elixir-format @@ -120,6 +115,7 @@ msgid "register" msgstr "" #: lib/memex_web/live/context_live/form_component.html.heex:40 +#: lib/memex_web/live/invite_live/form_component.html.heex:32 #: lib/memex_web/live/note_live/form_component.html.heex:40 #: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #: lib/memex_web/live/step_live/form_component.html.heex:28 diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index 77d23cb..7a0c1d3 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -352,9 +352,9 @@ msgstr "" msgid "no pipelines found" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:61 -#: lib/memex_web/live/note_live/form_component.ex:60 -#: lib/memex_web/live/pipeline_live/form_component.ex:65 +#: lib/memex_web/live/context_live/form_component.ex:68 +#: lib/memex_web/live/note_live/form_component.ex:67 +#: lib/memex_web/live/pipeline_live/form_component.ex:72 #, elixir-autogen, elixir-format msgid "%{slug} created" msgstr "" @@ -369,9 +369,9 @@ msgstr "" msgid "%{slug} deleted" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:44 -#: lib/memex_web/live/note_live/form_component.ex:43 -#: lib/memex_web/live/pipeline_live/form_component.ex:48 +#: lib/memex_web/live/context_live/form_component.ex:49 +#: lib/memex_web/live/note_live/form_component.ex:48 +#: lib/memex_web/live/pipeline_live/form_component.ex:53 #, elixir-autogen, elixir-format msgid "%{slug} saved" msgstr "" @@ -439,7 +439,7 @@ msgstr "" msgid "%{position}. %{title}" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:67 +#: lib/memex_web/live/step_live/form_component.ex:74 #, elixir-autogen, elixir-format msgid "%{title} created" msgstr "" @@ -449,7 +449,7 @@ msgstr "" msgid "%{title} deleted" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:43 +#: lib/memex_web/live/step_live/form_component.ex:48 #, elixir-autogen, elixir-format msgid "%{title} saved" msgstr "" @@ -644,11 +644,6 @@ msgstr "" msgid "Email" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:29 -#, elixir-autogen, elixir-format -msgid "Leave \"Uses left\" blank to make invite unlimited" -msgstr "" - #: lib/memex_web/live/invite_live/index.html.heex:102 #, elixir-autogen, elixir-format, fuzzy msgid "admins" @@ -674,3 +669,8 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "uses left" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format, fuzzy +msgid "leave \"uses left\" blank to make invite unlimited" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 010c8b2..dfe9d66 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -35,7 +35,7 @@ msgstr "" msgid "%{invite_name} updated succesfully" msgstr "" -#: lib/memex_web/live/invite_live/index.ex:137 +#: lib/memex_web/live/invite_live/index.ex:136 #, elixir-autogen, elixir-format msgid "%{user_email} deleted succesfully" msgstr "" @@ -55,11 +55,6 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:34 -#, elixir-autogen, elixir-format -msgid "Saving..." -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:130 #, elixir-autogen, elixir-format msgid "are you sure you want to change your language?" @@ -111,12 +106,12 @@ msgstr "" msgid "register to setup memEx" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:80 +#: lib/memex_web/live/invite_live/form_component.ex:81 #, elixir-autogen, elixir-format, fuzzy msgid "%{name} created successfully" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:62 +#: lib/memex_web/live/invite_live/form_component.ex:63 #, elixir-autogen, elixir-format, fuzzy msgid "%{name} updated successfully" msgstr "" @@ -156,3 +151,8 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "are you sure you want to delete %{email}? this action is permanent!" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:34 +#, elixir-autogen, elixir-format, fuzzy +msgid "saving..." +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index c712881..6c43cad 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -350,9 +350,9 @@ msgstr "" msgid "no pipelines found" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:61 -#: lib/memex_web/live/note_live/form_component.ex:60 -#: lib/memex_web/live/pipeline_live/form_component.ex:65 +#: lib/memex_web/live/context_live/form_component.ex:68 +#: lib/memex_web/live/note_live/form_component.ex:67 +#: lib/memex_web/live/pipeline_live/form_component.ex:72 #, elixir-autogen, elixir-format msgid "%{slug} created" msgstr "" @@ -367,9 +367,9 @@ msgstr "" msgid "%{slug} deleted" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:44 -#: lib/memex_web/live/note_live/form_component.ex:43 -#: lib/memex_web/live/pipeline_live/form_component.ex:48 +#: lib/memex_web/live/context_live/form_component.ex:49 +#: lib/memex_web/live/note_live/form_component.ex:48 +#: lib/memex_web/live/pipeline_live/form_component.ex:53 #, elixir-autogen, elixir-format msgid "%{slug} saved" msgstr "" @@ -437,7 +437,7 @@ msgstr "" msgid "%{position}. %{title}" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:67 +#: lib/memex_web/live/step_live/form_component.ex:74 #, elixir-autogen, elixir-format msgid "%{title} created" msgstr "" @@ -447,7 +447,7 @@ msgstr "" msgid "%{title} deleted" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:43 +#: lib/memex_web/live/step_live/form_component.ex:48 #, elixir-autogen, elixir-format msgid "%{title} saved" msgstr "" @@ -642,11 +642,6 @@ msgstr "" msgid "Email" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:29 -#, elixir-autogen, elixir-format -msgid "Leave \"Uses left\" blank to make invite unlimited" -msgstr "" - #: lib/memex_web/live/invite_live/index.html.heex:102 #, elixir-autogen, elixir-format msgid "admins" @@ -672,3 +667,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "uses left" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format +msgid "leave \"uses left\" blank to make invite unlimited" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/actions.po b/priv/gettext/en/LC_MESSAGES/actions.po index 8381a2a..3a576bd 100644 --- a/priv/gettext/en/LC_MESSAGES/actions.po +++ b/priv/gettext/en/LC_MESSAGES/actions.po @@ -23,11 +23,6 @@ msgstr "" msgid "Reset password" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:32 -#, elixir-autogen, elixir-format -msgid "Save" -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:15 #: lib/memex_web/templates/user_settings/edit.html.heex:43 #, elixir-autogen, elixir-format @@ -121,6 +116,7 @@ msgid "register" msgstr "" #: lib/memex_web/live/context_live/form_component.html.heex:40 +#: lib/memex_web/live/invite_live/form_component.html.heex:32 #: lib/memex_web/live/note_live/form_component.html.heex:40 #: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #: lib/memex_web/live/step_live/form_component.html.heex:28 diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 290e7d0..3ec8b8f 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -351,9 +351,9 @@ msgstr "" msgid "no pipelines found" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:61 -#: lib/memex_web/live/note_live/form_component.ex:60 -#: lib/memex_web/live/pipeline_live/form_component.ex:65 +#: lib/memex_web/live/context_live/form_component.ex:68 +#: lib/memex_web/live/note_live/form_component.ex:67 +#: lib/memex_web/live/pipeline_live/form_component.ex:72 #, elixir-autogen, elixir-format msgid "%{slug} created" msgstr "" @@ -368,9 +368,9 @@ msgstr "" msgid "%{slug} deleted" msgstr "" -#: lib/memex_web/live/context_live/form_component.ex:44 -#: lib/memex_web/live/note_live/form_component.ex:43 -#: lib/memex_web/live/pipeline_live/form_component.ex:48 +#: lib/memex_web/live/context_live/form_component.ex:49 +#: lib/memex_web/live/note_live/form_component.ex:48 +#: lib/memex_web/live/pipeline_live/form_component.ex:53 #, elixir-autogen, elixir-format msgid "%{slug} saved" msgstr "" @@ -438,7 +438,7 @@ msgstr "" msgid "%{position}. %{title}" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:67 +#: lib/memex_web/live/step_live/form_component.ex:74 #, elixir-autogen, elixir-format msgid "%{title} created" msgstr "" @@ -448,7 +448,7 @@ msgstr "" msgid "%{title} deleted" msgstr "" -#: lib/memex_web/live/step_live/form_component.ex:43 +#: lib/memex_web/live/step_live/form_component.ex:48 #, elixir-autogen, elixir-format msgid "%{title} saved" msgstr "" @@ -643,11 +643,6 @@ msgstr "" msgid "Email" msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:29 -#, elixir-autogen, elixir-format -msgid "Leave \"Uses left\" blank to make invite unlimited" -msgstr "" - #: lib/memex_web/live/invite_live/index.html.heex:102 #, elixir-autogen, elixir-format msgid "admins" @@ -673,3 +668,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "uses left" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format, fuzzy +msgid "leave \"uses left\" blank to make invite unlimited" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index 675eb87..00212a3 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -36,7 +36,7 @@ msgstr "" msgid "%{invite_name} updated succesfully" msgstr "" -#: lib/memex_web/live/invite_live/index.ex:137 +#: lib/memex_web/live/invite_live/index.ex:136 #, elixir-autogen, elixir-format msgid "%{user_email} deleted succesfully" msgstr "" @@ -56,11 +56,6 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:34 -#, elixir-autogen, elixir-format -msgid "Saving..." -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:130 #, elixir-autogen, elixir-format msgid "are you sure you want to change your language?" @@ -112,12 +107,12 @@ msgstr "" msgid "register to setup memEx" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:80 +#: lib/memex_web/live/invite_live/form_component.ex:81 #, elixir-autogen, elixir-format msgid "%{name} created successfully" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:62 +#: lib/memex_web/live/invite_live/form_component.ex:63 #, elixir-autogen, elixir-format msgid "%{name} updated successfully" msgstr "" @@ -157,3 +152,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "are you sure you want to delete %{email}? this action is permanent!" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:34 +#, elixir-autogen, elixir-format, fuzzy +msgid "saving..." +msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index dc7711d..1939e15 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -35,7 +35,7 @@ msgstr "" msgid "%{invite_name} updated succesfully" msgstr "" -#: lib/memex_web/live/invite_live/index.ex:137 +#: lib/memex_web/live/invite_live/index.ex:136 #, elixir-autogen, elixir-format msgid "%{user_email} deleted succesfully" msgstr "" @@ -55,11 +55,6 @@ msgstr "" msgid "Password reset successfully." msgstr "" -#: lib/memex_web/live/invite_live/form_component.html.heex:34 -#, elixir-autogen, elixir-format -msgid "Saving..." -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:130 #, elixir-autogen, elixir-format msgid "are you sure you want to change your language?" @@ -111,12 +106,12 @@ msgstr "" msgid "register to setup memEx" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:80 +#: lib/memex_web/live/invite_live/form_component.ex:81 #, elixir-autogen, elixir-format msgid "%{name} created successfully" msgstr "" -#: lib/memex_web/live/invite_live/form_component.ex:62 +#: lib/memex_web/live/invite_live/form_component.ex:63 #, elixir-autogen, elixir-format msgid "%{name} updated successfully" msgstr "" @@ -156,3 +151,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "are you sure you want to delete %{email}? this action is permanent!" msgstr "" + +#: lib/memex_web/live/invite_live/form_component.html.heex:34 +#, elixir-autogen, elixir-format +msgid "saving..." +msgstr ""