fix some typos

changelog.md

@@ -1,6 +1,7 @@
 # v0.1.1
 - improve search a whole lot
 - improve table information for notes and contexts
+- fix some typos
 
 # v0.1.0
 initial release >:3c

contributing.md

@@ -77,14 +77,14 @@ Check them out!
 For development, I recommend setting environment variables with
 [direnv](https://direnv.net).
 
-By default, Memex will always bind to all external IPv4 and IPv6 addresses in
+By default, memEx will always bind to all external IPv4 and IPv6 addresses in
 `dev` and `prod` mode, respectively. If you would like to use different values,
 they will need to be overridden in `config/dev.exs` and `config/runtime.exs` for
 `dev` and `prod` modes, respectively.
 
 ## `MIX_ENV=dev`
 
-In `dev` mode, Memex will listen for these environment variables at runtime.
+In `dev` mode, memEx will listen for these environment variables at runtime.
 
 - `HOST`: External url to generate links with. Set this especially if you're
   behind a reverse proxy. Defaults to `localhost`. External URLs will always be
@@ -100,7 +100,7 @@ In `dev` mode, Memex will listen for these environment variables at runtime.
 
 ## `MIX_ENV=test`
 
-In `test` mode (or in the Docker container), Memex will listen for the same environment variables as dev mode, but also include the following at runtime:
+In `test` mode (or in the Docker container), memEx will listen for the same environment variables as dev mode, but also include the following at runtime:
 
 - `TEST_DATABASE_URL`: REPLACES `DATABASE_URL`. Controls the database url to
   connect to. Defaults to `ecto://postgres:postgres@localhost/memex_test`.
@@ -110,7 +110,7 @@ In `test` mode (or in the Docker container), Memex will listen for the same envi
 
 ## `MIX_ENV=prod`
 
-In `prod` mode (or in the Docker container), Memex will listen for the same environment variables as dev mode, but also include the following at runtime:
+In `prod` mode (or in the Docker container), memEx will listen for the same environment variables as dev mode, but also include the following at runtime:
 
 - `SECRET_KEY_BASE`: Secret key base used to sign cookies. Must be generated
   with `docker run -it shibaobun/memex mix phx.gen.secret` and set for server to start.
@@ -121,4 +121,4 @@ In `prod` mode (or in the Docker container), Memex will listen for the same envi
 - `SMTP_SSL`: Set to `true` to enable SSL for emails. Defaults to `false`.
 - `EMAIL_FROM`: Sets the sender email in sent emails. Defaults to
   `no-reply@HOST` where `HOST` was previously defined.
-- `EMAIL_NAME`: Sets the sender name in sent emails. Defaults to "Memex".
+- `EMAIL_NAME`: Sets the sender name in sent emails. Defaults to "memEx".

docker-compose.yml

@@ -25,8 +25,8 @@ services:
       # - SMTP_SSL=false
       # optional, default is format below
       # - EMAIL_FROM=no-reply@memex.example.tld
-      # optional, default is "Memex"
+      # optional, default is "memEx"
-      # - EMAIL_NAME=Memex
+      # - EMAIL_NAME=memEx
     expose:
       - "4000"
     depends_on:

lib/memex_web/templates/email/confirm_email.html.heex

@@ -6,7 +6,7 @@
   <br />
 
   <span style="margin-bottom: 1em; font-size: 1.25em;">
-    <%= dgettext("emails", "Welcome to Memex") %>
+    <%= dgettext("emails", "Welcome to memEx") %>
   </span>
 
   <br />
@@ -19,5 +19,5 @@
 
   <br />
 
-  <%= dgettext("emails", "If you didn't create an account at Memex, please ignore this.") %>
+  <%= dgettext("emails", "If you didn't create an account at memEx, please ignore this.") %>
 </div>

lib/memex_web/templates/email/confirm_email.txt.eex

@@ -1,7 +1,7 @@
 
 <%= dgettext("emails", "Hi %{email},", email: @user.email) %>
 
-<%= dgettext("emails", "Welcome to Memex") %>
+<%= dgettext("emails", "Welcome to memEx") %>
 
 <%= dgettext("emails", "You can confirm your account by visiting the URL below:") %>
 

lib/memex_web/templates/email/reset_password.html.heex

@@ -13,5 +13,5 @@
 
   <br />
 
-  <%= dgettext("emails", "If you didn't request this change from Memex, please ignore this.") %>
+  <%= dgettext("emails", "If you didn't request this change from memEx, please ignore this.") %>
 </div>

lib/memex_web/templates/email/update_email.html.heex

@@ -15,6 +15,6 @@
 
   <%= dgettext(
     "emails",
-    "If you didn't request this change from Memex, please ignore this."
+    "If you didn't request this change from memEx, please ignore this."
   ) %>
 </div>

lib/memex_web/templates/error/error.html.heex

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>
-      <%= dgettext("errors", "Error") %>| Memex
+      <%= dgettext("errors", "Error") %>| memEx
     </title>
     <link rel="stylesheet" href="/css/app.css" />
     <script defer type="text/javascript" src="/js/app.js">

lib/memex_web/views/layout_view.ex

@@ -1,17 +1,12 @@
 defmodule MemexWeb.LayoutView do
   use MemexWeb, :view
-  import MemexWeb.Components.Topbar
+  import MemexWeb.{Components.Topbar, Gettext}
   alias MemexWeb.HomeLive
 
   # Phoenix LiveDashboard is available only in development by default,
   # so we instruct Elixir to not warn if the dashboard route is missing.
   @compile {:no_warn_undefined, {Routes, :live_dashboard_path, 2}}
 
-  def get_title(conn) do
+  def get_title(%{assigns: %{title: title}}), do: gettext("memEx | %{title}", title: title)
-    if conn.assigns |> Map.has_key?(:title) do
+  def get_title(_conn), do: gettext("memEx")
-      "Memex | #{conn.assigns.title}"
-    else
-      "Memex"
-    end
-  end
 end

priv/gettext/de/LC_MESSAGES/default.po

@@ -495,6 +495,7 @@ msgstr ""
 #: lib/memex_web/live/home_live.html.heex:3
 #: lib/memex_web/templates/layout/root.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:9
+#: lib/memex_web/views/layout_view.ex:11
 #, elixir-autogen, elixir-format
 msgid "memEx"
 msgstr ""
@@ -643,3 +644,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "zettelkasten"
 msgstr ""
+
+#: lib/memex_web/views/layout_view.ex:10
+#, elixir-autogen, elixir-format
+msgid "memEx | %{title}"
+msgstr ""

priv/gettext/de/LC_MESSAGES/emails.po

@@ -31,23 +31,12 @@ msgstr ""
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 
-#: lib/memex_web/templates/email/confirm_email.html.heex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at Memex, please ignore this."
-msgstr ""
-
 #: lib/memex_web/templates/email/reset_password.txt.eex:8
 #: lib/memex_web/templates/email/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/memex_web/templates/email/reset_password.html.heex:16
-#: lib/memex_web/templates/email/update_email.html.heex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from Memex, please ignore this."
-msgstr ""
-
 #: lib/memex/accounts/email.ex:37
 #, elixir-autogen, elixir-format
 msgid "Reset your Memex password"
@@ -58,12 +47,6 @@ msgstr ""
 msgid "Update your Memex email"
 msgstr ""
 
-#: lib/memex_web/templates/email/confirm_email.html.heex:9
-#: lib/memex_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to Memex"
-msgstr ""
-
 #: lib/memex_web/templates/email/update_email.html.heex:8
 #: lib/memex_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
@@ -91,3 +74,20 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "This email was sent from memEx at %{url}"
 msgstr ""
+
+#: lib/memex_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't create an account at memEx, please ignore this."
+msgstr ""
+
+#: lib/memex_web/templates/email/reset_password.html.heex:16
+#: lib/memex_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format, fuzzy
+msgid "If you didn't request this change from memEx, please ignore this."
+msgstr ""
+
+#: lib/memex_web/templates/email/confirm_email.html.heex:9
+#: lib/memex_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Welcome to memEx"
+msgstr ""

priv/gettext/default.pot

@@ -484,6 +484,7 @@ msgstr ""
 #: lib/memex_web/live/home_live.html.heex:3
 #: lib/memex_web/templates/layout/root.html.heex:8
 #: lib/memex_web/templates/layout/root.html.heex:9
+#: lib/memex_web/views/layout_view.ex:11
 #, elixir-autogen, elixir-format
 msgid "memEx"
 msgstr ""
@@ -632,3 +633,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "zettelkasten"
 msgstr ""
+
+#: lib/memex_web/views/layout_view.ex:10
+#, elixir-autogen, elixir-format
+msgid "memEx | %{title}"
+msgstr ""

priv/gettext/emails.pot

@@ -30,23 +30,12 @@ msgstr ""
 msgid "If you didn't create an account at %{url}, please ignore this."
 msgstr ""
 
-#: lib/memex_web/templates/email/confirm_email.html.heex:22
-#, elixir-autogen, elixir-format
-msgid "If you didn't create an account at Memex, please ignore this."
-msgstr ""
-
 #: lib/memex_web/templates/email/reset_password.txt.eex:8
 #: lib/memex_web/templates/email/update_email.txt.eex:8
 #, elixir-autogen, elixir-format
 msgid "If you didn't request this change from %{url}, please ignore this."
 msgstr ""
 
-#: lib/memex_web/templates/email/reset_password.html.heex:16
-#: lib/memex_web/templates/email/update_email.html.heex:16
-#, elixir-autogen, elixir-format
-msgid "If you didn't request this change from Memex, please ignore this."
-msgstr ""
-
 #: lib/memex/accounts/email.ex:37
 #, elixir-autogen, elixir-format
 msgid "Reset your Memex password"
@@ -57,12 +46,6 @@ msgstr ""
 msgid "Update your Memex email"
 msgstr ""
 
-#: lib/memex_web/templates/email/confirm_email.html.heex:9
-#: lib/memex_web/templates/email/confirm_email.txt.eex:4
-#, elixir-autogen, elixir-format
-msgid "Welcome to Memex"
-msgstr ""
-
 #: lib/memex_web/templates/email/update_email.html.heex:8
 #: lib/memex_web/templates/email/update_email.txt.eex:4
 #, elixir-autogen, elixir-format
@@ -90,3 +73,20 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "This email was sent from memEx at %{url}"
 msgstr ""
+
+#: lib/memex_web/templates/email/confirm_email.html.heex:22
+#, elixir-autogen, elixir-format
+msgid "If you didn't create an account at memEx, please ignore this."
+msgstr ""
+
+#: lib/memex_web/templates/email/reset_password.html.heex:16
+#: lib/memex_web/templates/email/update_email.html.heex:16
+#, elixir-autogen, elixir-format
+msgid "If you didn't request this change from memEx, please ignore this."
+msgstr ""
+
+#: lib/memex_web/templates/email/confirm_email.html.heex:9
+#: lib/memex_web/templates/email/confirm_email.txt.eex:4
+#, elixir-autogen, elixir-format
+msgid "Welcome to memEx"
+msgstr ""

readme.md

@@ -52,7 +52,7 @@ You can use the following environment variables to configure memEx in
 - `SMTP_SSL`: Set to `true` to enable SSL for emails. Defaults to `false`.
 - `EMAIL_FROM`: Sets the sender email in sent emails. Defaults to
   `no-reply@HOST` where `HOST` was previously defined.
-- `EMAIL_NAME`: Sets the sender name in sent emails. Defaults to "Memex".
+- `EMAIL_NAME`: Sets the sender name in sent emails. Defaults to "memEx".
 
 ---