fix more typos
This commit is contained in:
		| @@ -1,3 +1,6 @@ | |||||||
|  | # v0.1.2 | ||||||
|  | - fix more typos | ||||||
|  |  | ||||||
| # v0.1.1 | # v0.1.1 | ||||||
| - improve search a whole lot | - improve search a whole lot | ||||||
| - improve table information for notes and contexts | - improve table information for notes and contexts | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ defmodule MemexWeb.UserResetPasswordController do | |||||||
|   plug :get_user_by_reset_password_token when action in [:edit, :update] |   plug :get_user_by_reset_password_token when action in [:edit, :update] | ||||||
|  |  | ||||||
|   def new(conn, _params) do |   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 |   end | ||||||
|  |  | ||||||
|   def create(conn, %{"user" => %{"email" => email}}) do |   def create(conn, %{"user" => %{"email" => email}}) do | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ defmodule MemexWeb.UserSessionController do | |||||||
|  |  | ||||||
|   def delete(conn, _params) do |   def delete(conn, _params) do | ||||||
|     conn |     conn | ||||||
|     |> put_flash(:info, dgettext("prompts", "Logged out successfully.")) |     |> put_flash(:info, dgettext("prompts", "logged out successfully.")) | ||||||
|     |> UserAuth.log_out_user() |     |> UserAuth.log_out_user() | ||||||
|   end |   end | ||||||
| end | end | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ | |||||||
|     <%= select( |     <%= select( | ||||||
|       f, |       f, | ||||||
|       :locale, |       :locale, | ||||||
|       [{gettext("English"), "en_US"}], |       [{gettext("english"), "en_US"}], | ||||||
|       class: "input input-primary col-span-2" |       class: "input input-primary col-span-2" | ||||||
|     ) %> |     ) %> | ||||||
|     <%= error_tag(f, :locale) %> |     <%= error_tag(f, :locale) %> | ||||||
| @@ -48,7 +48,7 @@ | |||||||
|       <%= dgettext("actions", "log in") %> |       <%= dgettext("actions", "log in") %> | ||||||
|     </.link> |     </.link> | ||||||
|     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> |     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> | ||||||
|       <%= dgettext("actions", "Forgot your password?") %> |       <%= dgettext("actions", "forgot your password?") %> | ||||||
|     </.link> |     </.link> | ||||||
|   </div> |   </div> | ||||||
| </div> | </div> | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| <div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4"> | <div class="mx-auto mb-8 max-w-2xl flex flex-col justify-center items-center space-y-4"> | ||||||
|   <h1 class="title text-primary-400 text-xl"> |   <h1 class="title text-primary-400 text-xl"> | ||||||
|     <%= dgettext("actions", "Forgot your password?") %> |     <%= dgettext("actions", "forgot your password?") %> | ||||||
|   </h1> |   </h1> | ||||||
|  |  | ||||||
|   <.form |   <.form | ||||||
| @@ -12,7 +12,7 @@ | |||||||
|     <%= label(f, :email, class: "title text-lg text-primary-400") %> |     <%= label(f, :email, class: "title text-lg text-primary-400") %> | ||||||
|     <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> |     <%= 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" |       class: "mx-auto btn btn-primary col-span-3" | ||||||
|     ) %> |     ) %> | ||||||
|   </.form> |   </.form> | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ | |||||||
|       </.link> |       </.link> | ||||||
|     <% end %> |     <% end %> | ||||||
|     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> |     <.link href={Routes.user_reset_password_path(@conn, :new)} class="btn btn-primary"> | ||||||
|       <%= dgettext("actions", "Forgot your password?") %> |       <%= dgettext("actions", "forgot your password?") %> | ||||||
|     </.link> |     </.link> | ||||||
|   </div> |   </div> | ||||||
| </div> | </div> | ||||||
|   | |||||||
| @@ -15,13 +15,6 @@ msgstr "" | |||||||
| msgid "Copy to clipboard" | msgid "Copy to clipboard" | ||||||
| msgstr "" | 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:3 | ||||||
| #: lib/memex_web/templates/user_confirmation/new.html.heex:15 | #: lib/memex_web/templates/user_confirmation/new.html.heex:15 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| @@ -39,11 +32,6 @@ msgstr "" | |||||||
| msgid "Save" | msgid "Save" | ||||||
| msgstr "" | 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:15 | ||||||
| #: lib/memex_web/templates/user_settings/edit.html.heex:44 | #: lib/memex_web/templates/user_settings/edit.html.heex:44 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| @@ -155,3 +143,15 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "add step" | msgid "add step" | ||||||
| msgstr "" | 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 "" | ||||||
|   | |||||||
| @@ -16,13 +16,6 @@ msgstr "" | |||||||
| msgid "Copy to clipboard" | msgid "Copy to clipboard" | ||||||
| msgstr "" | 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:3 | ||||||
| #: lib/memex_web/templates/user_confirmation/new.html.heex:15 | #: lib/memex_web/templates/user_confirmation/new.html.heex:15 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| @@ -40,11 +33,6 @@ msgstr "" | |||||||
| msgid "Save" | msgid "Save" | ||||||
| msgstr "" | 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:15 | ||||||
| #: lib/memex_web/templates/user_settings/edit.html.heex:44 | #: lib/memex_web/templates/user_settings/edit.html.heex:44 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| @@ -156,3 +144,15 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "add step" | msgid "add step" | ||||||
| msgstr "" | 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 "" | ||||||
|   | |||||||
| @@ -31,16 +31,6 @@ msgstr "" | |||||||
| msgid "Confirm your account" | msgid "Confirm your account" | ||||||
| msgstr "" | 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 | #: lib/memex_web/templates/user_session/new.html.heex:27 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "Keep me logged in for 60 days" | msgid "Keep me logged in for 60 days" | ||||||
| @@ -182,6 +172,7 @@ msgstr "" | |||||||
| msgid "enable" | msgid "enable" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/templates/user_registration/new.html.heex:36 | ||||||
| #: lib/memex_web/templates/user_settings/edit.html.heex:126 | #: lib/memex_web/templates/user_settings/edit.html.heex:126 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "english" | msgid "english" | ||||||
| @@ -649,3 +640,8 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "memEx | %{title}" | msgid "memEx | %{title}" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/controllers/user_reset_password_controller.ex:9 | ||||||
|  | #, elixir-autogen, elixir-format, fuzzy | ||||||
|  | msgid "forgot your password?" | ||||||
|  | msgstr "" | ||||||
|   | |||||||
| @@ -81,11 +81,6 @@ msgstr "" | |||||||
| msgid "Language updated successfully." | msgid "Language updated successfully." | ||||||
| msgstr "" | 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 | #: lib/memex_web/controllers/user_reset_password_controller.ex:46 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "Password reset successfully." | msgid "Password reset successfully." | ||||||
| @@ -157,3 +152,8 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "register to setup %{name}" | msgid "register to setup %{name}" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/controllers/user_session_controller.ex:23 | ||||||
|  | #, elixir-autogen, elixir-format, fuzzy | ||||||
|  | msgid "logged out successfully." | ||||||
|  | msgstr "" | ||||||
|   | |||||||
| @@ -20,16 +20,6 @@ msgstr "" | |||||||
| msgid "Confirm your account" | msgid "Confirm your account" | ||||||
| msgstr "" | 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 | #: lib/memex_web/templates/user_session/new.html.heex:27 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "Keep me logged in for 60 days" | msgid "Keep me logged in for 60 days" | ||||||
| @@ -171,6 +161,7 @@ msgstr "" | |||||||
| msgid "enable" | msgid "enable" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/templates/user_registration/new.html.heex:36 | ||||||
| #: lib/memex_web/templates/user_settings/edit.html.heex:126 | #: lib/memex_web/templates/user_settings/edit.html.heex:126 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "english" | msgid "english" | ||||||
| @@ -638,3 +629,8 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "memEx | %{title}" | msgid "memEx | %{title}" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/controllers/user_reset_password_controller.ex:9 | ||||||
|  | #, elixir-autogen, elixir-format | ||||||
|  | msgid "forgot your password?" | ||||||
|  | msgstr "" | ||||||
|   | |||||||
| @@ -80,11 +80,6 @@ msgstr "" | |||||||
| msgid "Language updated successfully." | msgid "Language updated successfully." | ||||||
| msgstr "" | 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 | #: lib/memex_web/controllers/user_reset_password_controller.ex:46 | ||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "Password reset successfully." | msgid "Password reset successfully." | ||||||
| @@ -156,3 +151,8 @@ msgstr "" | |||||||
| #, elixir-autogen, elixir-format | #, elixir-autogen, elixir-format | ||||||
| msgid "register to setup %{name}" | msgid "register to setup %{name}" | ||||||
| msgstr "" | msgstr "" | ||||||
|  |  | ||||||
|  | #: lib/memex_web/controllers/user_session_controller.ex:23 | ||||||
|  | #, elixir-autogen, elixir-format | ||||||
|  | msgid "logged out successfully." | ||||||
|  | msgstr "" | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ defmodule MemexWeb.UserResetPasswordControllerTest do | |||||||
|     test "renders the reset password page", %{conn: conn} do |     test "renders the reset password page", %{conn: conn} do | ||||||
|       conn = get(conn, Routes.user_reset_password_path(conn, :new)) |       conn = get(conn, Routes.user_reset_password_path(conn, :new)) | ||||||
|       response = html_response(conn, 200) |       response = html_response(conn, 200) | ||||||
|       assert response =~ dgettext("actions", "Forgot your password?") |       assert response =~ dgettext("actions", "forgot your password?") | ||||||
|     end |     end | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   | |||||||
| @@ -88,14 +88,14 @@ defmodule MemexWeb.UserSessionControllerTest do | |||||||
|       conn = conn |> log_in_user(current_user) |> delete(Routes.user_session_path(conn, :delete)) |       conn = conn |> log_in_user(current_user) |> delete(Routes.user_session_path(conn, :delete)) | ||||||
|       assert redirected_to(conn) == "/" |       assert redirected_to(conn) == "/" | ||||||
|       refute get_session(conn, :user_token) |       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 | ||||||
|  |  | ||||||
|     test "succeeds even if the user is not logged in", %{conn: conn} do |     test "succeeds even if the user is not logged in", %{conn: conn} do | ||||||
|       conn = delete(conn, Routes.user_session_path(conn, :delete)) |       conn = delete(conn, Routes.user_session_path(conn, :delete)) | ||||||
|       assert redirected_to(conn) == "/" |       assert redirected_to(conn) == "/" | ||||||
|       refute get_session(conn, :user_token) |       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 |   end | ||||||
| end | end | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user