From e2378279d7162d0cd4f2fc2cb905e7931ff58e71 Mon Sep 17 00:00:00 2001 From: shibao Date: Sat, 4 Nov 2023 23:27:00 -0400 Subject: [PATCH] change how backlinks work --- changelog.md | 2 + lib/memex_web/components/core_components.ex | 151 +++++++++++++----- .../core_components/context_content.html.heex | 2 +- .../core_components/note_content.html.heex | 2 +- .../pipeline_content.html.heex | 7 + .../core_components/step_content.html.heex | 2 +- .../context_live/form_component.html.heex | 6 +- .../live/note_live/form_component.html.heex | 4 +- .../pipeline_live/form_component.html.heex | 10 +- .../live/pipeline_live/show.html.heex | 9 +- .../live/step_live/form_component.html.heex | 10 +- priv/gettext/actions.pot | 26 +-- priv/gettext/de/LC_MESSAGES/actions.po | 26 +-- priv/gettext/de/LC_MESSAGES/default.po | 70 ++++---- priv/gettext/de/LC_MESSAGES/prompts.po | 4 +- priv/gettext/default.pot | 70 ++++---- priv/gettext/en/LC_MESSAGES/actions.po | 26 +-- priv/gettext/en/LC_MESSAGES/default.po | 70 ++++---- priv/gettext/en/LC_MESSAGES/prompts.po | 4 +- priv/gettext/prompts.pot | 4 +- 20 files changed, 293 insertions(+), 212 deletions(-) create mode 100644 lib/memex_web/components/core_components/pipeline_content.html.heex diff --git a/changelog.md b/changelog.md index 5124159..55f78ad 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,8 @@ - Fix live flashes not dismissable by click - Fix disconnection modal not displaying - Submit items with ctrl-enter +- Display backlinks in pipeline description +- Modify backlink format # v0.1.12 - Code quality fixes diff --git a/lib/memex_web/components/core_components.ex b/lib/memex_web/components/core_components.ex index 1b73e7f..8c5d6d5 100644 --- a/lib/memex_web/components/core_components.ex +++ b/lib/memex_web/components/core_components.ex @@ -8,7 +8,7 @@ defmodule MemexWeb.CoreComponents do alias Memex.{Accounts, Accounts.Invite, Accounts.User} alias Memex.Contexts.Context alias Memex.Notes.Note - alias Memex.Pipelines.Steps.Step + alias Memex.Pipelines.{Pipeline, Steps.Step} alias Phoenix.HTML alias Phoenix.LiveView.JS @@ -130,53 +130,118 @@ defmodule MemexWeb.CoreComponents do def step_content(assigns) - defp add_links_to_content(content, data_qa_prefix) do - # replace links + attr :pipeline, Pipeline, required: true - # link regex from - # https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url - # and modified with additional schemes from - # https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml + def pipeline_content(assigns) - content = - Regex.replace( - ~r<((file|git|https?|ipfs|ipns|irc|jabber|magnet|mailto|mumble|tel|udp|xmpp):\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))>, - content, - fn _whole_match, link -> - link = - HTML.Link.link( - link, - to: link, - class: "link inline", - target: "_blank", - rel: "noopener noreferrer" - ) - |> HTML.Safe.to_iodata() - |> IO.iodata_to_binary() + defp display_backlinks(record) do + record + |> get_text() + |> replace_links(record) + |> replace_triple_backlinks(record) + |> replace_double_backlinks(record) + |> replace_single_backlinks(record) + |> HTML.raw() + end - "

#{link}

" - end - ) + defp get_text(%{content: content}), do: content + defp get_text(%{description: description}), do: description + defp get_text(_fallthrough), do: "" - content = - Regex.replace( - ~r/\[\[([\p{L}\p{N}\-]+)\]\]/, - content, - fn _whole_match, slug -> - link = - HTML.Link.link( - "[[#{slug}]]", - to: ~p"/note/#{slug}", - class: "link inline", - data: [qa: "#{data_qa_prefix}-#{slug}"] - ) - |> HTML.Safe.to_iodata() - |> IO.iodata_to_binary() + # link regex from + # https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url + # and modified with additional schemes from + # https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml + defp replace_links(content, _record) do + Regex.replace( + ~r<((file|git|https?|ipfs|ipns|irc|jabber|magnet|mailto|mumble|tel|udp|xmpp):\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))>, + content, + fn _whole_match, link -> + link = + HTML.Link.link( + link, + to: link, + class: "link inline", + target: "_blank", + rel: "noopener noreferrer" + ) + |> HTML.Safe.to_iodata() + |> IO.iodata_to_binary() - "

#{link}

" - end - ) + "

#{link}

" + end + ) + end - content |> HTML.raw() + defp replace_triple_backlinks(content, _record) do + Regex.replace( + ~r/(^|[^\[])\[\[\[([\p{L}\p{N}\-]+)\]\]\]($|[^\]])/, + content, + fn _whole_match, prefix, slug, suffix -> + link = + HTML.Link.link( + "[[[#{slug}]]]", + to: ~p"/note/#{slug}", + class: "link inline" + ) + |> HTML.Safe.to_iodata() + |> IO.iodata_to_binary() + + "#{prefix}

#{link}

#{suffix}" + end + ) + end + + defp replace_double_backlinks(content, record) do + Regex.replace( + ~r/(^|[^\[])\[\[([\p{L}\p{N}\-]+)\]\]($|[^\]])/, + content, + fn _whole_match, prefix, slug, suffix -> + target = + case record do + %Pipeline{} -> ~p"/context/#{slug}" + %Step{} -> ~p"/context/#{slug}" + _context -> ~p"/note/#{slug}" + end + + link = + HTML.Link.link( + "[[#{slug}]]", + to: target, + class: "link inline" + ) + |> HTML.Safe.to_iodata() + |> IO.iodata_to_binary() + + "#{prefix}

#{link}

#{suffix}" + end + ) + end + + defp replace_single_backlinks(content, record) do + Regex.replace( + ~r/(^|[^\[])\[([\p{L}\p{N}\-]+)\]($|[^\]])/, + content, + fn _whole_match, prefix, slug, suffix -> + target = + case record do + %Pipeline{} -> ~p"/pipeline/#{slug}" + %Step{} -> ~p"/pipeline/#{slug}" + %Context{} -> ~p"/context/#{slug}" + _note -> ~p"/note/#{slug}" + end + + link = + HTML.Link.link( + "[#{slug}]", + to: target, + class: "link inline" + ) + |> HTML.Safe.to_iodata() + |> IO.iodata_to_binary() + + "#{prefix}

#{link}

#{suffix}" + end + ) end end diff --git a/lib/memex_web/components/core_components/context_content.html.heex b/lib/memex_web/components/core_components/context_content.html.heex index c9f94dd..8c14687 100644 --- a/lib/memex_web/components/core_components/context_content.html.heex +++ b/lib/memex_web/components/core_components/context_content.html.heex @@ -4,4 +4,4 @@ phx-update="ignore" readonly phx-no-format ->

<%= add_links_to_content(@context.content, "context-note") %>

+>

<%= display_backlinks(@context) %>

diff --git a/lib/memex_web/components/core_components/note_content.html.heex b/lib/memex_web/components/core_components/note_content.html.heex index 417d420..b51e733 100644 --- a/lib/memex_web/components/core_components/note_content.html.heex +++ b/lib/memex_web/components/core_components/note_content.html.heex @@ -4,4 +4,4 @@ phx-update="ignore" readonly phx-no-format ->

<%= add_links_to_content(@note.content, "note-link") %>

+>

<%= display_backlinks(@note) %>

diff --git a/lib/memex_web/components/core_components/pipeline_content.html.heex b/lib/memex_web/components/core_components/pipeline_content.html.heex new file mode 100644 index 0000000..9168ecb --- /dev/null +++ b/lib/memex_web/components/core_components/pipeline_content.html.heex @@ -0,0 +1,7 @@ +

<%= display_backlinks(@pipeline) %>

diff --git a/lib/memex_web/components/core_components/step_content.html.heex b/lib/memex_web/components/core_components/step_content.html.heex index 76eb7c1..7700e34 100644 --- a/lib/memex_web/components/core_components/step_content.html.heex +++ b/lib/memex_web/components/core_components/step_content.html.heex @@ -4,4 +4,4 @@ phx-update="ignore" readonly phx-no-format ->

<%= add_links_to_content(@step.content, "step-context") %>

+>

<%= display_backlinks(@step) %>

diff --git a/lib/memex_web/live/context_live/form_component.html.heex b/lib/memex_web/live/context_live/form_component.html.heex index 6a8ae15..8e50701 100644 --- a/lib/memex_web/live/context_live/form_component.html.heex +++ b/lib/memex_web/live/context_live/form_component.html.heex @@ -21,8 +21,10 @@ id: "context-form-content", class: "input input-primary h-64 min-h-64", phx_update: "ignore", - placeholder: gettext("use [[note-slug]] to link to a note"), - aria_label: gettext("use [[note-slug]] to link to a note"), + placeholder: + gettext("use [[note-slug]] to link to a note or [context-slug] to link to a context"), + aria_label: + gettext("use [[note-slug]] to link to a note or [context-slug] to link to a context"), phx_debounce: 300 ) %> <%= error_tag(f, :content) %> diff --git a/lib/memex_web/live/note_live/form_component.html.heex b/lib/memex_web/live/note_live/form_component.html.heex index bac4608..827d841 100644 --- a/lib/memex_web/live/note_live/form_component.html.heex +++ b/lib/memex_web/live/note_live/form_component.html.heex @@ -21,8 +21,8 @@ id: "note-form-content", class: "input input-primary h-64 min-h-64", phx_update: "ignore", - placeholder: gettext("content"), - aria_label: gettext("content"), + placeholder: gettext("use [note-slug] to link to a note"), + aria_label: gettext("use [note-slug] to link to a note"), phx_debounce: 300 ) %> <%= error_tag(f, :content) %> diff --git a/lib/memex_web/live/pipeline_live/form_component.html.heex b/lib/memex_web/live/pipeline_live/form_component.html.heex index 6e934ef..bbc17cf 100644 --- a/lib/memex_web/live/pipeline_live/form_component.html.heex +++ b/lib/memex_web/live/pipeline_live/form_component.html.heex @@ -21,8 +21,14 @@ id: "pipeline-form-description", class: "input input-primary h-64 min-h-64", phx_update: "ignore", - placeholder: gettext("description"), - aria_label: gettext("description"), + placeholder: + gettext( + "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" + ), + aria_label: + gettext( + "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" + ), phx_debounce: 300 ) %> <%= error_tag(f, :description) %> diff --git a/lib/memex_web/live/pipeline_live/show.html.heex b/lib/memex_web/live/pipeline_live/show.html.heex index 0f43ec0..2f5cb6d 100644 --- a/lib/memex_web/live/pipeline_live/show.html.heex +++ b/lib/memex_web/live/pipeline_live/show.html.heex @@ -9,14 +9,7 @@ - + <.pipeline_content pipeline={@pipeline} />

<%= gettext("Visibility: %{visibility}", visibility: @pipeline.visibility) %> diff --git a/lib/memex_web/live/step_live/form_component.html.heex b/lib/memex_web/live/step_live/form_component.html.heex index 994fb5a..ca023ea 100644 --- a/lib/memex_web/live/step_live/form_component.html.heex +++ b/lib/memex_web/live/step_live/form_component.html.heex @@ -21,8 +21,14 @@ id: "step-form-content", class: "input input-primary h-64 min-h-64", phx_update: "ignore", - placeholder: gettext("use [[context-slug]] to link to a context"), - aria_label: gettext("use [[context-slug]] to link to a context"), + placeholder: + gettext( + "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" + ), + aria_label: + gettext( + "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" + ), phx_debounce: 300 ) %> <%= error_tag(f, :content) %> diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index 7ca3be7..deaa7fe 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -44,8 +44,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:50 #: lib/memex_web/live/note_live/show.html.heex:34 #: lib/memex_web/live/pipeline_live/index.html.heex:52 -#: lib/memex_web/live/pipeline_live/show.html.heex:41 -#: lib/memex_web/live/pipeline_live/show.html.heex:112 +#: lib/memex_web/live/pipeline_live/show.html.heex:34 +#: lib/memex_web/live/pipeline_live/show.html.heex:105 #, elixir-autogen, elixir-format msgid "delete" msgstr "" @@ -60,8 +60,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:40 #: lib/memex_web/live/note_live/show.html.heex:24 #: lib/memex_web/live/pipeline_live/index.html.heex:40 -#: lib/memex_web/live/pipeline_live/show.html.heex:31 -#: lib/memex_web/live/pipeline_live/show.html.heex:101 +#: lib/memex_web/live/pipeline_live/show.html.heex:24 +#: lib/memex_web/live/pipeline_live/show.html.heex:94 #, elixir-autogen, elixir-format msgid "edit" msgstr "" @@ -108,16 +108,16 @@ msgstr "" msgid "register" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:47 +#: lib/memex_web/live/context_live/form_component.html.heex:49 #: lib/memex_web/live/invite_live/form_component.html.heex:47 #: lib/memex_web/live/note_live/form_component.html.heex:47 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:47 -#: lib/memex_web/live/step_live/form_component.html.heex:31 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:53 +#: lib/memex_web/live/step_live/form_component.html.heex:37 #, elixir-autogen, elixir-format msgid "save" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:127 +#: lib/memex_web/live/pipeline_live/show.html.heex:120 #, elixir-autogen, elixir-format msgid "add step" msgstr "" @@ -162,12 +162,12 @@ msgid "delete %{note_slug}" msgstr "" #: lib/memex_web/live/pipeline_live/index.html.heex:49 -#: lib/memex_web/live/pipeline_live/show.html.heex:39 +#: lib/memex_web/live/pipeline_live/show.html.heex:32 #, elixir-autogen, elixir-format msgid "delete %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:110 +#: lib/memex_web/live/pipeline_live/show.html.heex:103 #, elixir-autogen, elixir-format msgid "delete %{step_title}" msgstr "" @@ -192,7 +192,7 @@ msgstr "" msgid "edit %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:99 +#: lib/memex_web/live/pipeline_live/show.html.heex:92 #, elixir-autogen, elixir-format msgid "edit %{step_title}" msgstr "" @@ -202,12 +202,12 @@ msgstr "" msgid "edit invite for %{invite_name}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:89 +#: lib/memex_web/live/pipeline_live/show.html.heex:82 #, elixir-autogen, elixir-format msgid "move %{step_title} down" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:73 +#: lib/memex_web/live/pipeline_live/show.html.heex:66 #, elixir-autogen, elixir-format msgid "move %{step_title} up" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/actions.po b/priv/gettext/de/LC_MESSAGES/actions.po index 2e5c211..5497f0f 100644 --- a/priv/gettext/de/LC_MESSAGES/actions.po +++ b/priv/gettext/de/LC_MESSAGES/actions.po @@ -44,8 +44,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:50 #: lib/memex_web/live/note_live/show.html.heex:34 #: lib/memex_web/live/pipeline_live/index.html.heex:52 -#: lib/memex_web/live/pipeline_live/show.html.heex:41 -#: lib/memex_web/live/pipeline_live/show.html.heex:112 +#: lib/memex_web/live/pipeline_live/show.html.heex:34 +#: lib/memex_web/live/pipeline_live/show.html.heex:105 #, elixir-autogen, elixir-format msgid "delete" msgstr "" @@ -60,8 +60,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:40 #: lib/memex_web/live/note_live/show.html.heex:24 #: lib/memex_web/live/pipeline_live/index.html.heex:40 -#: lib/memex_web/live/pipeline_live/show.html.heex:31 -#: lib/memex_web/live/pipeline_live/show.html.heex:101 +#: lib/memex_web/live/pipeline_live/show.html.heex:24 +#: lib/memex_web/live/pipeline_live/show.html.heex:94 #, elixir-autogen, elixir-format msgid "edit" msgstr "" @@ -108,16 +108,16 @@ msgstr "" msgid "register" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:47 +#: lib/memex_web/live/context_live/form_component.html.heex:49 #: lib/memex_web/live/invite_live/form_component.html.heex:47 #: lib/memex_web/live/note_live/form_component.html.heex:47 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:47 -#: lib/memex_web/live/step_live/form_component.html.heex:31 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:53 +#: lib/memex_web/live/step_live/form_component.html.heex:37 #, elixir-autogen, elixir-format msgid "save" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:127 +#: lib/memex_web/live/pipeline_live/show.html.heex:120 #, elixir-autogen, elixir-format msgid "add step" msgstr "" @@ -162,12 +162,12 @@ msgid "delete %{note_slug}" msgstr "" #: lib/memex_web/live/pipeline_live/index.html.heex:49 -#: lib/memex_web/live/pipeline_live/show.html.heex:39 +#: lib/memex_web/live/pipeline_live/show.html.heex:32 #, elixir-autogen, elixir-format msgid "delete %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:110 +#: lib/memex_web/live/pipeline_live/show.html.heex:103 #, elixir-autogen, elixir-format msgid "delete %{step_title}" msgstr "" @@ -192,7 +192,7 @@ msgstr "" msgid "edit %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:99 +#: lib/memex_web/live/pipeline_live/show.html.heex:92 #, elixir-autogen, elixir-format msgid "edit %{step_title}" msgstr "" @@ -202,12 +202,12 @@ msgstr "" msgid "edit invite for %{invite_name}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:89 +#: lib/memex_web/live/pipeline_live/show.html.heex:82 #, elixir-autogen, elixir-format msgid "move %{step_title} down" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:73 +#: lib/memex_web/live/pipeline_live/show.html.heex:66 #, elixir-autogen, elixir-format msgid "move %{step_title} up" msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index ad6cbf5..f271418 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -19,7 +19,7 @@ msgstr "" #: lib/memex_web/live/context_live/show.html.heex:15 #: lib/memex_web/live/note_live/show.html.heex:15 -#: lib/memex_web/live/pipeline_live/show.html.heex:22 +#: lib/memex_web/live/pipeline_live/show.html.heex:15 #, elixir-autogen, elixir-format msgid "Visibility: %{visibility}" msgstr "" @@ -45,12 +45,6 @@ msgstr "" msgid "confirm new password" msgstr "" -#: lib/memex_web/live/note_live/form_component.html.heex:24 -#: lib/memex_web/live/note_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "content" -msgstr "" - #: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:43 @@ -243,20 +237,20 @@ msgstr "" msgid "report bugs or request features" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:48 +#: lib/memex_web/live/context_live/form_component.html.heex:50 #: lib/memex_web/live/note_live/form_component.html.heex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 -#: lib/memex_web/live/step_live/form_component.html.heex:32 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:54 +#: lib/memex_web/live/step_live/form_component.html.heex:38 #, elixir-autogen, elixir-format msgid "saving..." msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:42 -#: lib/memex_web/live/context_live/form_component.html.heex:43 +#: lib/memex_web/live/context_live/form_component.html.heex:44 +#: lib/memex_web/live/context_live/form_component.html.heex:45 #: lib/memex_web/live/note_live/form_component.html.heex:42 #: lib/memex_web/live/note_live/form_component.html.heex:43 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:42 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:43 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:49 #, elixir-autogen, elixir-format msgid "select privacy" msgstr "" @@ -272,12 +266,12 @@ msgstr "" msgid "settings" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:33 -#: lib/memex_web/live/context_live/form_component.html.heex:34 +#: lib/memex_web/live/context_live/form_component.html.heex:35 +#: lib/memex_web/live/context_live/form_component.html.heex:36 #: lib/memex_web/live/note_live/form_component.html.heex:33 #: lib/memex_web/live/note_live/form_component.html.heex:34 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:33 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:34 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:39 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #, elixir-autogen, elixir-format msgid "tag1,tag2" msgstr "" @@ -334,8 +328,6 @@ msgid "no contexts found" msgstr "" #: lib/memex_web/components/pipelines_table_component.ex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:24 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 #, elixir-autogen, elixir-format msgid "description" msgstr "" @@ -409,12 +401,6 @@ msgstr "" msgid "home" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:24 -#: lib/memex_web/live/context_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[note-slug]] to link to a note" -msgstr "" - #: lib/memex_web/live/faq_live.ex:10 #: lib/memex_web/live/faq_live.html.heex:3 #, elixir-autogen, elixir-format @@ -436,7 +422,7 @@ msgstr "" msgid "what is this?" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:59 +#: lib/memex_web/live/pipeline_live/show.html.heex:52 #, elixir-autogen, elixir-format msgid "%{position}. %{title}" msgstr "" @@ -461,12 +447,12 @@ msgstr "" msgid "add step to %{slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:53 +#: lib/memex_web/live/pipeline_live/show.html.heex:46 #, elixir-autogen, elixir-format msgid "no steps" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:48 +#: lib/memex_web/live/pipeline_live/show.html.heex:41 #, elixir-autogen, elixir-format msgid "steps:" msgstr "" @@ -477,12 +463,6 @@ msgstr "" msgid "title" msgstr "" -#: lib/memex_web/live/step_live/form_component.html.heex:24 -#: lib/memex_web/live/step_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[context-slug]] to link to a context" -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:65 #, elixir-autogen, elixir-format msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" @@ -711,3 +691,23 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "reset your password" msgstr "" + +#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:29 +#: lib/memex_web/live/step_live/form_component.html.heex:25 +#: lib/memex_web/live/step_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format +msgid "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" +msgstr "" + +#: lib/memex_web/live/context_live/form_component.html.heex:25 +#: lib/memex_web/live/context_live/form_component.html.heex:27 +#, elixir-autogen, elixir-format, fuzzy +msgid "use [[note-slug]] to link to a note or [context-slug] to link to a context" +msgstr "" + +#: lib/memex_web/live/note_live/form_component.html.heex:24 +#: lib/memex_web/live/note_live/form_component.html.heex:25 +#, elixir-autogen, elixir-format, fuzzy +msgid "use [note-slug] to link to a note" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 86c77bd..8ccc681 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -70,8 +70,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:47 #: lib/memex_web/live/note_live/show.html.heex:31 #: lib/memex_web/live/pipeline_live/index.html.heex:47 -#: lib/memex_web/live/pipeline_live/show.html.heex:38 -#: lib/memex_web/live/pipeline_live/show.html.heex:109 +#: lib/memex_web/live/pipeline_live/show.html.heex:31 +#: lib/memex_web/live/pipeline_live/show.html.heex:102 #, elixir-autogen, elixir-format msgid "are you sure?" msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 604eb22..787ba5b 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -17,7 +17,7 @@ msgstr "" #: lib/memex_web/live/context_live/show.html.heex:15 #: lib/memex_web/live/note_live/show.html.heex:15 -#: lib/memex_web/live/pipeline_live/show.html.heex:22 +#: lib/memex_web/live/pipeline_live/show.html.heex:15 #, elixir-autogen, elixir-format msgid "Visibility: %{visibility}" msgstr "" @@ -43,12 +43,6 @@ msgstr "" msgid "confirm new password" msgstr "" -#: lib/memex_web/live/note_live/form_component.html.heex:24 -#: lib/memex_web/live/note_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "content" -msgstr "" - #: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:43 @@ -241,20 +235,20 @@ msgstr "" msgid "report bugs or request features" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:48 +#: lib/memex_web/live/context_live/form_component.html.heex:50 #: lib/memex_web/live/note_live/form_component.html.heex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 -#: lib/memex_web/live/step_live/form_component.html.heex:32 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:54 +#: lib/memex_web/live/step_live/form_component.html.heex:38 #, elixir-autogen, elixir-format msgid "saving..." msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:42 -#: lib/memex_web/live/context_live/form_component.html.heex:43 +#: lib/memex_web/live/context_live/form_component.html.heex:44 +#: lib/memex_web/live/context_live/form_component.html.heex:45 #: lib/memex_web/live/note_live/form_component.html.heex:42 #: lib/memex_web/live/note_live/form_component.html.heex:43 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:42 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:43 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:49 #, elixir-autogen, elixir-format msgid "select privacy" msgstr "" @@ -270,12 +264,12 @@ msgstr "" msgid "settings" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:33 -#: lib/memex_web/live/context_live/form_component.html.heex:34 +#: lib/memex_web/live/context_live/form_component.html.heex:35 +#: lib/memex_web/live/context_live/form_component.html.heex:36 #: lib/memex_web/live/note_live/form_component.html.heex:33 #: lib/memex_web/live/note_live/form_component.html.heex:34 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:33 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:34 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:39 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #, elixir-autogen, elixir-format msgid "tag1,tag2" msgstr "" @@ -332,8 +326,6 @@ msgid "no contexts found" msgstr "" #: lib/memex_web/components/pipelines_table_component.ex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:24 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 #, elixir-autogen, elixir-format msgid "description" msgstr "" @@ -407,12 +399,6 @@ msgstr "" msgid "home" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:24 -#: lib/memex_web/live/context_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[note-slug]] to link to a note" -msgstr "" - #: lib/memex_web/live/faq_live.ex:10 #: lib/memex_web/live/faq_live.html.heex:3 #, elixir-autogen, elixir-format @@ -434,7 +420,7 @@ msgstr "" msgid "what is this?" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:59 +#: lib/memex_web/live/pipeline_live/show.html.heex:52 #, elixir-autogen, elixir-format msgid "%{position}. %{title}" msgstr "" @@ -459,12 +445,12 @@ msgstr "" msgid "add step to %{slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:53 +#: lib/memex_web/live/pipeline_live/show.html.heex:46 #, elixir-autogen, elixir-format msgid "no steps" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:48 +#: lib/memex_web/live/pipeline_live/show.html.heex:41 #, elixir-autogen, elixir-format msgid "steps:" msgstr "" @@ -475,12 +461,6 @@ msgstr "" msgid "title" msgstr "" -#: lib/memex_web/live/step_live/form_component.html.heex:24 -#: lib/memex_web/live/step_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[context-slug]] to link to a context" -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:65 #, elixir-autogen, elixir-format msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" @@ -709,3 +689,23 @@ msgstr "" #, elixir-autogen, elixir-format msgid "reset your password" msgstr "" + +#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:29 +#: lib/memex_web/live/step_live/form_component.html.heex:25 +#: lib/memex_web/live/step_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format +msgid "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" +msgstr "" + +#: lib/memex_web/live/context_live/form_component.html.heex:25 +#: lib/memex_web/live/context_live/form_component.html.heex:27 +#, elixir-autogen, elixir-format +msgid "use [[note-slug]] to link to a note or [context-slug] to link to a context" +msgstr "" + +#: lib/memex_web/live/note_live/form_component.html.heex:24 +#: lib/memex_web/live/note_live/form_component.html.heex:25 +#, elixir-autogen, elixir-format +msgid "use [note-slug] to link to a note" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/actions.po b/priv/gettext/en/LC_MESSAGES/actions.po index f349725..d44e046 100644 --- a/priv/gettext/en/LC_MESSAGES/actions.po +++ b/priv/gettext/en/LC_MESSAGES/actions.po @@ -45,8 +45,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:50 #: lib/memex_web/live/note_live/show.html.heex:34 #: lib/memex_web/live/pipeline_live/index.html.heex:52 -#: lib/memex_web/live/pipeline_live/show.html.heex:41 -#: lib/memex_web/live/pipeline_live/show.html.heex:112 +#: lib/memex_web/live/pipeline_live/show.html.heex:34 +#: lib/memex_web/live/pipeline_live/show.html.heex:105 #, elixir-autogen, elixir-format msgid "delete" msgstr "" @@ -61,8 +61,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:40 #: lib/memex_web/live/note_live/show.html.heex:24 #: lib/memex_web/live/pipeline_live/index.html.heex:40 -#: lib/memex_web/live/pipeline_live/show.html.heex:31 -#: lib/memex_web/live/pipeline_live/show.html.heex:101 +#: lib/memex_web/live/pipeline_live/show.html.heex:24 +#: lib/memex_web/live/pipeline_live/show.html.heex:94 #, elixir-autogen, elixir-format msgid "edit" msgstr "" @@ -109,16 +109,16 @@ msgstr "" msgid "register" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:47 +#: lib/memex_web/live/context_live/form_component.html.heex:49 #: lib/memex_web/live/invite_live/form_component.html.heex:47 #: lib/memex_web/live/note_live/form_component.html.heex:47 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:47 -#: lib/memex_web/live/step_live/form_component.html.heex:31 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:53 +#: lib/memex_web/live/step_live/form_component.html.heex:37 #, elixir-autogen, elixir-format msgid "save" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:127 +#: lib/memex_web/live/pipeline_live/show.html.heex:120 #, elixir-autogen, elixir-format msgid "add step" msgstr "" @@ -163,12 +163,12 @@ msgid "delete %{note_slug}" msgstr "" #: lib/memex_web/live/pipeline_live/index.html.heex:49 -#: lib/memex_web/live/pipeline_live/show.html.heex:39 +#: lib/memex_web/live/pipeline_live/show.html.heex:32 #, elixir-autogen, elixir-format msgid "delete %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:110 +#: lib/memex_web/live/pipeline_live/show.html.heex:103 #, elixir-autogen, elixir-format msgid "delete %{step_title}" msgstr "" @@ -193,7 +193,7 @@ msgstr "" msgid "edit %{pipeline_slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:99 +#: lib/memex_web/live/pipeline_live/show.html.heex:92 #, elixir-autogen, elixir-format msgid "edit %{step_title}" msgstr "" @@ -203,12 +203,12 @@ msgstr "" msgid "edit invite for %{invite_name}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:89 +#: lib/memex_web/live/pipeline_live/show.html.heex:82 #, elixir-autogen, elixir-format msgid "move %{step_title} down" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:73 +#: lib/memex_web/live/pipeline_live/show.html.heex:66 #, elixir-autogen, elixir-format msgid "move %{step_title} up" msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 4239565..9f65a37 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -18,7 +18,7 @@ msgstr "" #: lib/memex_web/live/context_live/show.html.heex:15 #: lib/memex_web/live/note_live/show.html.heex:15 -#: lib/memex_web/live/pipeline_live/show.html.heex:22 +#: lib/memex_web/live/pipeline_live/show.html.heex:15 #, elixir-autogen, elixir-format msgid "Visibility: %{visibility}" msgstr "" @@ -44,12 +44,6 @@ msgstr "" msgid "confirm new password" msgstr "" -#: lib/memex_web/live/note_live/form_component.html.heex:24 -#: lib/memex_web/live/note_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "content" -msgstr "" - #: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:43 @@ -242,20 +236,20 @@ msgstr "" msgid "report bugs or request features" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:48 +#: lib/memex_web/live/context_live/form_component.html.heex:50 #: lib/memex_web/live/note_live/form_component.html.heex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 -#: lib/memex_web/live/step_live/form_component.html.heex:32 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:54 +#: lib/memex_web/live/step_live/form_component.html.heex:38 #, elixir-autogen, elixir-format msgid "saving..." msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:42 -#: lib/memex_web/live/context_live/form_component.html.heex:43 +#: lib/memex_web/live/context_live/form_component.html.heex:44 +#: lib/memex_web/live/context_live/form_component.html.heex:45 #: lib/memex_web/live/note_live/form_component.html.heex:42 #: lib/memex_web/live/note_live/form_component.html.heex:43 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:42 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:43 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:48 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:49 #, elixir-autogen, elixir-format msgid "select privacy" msgstr "" @@ -271,12 +265,12 @@ msgstr "" msgid "settings" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:33 -#: lib/memex_web/live/context_live/form_component.html.heex:34 +#: lib/memex_web/live/context_live/form_component.html.heex:35 +#: lib/memex_web/live/context_live/form_component.html.heex:36 #: lib/memex_web/live/note_live/form_component.html.heex:33 #: lib/memex_web/live/note_live/form_component.html.heex:34 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:33 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:34 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:39 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:40 #, elixir-autogen, elixir-format msgid "tag1,tag2" msgstr "" @@ -333,8 +327,6 @@ msgid "no contexts found" msgstr "" #: lib/memex_web/components/pipelines_table_component.ex:48 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:24 -#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 #, elixir-autogen, elixir-format msgid "description" msgstr "" @@ -408,12 +400,6 @@ msgstr "" msgid "home" msgstr "" -#: lib/memex_web/live/context_live/form_component.html.heex:24 -#: lib/memex_web/live/context_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[note-slug]] to link to a note" -msgstr "" - #: lib/memex_web/live/faq_live.ex:10 #: lib/memex_web/live/faq_live.html.heex:3 #, elixir-autogen, elixir-format @@ -435,7 +421,7 @@ msgstr "" msgid "what is this?" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:59 +#: lib/memex_web/live/pipeline_live/show.html.heex:52 #, elixir-autogen, elixir-format msgid "%{position}. %{title}" msgstr "" @@ -460,12 +446,12 @@ msgstr "" msgid "add step to %{slug}" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:53 +#: lib/memex_web/live/pipeline_live/show.html.heex:46 #, elixir-autogen, elixir-format msgid "no steps" msgstr "" -#: lib/memex_web/live/pipeline_live/show.html.heex:48 +#: lib/memex_web/live/pipeline_live/show.html.heex:41 #, elixir-autogen, elixir-format msgid "steps:" msgstr "" @@ -476,12 +462,6 @@ msgstr "" msgid "title" msgstr "" -#: lib/memex_web/live/step_live/form_component.html.heex:24 -#: lib/memex_web/live/step_live/form_component.html.heex:25 -#, elixir-autogen, elixir-format -msgid "use [[context-slug]] to link to a context" -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:65 #, elixir-autogen, elixir-format msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" @@ -710,3 +690,23 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "reset your password" msgstr "" + +#: lib/memex_web/live/pipeline_live/form_component.html.heex:25 +#: lib/memex_web/live/pipeline_live/form_component.html.heex:29 +#: lib/memex_web/live/step_live/form_component.html.heex:25 +#: lib/memex_web/live/step_live/form_component.html.heex:29 +#, elixir-autogen, elixir-format +msgid "use [[[note-slug]]] to link to a note or use [[context-slug]] to link to a context or [pipeline-slug] to link to a pipeline" +msgstr "" + +#: lib/memex_web/live/context_live/form_component.html.heex:25 +#: lib/memex_web/live/context_live/form_component.html.heex:27 +#, elixir-autogen, elixir-format, fuzzy +msgid "use [[note-slug]] to link to a note or [context-slug] to link to a context" +msgstr "" + +#: lib/memex_web/live/note_live/form_component.html.heex:24 +#: lib/memex_web/live/note_live/form_component.html.heex:25 +#, elixir-autogen, elixir-format, fuzzy +msgid "use [note-slug] to link to a note" +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/prompts.po b/priv/gettext/en/LC_MESSAGES/prompts.po index a91b6a1..2dcaea1 100644 --- a/priv/gettext/en/LC_MESSAGES/prompts.po +++ b/priv/gettext/en/LC_MESSAGES/prompts.po @@ -71,8 +71,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:47 #: lib/memex_web/live/note_live/show.html.heex:31 #: lib/memex_web/live/pipeline_live/index.html.heex:47 -#: lib/memex_web/live/pipeline_live/show.html.heex:38 -#: lib/memex_web/live/pipeline_live/show.html.heex:109 +#: lib/memex_web/live/pipeline_live/show.html.heex:31 +#: lib/memex_web/live/pipeline_live/show.html.heex:102 #, elixir-autogen, elixir-format msgid "are you sure?" msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 9e39b31..6fa14fe 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -70,8 +70,8 @@ msgstr "" #: lib/memex_web/live/note_live/index.html.heex:47 #: lib/memex_web/live/note_live/show.html.heex:31 #: lib/memex_web/live/pipeline_live/index.html.heex:47 -#: lib/memex_web/live/pipeline_live/show.html.heex:38 -#: lib/memex_web/live/pipeline_live/show.html.heex:109 +#: lib/memex_web/live/pipeline_live/show.html.heex:31 +#: lib/memex_web/live/pipeline_live/show.html.heex:102 #, elixir-autogen, elixir-format msgid "are you sure?" msgstr ""