diff --git a/changelog.md b/changelog.md index 45643da..55837fa 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v0.1.2 +- fix more typos + # v0.1.1 - improve search a whole lot - improve table information for notes and contexts diff --git a/lib/memex_web/controllers/user_reset_password_controller.ex b/lib/memex_web/controllers/user_reset_password_controller.ex index 839eaa8..46a5c51 100644 --- a/lib/memex_web/controllers/user_reset_password_controller.ex +++ b/lib/memex_web/controllers/user_reset_password_controller.ex @@ -6,7 +6,7 @@ defmodule MemexWeb.UserResetPasswordController do plug :get_user_by_reset_password_token when action in [:edit, :update] def new(conn, _params) do - render(conn, "new.html", page_title: gettext("Forgot your password?")) + render(conn, "new.html", page_title: gettext("forgot your password?")) end def create(conn, %{"user" => %{"email" => email}}) do diff --git a/lib/memex_web/controllers/user_session_controller.ex b/lib/memex_web/controllers/user_session_controller.ex index b677e68..b2e98c0 100644 --- a/lib/memex_web/controllers/user_session_controller.ex +++ b/lib/memex_web/controllers/user_session_controller.ex @@ -20,7 +20,7 @@ defmodule MemexWeb.UserSessionController do def delete(conn, _params) do conn - |> put_flash(:info, dgettext("prompts", "Logged out successfully.")) + |> put_flash(:info, dgettext("prompts", "logged out successfully.")) |> UserAuth.log_out_user() end end diff --git a/lib/memex_web/templates/user_registration/new.html.heex b/lib/memex_web/templates/user_registration/new.html.heex index edc1fa5..27c96a2 100644 --- a/lib/memex_web/templates/user_registration/new.html.heex +++ b/lib/memex_web/templates/user_registration/new.html.heex @@ -33,7 +33,7 @@ <%= select( f, :locale, - [{gettext("English"), "en_US"}], + [{gettext("english"), "en_US"}], class: "input input-primary col-span-2" ) %> <%= error_tag(f, :locale) %> @@ -48,7 +48,7 @@ <%= dgettext("actions", "log in") %> <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> - <%= dgettext("actions", "Forgot your password?") %> + <%= dgettext("actions", "forgot your password?") %> diff --git a/lib/memex_web/templates/user_reset_password/new.html.heex b/lib/memex_web/templates/user_reset_password/new.html.heex index c7ad61a..c2273c8 100644 --- a/lib/memex_web/templates/user_reset_password/new.html.heex +++ b/lib/memex_web/templates/user_reset_password/new.html.heex @@ -1,6 +1,6 @@

- <%= dgettext("actions", "Forgot your password?") %> + <%= dgettext("actions", "forgot your password?") %>

<.form @@ -12,7 +12,7 @@ <%= label(f, :email, class: "title text-lg text-primary-400") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> - <%= submit(dgettext("actions", "Send instructions to reset password"), + <%= submit(dgettext("actions", "send instructions to reset password"), class: "mx-auto btn btn-primary col-span-3" ) %> diff --git a/lib/memex_web/templates/user_session/new.html.heex b/lib/memex_web/templates/user_session/new.html.heex index 2d4ea02..0bb5cfa 100644 --- a/lib/memex_web/templates/user_session/new.html.heex +++ b/lib/memex_web/templates/user_session/new.html.heex @@ -41,7 +41,7 @@ <% end %> <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> - <%= dgettext("actions", "Forgot your password?") %> + <%= dgettext("actions", "forgot your password?") %>
diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index 01cee7f..7404637 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -15,13 +15,6 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: lib/memex_web/templates/user_registration/new.html.heex:51 -#: lib/memex_web/templates/user_reset_password/new.html.heex:3 -#: lib/memex_web/templates/user_session/new.html.heex:44 -#, elixir-autogen, elixir-format -msgid "Forgot your password?" -msgstr "" - #: lib/memex_web/templates/user_confirmation/new.html.heex:3 #: lib/memex_web/templates/user_confirmation/new.html.heex:15 #, elixir-autogen, elixir-format @@ -39,11 +32,6 @@ msgstr "" msgid "Save" msgstr "" -#: lib/memex_web/templates/user_reset_password/new.html.heex:15 -#, elixir-autogen, elixir-format -msgid "Send instructions to reset password" -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:15 #: lib/memex_web/templates/user_settings/edit.html.heex:44 #, elixir-autogen, elixir-format @@ -155,3 +143,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "add step" msgstr "" + +#: lib/memex_web/templates/user_registration/new.html.heex:51 +#: lib/memex_web/templates/user_reset_password/new.html.heex:3 +#: lib/memex_web/templates/user_session/new.html.heex:44 +#, elixir-autogen, elixir-format +msgid "forgot your password?" +msgstr "" + +#: lib/memex_web/templates/user_reset_password/new.html.heex:15 +#, elixir-autogen, elixir-format +msgid "send instructions to reset password" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/actions.po b/priv/gettext/de/LC_MESSAGES/actions.po index 0e6b6b2..356c598 100644 --- a/priv/gettext/de/LC_MESSAGES/actions.po +++ b/priv/gettext/de/LC_MESSAGES/actions.po @@ -16,13 +16,6 @@ msgstr "" msgid "Copy to clipboard" msgstr "" -#: lib/memex_web/templates/user_registration/new.html.heex:51 -#: lib/memex_web/templates/user_reset_password/new.html.heex:3 -#: lib/memex_web/templates/user_session/new.html.heex:44 -#, elixir-autogen, elixir-format -msgid "Forgot your password?" -msgstr "" - #: lib/memex_web/templates/user_confirmation/new.html.heex:3 #: lib/memex_web/templates/user_confirmation/new.html.heex:15 #, elixir-autogen, elixir-format @@ -40,11 +33,6 @@ msgstr "" msgid "Save" msgstr "" -#: lib/memex_web/templates/user_reset_password/new.html.heex:15 -#, elixir-autogen, elixir-format -msgid "Send instructions to reset password" -msgstr "" - #: lib/memex_web/templates/user_settings/edit.html.heex:15 #: lib/memex_web/templates/user_settings/edit.html.heex:44 #, elixir-autogen, elixir-format @@ -156,3 +144,15 @@ msgstr "" #, elixir-autogen, elixir-format msgid "add step" msgstr "" + +#: lib/memex_web/templates/user_registration/new.html.heex:51 +#: lib/memex_web/templates/user_reset_password/new.html.heex:3 +#: lib/memex_web/templates/user_session/new.html.heex:44 +#, elixir-autogen, elixir-format, fuzzy +msgid "forgot your password?" +msgstr "" + +#: lib/memex_web/templates/user_reset_password/new.html.heex:15 +#, elixir-autogen, elixir-format, fuzzy +msgid "send instructions to reset password" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index ac31c8f..1bed8e2 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -31,16 +31,6 @@ msgstr "" msgid "Confirm your account" msgstr "" -#: lib/memex_web/templates/user_registration/new.html.heex:36 -#, elixir-autogen, elixir-format -msgid "English" -msgstr "" - -#: lib/memex_web/controllers/user_reset_password_controller.ex:9 -#, elixir-autogen, elixir-format -msgid "Forgot your password?" -msgstr "" - #: lib/memex_web/templates/user_session/new.html.heex:27 #, elixir-autogen, elixir-format msgid "Keep me logged in for 60 days" @@ -182,6 +172,7 @@ msgstr "" msgid "enable" msgstr "" +#: lib/memex_web/templates/user_registration/new.html.heex:36 #: lib/memex_web/templates/user_settings/edit.html.heex:126 #, elixir-autogen, elixir-format msgid "english" @@ -649,3 +640,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "memEx | %{title}" msgstr "" + +#: lib/memex_web/controllers/user_reset_password_controller.ex:9 +#, elixir-autogen, elixir-format, fuzzy +msgid "forgot your password?" +msgstr "" diff --git a/priv/gettext/de/LC_MESSAGES/prompts.po b/priv/gettext/de/LC_MESSAGES/prompts.po index 0fbe2fb..6d35305 100644 --- a/priv/gettext/de/LC_MESSAGES/prompts.po +++ b/priv/gettext/de/LC_MESSAGES/prompts.po @@ -81,11 +81,6 @@ msgstr "" msgid "Language updated successfully." msgstr "" -#: lib/memex_web/controllers/user_session_controller.ex:23 -#, elixir-autogen, elixir-format -msgid "Logged out successfully." -msgstr "" - #: lib/memex_web/controllers/user_reset_password_controller.ex:46 #, elixir-autogen, elixir-format msgid "Password reset successfully." @@ -157,3 +152,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "register to setup %{name}" msgstr "" + +#: lib/memex_web/controllers/user_session_controller.ex:23 +#, elixir-autogen, elixir-format, fuzzy +msgid "logged out successfully." +msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index b888da6..b39a9d0 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -20,16 +20,6 @@ msgstr "" msgid "Confirm your account" msgstr "" -#: lib/memex_web/templates/user_registration/new.html.heex:36 -#, elixir-autogen, elixir-format -msgid "English" -msgstr "" - -#: lib/memex_web/controllers/user_reset_password_controller.ex:9 -#, elixir-autogen, elixir-format -msgid "Forgot your password?" -msgstr "" - #: lib/memex_web/templates/user_session/new.html.heex:27 #, elixir-autogen, elixir-format msgid "Keep me logged in for 60 days" @@ -171,6 +161,7 @@ msgstr "" msgid "enable" msgstr "" +#: lib/memex_web/templates/user_registration/new.html.heex:36 #: lib/memex_web/templates/user_settings/edit.html.heex:126 #, elixir-autogen, elixir-format msgid "english" @@ -638,3 +629,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "memEx | %{title}" msgstr "" + +#: lib/memex_web/controllers/user_reset_password_controller.ex:9 +#, elixir-autogen, elixir-format +msgid "forgot your password?" +msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index 355ae8f..58d49f9 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -80,11 +80,6 @@ msgstr "" msgid "Language updated successfully." msgstr "" -#: lib/memex_web/controllers/user_session_controller.ex:23 -#, elixir-autogen, elixir-format -msgid "Logged out successfully." -msgstr "" - #: lib/memex_web/controllers/user_reset_password_controller.ex:46 #, elixir-autogen, elixir-format msgid "Password reset successfully." @@ -156,3 +151,8 @@ msgstr "" #, elixir-autogen, elixir-format msgid "register to setup %{name}" msgstr "" + +#: lib/memex_web/controllers/user_session_controller.ex:23 +#, elixir-autogen, elixir-format +msgid "logged out successfully." +msgstr "" diff --git a/test/memex_web/controllers/user_reset_password_controller_test.exs b/test/memex_web/controllers/user_reset_password_controller_test.exs index 30ce039..1f3b223 100644 --- a/test/memex_web/controllers/user_reset_password_controller_test.exs +++ b/test/memex_web/controllers/user_reset_password_controller_test.exs @@ -17,7 +17,7 @@ defmodule MemexWeb.UserResetPasswordControllerTest do test "renders the reset password page", %{conn: conn} do conn = get(conn, Routes.user_reset_password_path(conn, :new)) response = html_response(conn, 200) - assert response =~ dgettext("actions", "Forgot your password?") + assert response =~ dgettext("actions", "forgot your password?") end end diff --git a/test/memex_web/controllers/user_session_controller_test.exs b/test/memex_web/controllers/user_session_controller_test.exs index ac806c6..94e99b5 100644 --- a/test/memex_web/controllers/user_session_controller_test.exs +++ b/test/memex_web/controllers/user_session_controller_test.exs @@ -88,14 +88,14 @@ defmodule MemexWeb.UserSessionControllerTest do conn = conn |> log_in_user(current_user) |> delete(Routes.user_session_path(conn, :delete)) assert redirected_to(conn) == "/" refute get_session(conn, :user_token) - assert get_flash(conn, :info) =~ gettext("Logged out successfully") + assert get_flash(conn, :info) =~ gettext("logged out successfully") end test "succeeds even if the user is not logged in", %{conn: conn} do conn = delete(conn, Routes.user_session_path(conn, :delete)) assert redirected_to(conn) == "/" refute get_session(conn, :user_token) - assert get_flash(conn, :info) =~ gettext("Logged out successfully") + assert get_flash(conn, :info) =~ gettext("logged out successfully") end end end