From 571e0b65b6fa39d1925124091224dbee334f7042 Mon Sep 17 00:00:00 2001 From: shibao Date: Fri, 23 Feb 2024 23:35:37 -0500 Subject: [PATCH] fix faq page copy --- changelog.md | 3 ++ lib/memex_web/live/faq_live.html.heex | 8 +++--- mix.exs | 2 +- priv/gettext/de/LC_MESSAGES/default.po | 40 +++++++++++++------------- priv/gettext/default.pot | 40 +++++++++++++------------- priv/gettext/en/LC_MESSAGES/default.po | 40 +++++++++++++------------- 6 files changed, 68 insertions(+), 65 deletions(-) diff --git a/changelog.md b/changelog.md index 861047f..04167c7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v0.1.16 +- Fix faq copy + # v0.1.15 - Sanitize titles while they are being typed - Sanitize tags while they are being typed diff --git a/lib/memex_web/live/faq_live.html.heex b/lib/memex_web/live/faq_live.html.heex index 1bfcf9f..59ee637 100644 --- a/lib/memex_web/live/faq_live.html.heex +++ b/lib/memex_web/live/faq_live.html.heex @@ -89,7 +89,7 @@

<%= gettext("in my opinion, contexts should be like single-topic blog posts.") %> <%= gettext( - "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could backlink to the spoon note as an example of how it fits nicely into your hand." + "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could link to the spoon note as an example of how it fits nicely into your hand." ) %>

@@ -100,10 +100,10 @@

<%= gettext( - "in my opinion, pipelines should be pretty lightweight, and just backlink to contexts to provide most of the heavy lifting." + "in my opinion, pipelines should be pretty lightweight, and just link to contexts to provide most of the heavy lifting." ) %> <%= gettext( - "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could backlink to the physical designs context, maybe with some notes about how it applies in this case." + "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could link to the physical designs context, maybe with some notes about how it applies in this case." ) %>

@@ -117,7 +117,7 @@ "while memEx fully supports multiple users, each memEx instance should be treated as a single cohesive and collaborative document." ) %> <%= gettext( - "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you." + "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you." ) %> <%= gettext( "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)" diff --git a/mix.exs b/mix.exs index 586aa38..54ecd06 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Memex.MixProject do def project do [ app: :memex, - version: "0.1.15", + version: "0.1.16", elixir: "1.16.1", elixirc_paths: elixirc_paths(Mix.env()), start_permanent: Mix.env() == :prod, diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index d96a09f..13d1c24 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -468,16 +468,6 @@ msgstr "" msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:91 -#, elixir-autogen, elixir-format -msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could backlink to the spoon note as an example of how it fits nicely into your hand." -msgstr "" - -#: lib/memex_web/live/faq_live.html.heex:105 -#, elixir-autogen, elixir-format -msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could backlink to the physical designs context, maybe with some notes about how it applies in this case." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:59 #, elixir-autogen, elixir-format msgid "i really admired the idea of a zettelkasten, especially with org-mode backlinks, however I felt like my notes would immediately become too messy by just putting everything into a single hierarchy." @@ -498,11 +488,6 @@ msgstr "" msgid "in my opinion, notes should be written by any of the discrete objects or concepts that are meaningful to you in your life." msgstr "" -#: lib/memex_web/live/faq_live.html.heex:102 -#, elixir-autogen, elixir-format -msgid "in my opinion, pipelines should be pretty lightweight, and just backlink to contexts to provide most of the heavy lifting." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:28 #, elixir-autogen, elixir-format msgid "memex" @@ -568,11 +553,6 @@ msgstr "" msgid "how many people should i invite?" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:119 -#, elixir-autogen, elixir-format -msgid "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:122 #, elixir-autogen, elixir-format msgid "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)" @@ -711,3 +691,23 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "use [note-slug] to link to a note" msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:91 +#, elixir-autogen, elixir-format, fuzzy +msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could link to the spoon note as an example of how it fits nicely into your hand." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:105 +#, elixir-autogen, elixir-format, fuzzy +msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could link to the physical designs context, maybe with some notes about how it applies in this case." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:102 +#, elixir-autogen, elixir-format, fuzzy +msgid "in my opinion, pipelines should be pretty lightweight, and just link to contexts to provide most of the heavy lifting." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:119 +#, elixir-autogen, elixir-format, fuzzy +msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you." +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index db4ba08..3b151b9 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -466,16 +466,6 @@ msgstr "" msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:91 -#, elixir-autogen, elixir-format -msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could backlink to the spoon note as an example of how it fits nicely into your hand." -msgstr "" - -#: lib/memex_web/live/faq_live.html.heex:105 -#, elixir-autogen, elixir-format -msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could backlink to the physical designs context, maybe with some notes about how it applies in this case." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:59 #, elixir-autogen, elixir-format msgid "i really admired the idea of a zettelkasten, especially with org-mode backlinks, however I felt like my notes would immediately become too messy by just putting everything into a single hierarchy." @@ -496,11 +486,6 @@ msgstr "" msgid "in my opinion, notes should be written by any of the discrete objects or concepts that are meaningful to you in your life." msgstr "" -#: lib/memex_web/live/faq_live.html.heex:102 -#, elixir-autogen, elixir-format -msgid "in my opinion, pipelines should be pretty lightweight, and just backlink to contexts to provide most of the heavy lifting." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:28 #, elixir-autogen, elixir-format msgid "memex" @@ -566,11 +551,6 @@ msgstr "" msgid "how many people should i invite?" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:119 -#, elixir-autogen, elixir-format -msgid "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:122 #, elixir-autogen, elixir-format msgid "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)" @@ -709,3 +689,23 @@ msgstr "" #, elixir-autogen, elixir-format msgid "use [note-slug] to link to a note" msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:91 +#, elixir-autogen, elixir-format +msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could link to the spoon note as an example of how it fits nicely into your hand." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:105 +#, elixir-autogen, elixir-format +msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could link to the physical designs context, maybe with some notes about how it applies in this case." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:102 +#, elixir-autogen, elixir-format +msgid "in my opinion, pipelines should be pretty lightweight, and just link to contexts to provide most of the heavy lifting." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:119 +#, elixir-autogen, elixir-format +msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you." +msgstr "" diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 29b8273..e6cb121 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -467,16 +467,6 @@ msgstr "" msgid "finally, i wanted to externalize the processes for common situations that use these thought processes at discrete steps. these are pipelines!" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:91 -#, elixir-autogen, elixir-format -msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could backlink to the spoon note as an example of how it fits nicely into your hand." -msgstr "" - -#: lib/memex_web/live/faq_live.html.heex:105 -#, elixir-autogen, elixir-format -msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could backlink to the physical designs context, maybe with some notes about how it applies in this case." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:59 #, elixir-autogen, elixir-format msgid "i really admired the idea of a zettelkasten, especially with org-mode backlinks, however I felt like my notes would immediately become too messy by just putting everything into a single hierarchy." @@ -497,11 +487,6 @@ msgstr "" msgid "in my opinion, notes should be written by any of the discrete objects or concepts that are meaningful to you in your life." msgstr "" -#: lib/memex_web/live/faq_live.html.heex:102 -#, elixir-autogen, elixir-format -msgid "in my opinion, pipelines should be pretty lightweight, and just backlink to contexts to provide most of the heavy lifting." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:28 #, elixir-autogen, elixir-format msgid "memex" @@ -567,11 +552,6 @@ msgstr "" msgid "how many people should i invite?" msgstr "" -#: lib/memex_web/live/faq_live.html.heex:119 -#, elixir-autogen, elixir-format -msgid "note, context and pipeline slugs must be unique, and you are free to backlink to notes not written by you." -msgstr "" - #: lib/memex_web/live/faq_live.html.heex:122 #, elixir-autogen, elixir-format msgid "so, i'd recommend inviting anyone you'd like to work on your collective memEx. however, when in doubt, hopefully setting up a new instance is easy enough. if it isn't, then feel free to let me know :)" @@ -710,3 +690,23 @@ msgstr "" #, elixir-autogen, elixir-format, fuzzy msgid "use [note-slug] to link to a note" msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:91 +#, elixir-autogen, elixir-format, fuzzy +msgid "for instance, a good context could be what makes some physical designs spark joy for you, and in that context you could link to the spoon note as an example of how it fits nicely into your hand." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:105 +#, elixir-autogen, elixir-format, fuzzy +msgid "for instance, a pipeline for buying an object could have a step where you consider how much it sparks joy, and it could link to the physical designs context, maybe with some notes about how it applies in this case." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:102 +#, elixir-autogen, elixir-format, fuzzy +msgid "in my opinion, pipelines should be pretty lightweight, and just link to contexts to provide most of the heavy lifting." +msgstr "" + +#: lib/memex_web/live/faq_live.html.heex:119 +#, elixir-autogen, elixir-format, fuzzy +msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you." +msgstr ""