From aede4f45ba11e1908d906590d54caf448d6e7316 Mon Sep 17 00:00:00 2001 From: shibao Date: Fri, 18 Feb 2022 18:25:28 -0500 Subject: [PATCH] fix tests and mix format --- priv/gettext/actions.pot | 40 ++++++++++++++++++++-------------------- priv/gettext/default.pot | 10 +++++----- priv/gettext/errors.pot | 8 ++++---- priv/gettext/prompts.pot | 2 +- test/support/fixtures.ex | 4 ++-- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/priv/gettext/actions.pot b/priv/gettext/actions.pot index c61e3517..8dda6843 100644 --- a/priv/gettext/actions.pot +++ b/priv/gettext/actions.pot @@ -31,14 +31,14 @@ msgid "Add your first type!" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:17 -#: lib/cannery_web/templates/user_settings/edit.html.heex:46 +#: lib/cannery_web/templates/user_settings/edit.html.heex:16 +#: lib/cannery_web/templates/user_settings/edit.html.heex:45 msgid "Change email" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:61 -#: lib/cannery_web/templates/user_settings/edit.html.heex:102 +#: lib/cannery_web/templates/user_settings/edit.html.heex:60 +#: lib/cannery_web/templates/user_settings/edit.html.heex:101 msgid "Change password" msgstr "" @@ -48,14 +48,14 @@ msgid "Create Invite" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:109 +#: lib/cannery_web/templates/user_settings/edit.html.heex:108 msgid "Delete User" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_registration/new.html.heex:44 +#: lib/cannery_web/templates/user_registration/new.html.heex:43 #: lib/cannery_web/templates/user_reset_password/new.html.heex:3 -#: lib/cannery_web/templates/user_session/new.html.heex:46 +#: lib/cannery_web/templates/user_session/new.html.heex:45 msgid "Forgot your password?" msgstr "" @@ -66,12 +66,12 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/topbar.ex:108 -#: lib/cannery_web/templates/user_confirmation/new.html.heex:31 -#: lib/cannery_web/templates/user_registration/new.html.heex:40 -#: lib/cannery_web/templates/user_reset_password/edit.html.heex:49 -#: lib/cannery_web/templates/user_reset_password/new.html.heex:31 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:30 +#: lib/cannery_web/templates/user_registration/new.html.heex:39 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:30 #: lib/cannery_web/templates/user_session/new.html.heex:3 -#: lib/cannery_web/templates/user_session/new.html.heex:34 +#: lib/cannery_web/templates/user_session/new.html.heex:33 msgid "Log in" msgstr "" @@ -102,24 +102,24 @@ msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/components/topbar.ex:101 -#: lib/cannery_web/templates/user_confirmation/new.html.heex:26 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:25 #: lib/cannery_web/templates/user_registration/new.html.heex:3 -#: lib/cannery_web/templates/user_registration/new.html.heex:34 -#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44 -#: lib/cannery_web/templates/user_reset_password/new.html.heex:26 -#: lib/cannery_web/templates/user_session/new.html.heex:41 +#: lib/cannery_web/templates/user_registration/new.html.heex:33 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:25 +#: lib/cannery_web/templates/user_session/new.html.heex:40 msgid "Register" msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/templates/user_confirmation/new.html.heex:3 -#: lib/cannery_web/templates/user_confirmation/new.html.heex:17 +#: lib/cannery_web/templates/user_confirmation/new.html.heex:16 msgid "Resend confirmation instructions" msgstr "" #, elixir-autogen, elixir-format #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3 -#: lib/cannery_web/templates/user_reset_password/edit.html.heex:35 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:34 msgid "Reset password" msgstr "" @@ -135,7 +135,7 @@ msgid "Save" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_reset_password/new.html.heex:17 +#: lib/cannery_web/templates/user_reset_password/new.html.heex:16 msgid "Send instructions to reset password" msgstr "" diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 50465dc2..8b466850 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -231,7 +231,7 @@ msgid "Invites" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_session/new.html.heex:29 +#: lib/cannery_web/templates/user_session/new.html.heex:28 msgid "Keep me logged in for 60 days" msgstr "" @@ -708,18 +708,18 @@ msgid "UPC" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:81 +#: lib/cannery_web/templates/user_settings/edit.html.heex:80 msgid "Confirm new password" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:34 -#: lib/cannery_web/templates/user_settings/edit.html.heex:90 +#: lib/cannery_web/templates/user_settings/edit.html.heex:33 +#: lib/cannery_web/templates/user_settings/edit.html.heex:89 msgid "Current password" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:74 +#: lib/cannery_web/templates/user_settings/edit.html.heex:73 msgid "New password" msgstr "" diff --git a/priv/gettext/errors.pot b/priv/gettext/errors.pot index 97b9be0e..31c1c5d3 100644 --- a/priv/gettext/errors.pot +++ b/priv/gettext/errors.pot @@ -57,10 +57,10 @@ msgid "Not found" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_registration/new.html.heex:17 -#: lib/cannery_web/templates/user_reset_password/edit.html.heex:17 -#: lib/cannery_web/templates/user_settings/edit.html.heex:23 -#: lib/cannery_web/templates/user_settings/edit.html.heex:67 +#: lib/cannery_web/templates/user_registration/new.html.heex:16 +#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16 +#: lib/cannery_web/templates/user_settings/edit.html.heex:22 +#: lib/cannery_web/templates/user_settings/edit.html.heex:66 msgid "Oops, something went wrong! Please check the errors below." msgstr "" diff --git a/priv/gettext/prompts.pot b/priv/gettext/prompts.pot index d8881a77..d81190b4 100644 --- a/priv/gettext/prompts.pot +++ b/priv/gettext/prompts.pot @@ -104,7 +104,7 @@ msgid "Are you sure you want to delete this ammo?" msgstr "" #, elixir-autogen, elixir-format -#: lib/cannery_web/templates/user_settings/edit.html.heex:113 +#: lib/cannery_web/templates/user_settings/edit.html.heex:112 msgid "Are you sure you want to delete your account?" msgstr "" diff --git a/test/support/fixtures.ex b/test/support/fixtures.ex index eba82ddb..f7ee0e21 100644 --- a/test/support/fixtures.ex +++ b/test/support/fixtures.ex @@ -56,8 +56,8 @@ defmodule Cannery.Fixtures do |> Atom.to_string() |> Email.generate_email(Accounts.get_user!(user_id), attrs) - [_, html_token, _] = email.html_body |> String.split("[TOKEN]") - [_, text_token, _] = email.text_body |> String.split("[TOKEN]") + [_, html_token | _] = email.html_body |> String.split("[TOKEN]") + [_, text_token | _] = email.text_body |> String.split("[TOKEN]") ^text_token = html_token end