From 4a15f27923b43807434fb6c65bc96fbbd8fae79d Mon Sep 17 00:00:00 2001 From: shibao Date: Sun, 27 Nov 2022 21:23:27 -0500 Subject: [PATCH] fix some typos --- changelog.md | 1 + contributing.md | 10 +++--- docker-compose.yml | 4 +-- .../templates/email/confirm_email.html.heex | 4 +-- .../templates/email/confirm_email.txt.eex | 2 +- .../templates/email/reset_password.html.heex | 2 +- .../templates/email/update_email.html.heex | 2 +- lib/memex_web/templates/error/error.html.heex | 2 +- lib/memex_web/views/layout_view.ex | 11 ++---- priv/gettext/de/LC_MESSAGES/default.po | 6 ++++ priv/gettext/de/LC_MESSAGES/emails.po | 34 +++++++++---------- priv/gettext/default.pot | 6 ++++ priv/gettext/emails.pot | 34 +++++++++---------- readme.md | 2 +- 14 files changed, 64 insertions(+), 56 deletions(-) diff --git a/changelog.md b/changelog.md index e22db5a..e8dd1f9 100644 --- a/changelog.md +++ b/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 diff --git a/contributing.md b/contributing.md index 699493b..1df41d4 100644 --- a/contributing.md +++ b/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". diff --git a/docker-compose.yml b/docker-compose.yml index 2f2c309..5f0c14a 100644 --- a/docker-compose.yml +++ b/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" - # - EMAIL_NAME=Memex + # optional, default is "memEx" + # - EMAIL_NAME=memEx expose: - "4000" depends_on: diff --git a/lib/memex_web/templates/email/confirm_email.html.heex b/lib/memex_web/templates/email/confirm_email.html.heex index 8a1d24e..f54e7b1 100644 --- a/lib/memex_web/templates/email/confirm_email.html.heex +++ b/lib/memex_web/templates/email/confirm_email.html.heex @@ -6,7 +6,7 @@
- <%= dgettext("emails", "Welcome to Memex") %> + <%= dgettext("emails", "Welcome to memEx") %>
@@ -19,5 +19,5 @@
- <%= 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.") %> diff --git a/lib/memex_web/templates/email/confirm_email.txt.eex b/lib/memex_web/templates/email/confirm_email.txt.eex index 7a49d5f..5c40dc5 100644 --- a/lib/memex_web/templates/email/confirm_email.txt.eex +++ b/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:") %> diff --git a/lib/memex_web/templates/email/reset_password.html.heex b/lib/memex_web/templates/email/reset_password.html.heex index 88f4b17..e31a3f2 100644 --- a/lib/memex_web/templates/email/reset_password.html.heex +++ b/lib/memex_web/templates/email/reset_password.html.heex @@ -13,5 +13,5 @@
- <%= 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.") %> diff --git a/lib/memex_web/templates/email/update_email.html.heex b/lib/memex_web/templates/email/update_email.html.heex index 7dfda00..c23d0cf 100644 --- a/lib/memex_web/templates/email/update_email.html.heex +++ b/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." ) %> diff --git a/lib/memex_web/templates/error/error.html.heex b/lib/memex_web/templates/error/error.html.heex index 755e0d9..6d6a1e5 100644 --- a/lib/memex_web/templates/error/error.html.heex +++ b/lib/memex_web/templates/error/error.html.heex @@ -5,7 +5,7 @@ - <%= dgettext("errors", "Error") %>| Memex + <%= dgettext("errors", "Error") %>| memEx