fix tests and mix format
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
889e08e42c
commit
aede4f45ba
@ -31,14 +31,14 @@ msgid "Add your first type!"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:17
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:16
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:46
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:45
|
||||||
msgid "Change email"
|
msgid "Change email"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:61
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:60
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:102
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:101
|
||||||
msgid "Change password"
|
msgid "Change password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -48,14 +48,14 @@ msgid "Create Invite"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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"
|
msgid "Delete User"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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_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?"
|
msgid "Forgot your password?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -66,12 +66,12 @@ msgstr ""
|
|||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/components/topbar.ex:108
|
#: lib/cannery_web/components/topbar.ex:108
|
||||||
#: lib/cannery_web/templates/user_confirmation/new.html.heex:31
|
#: lib/cannery_web/templates/user_confirmation/new.html.heex:30
|
||||||
#: lib/cannery_web/templates/user_registration/new.html.heex:40
|
#: lib/cannery_web/templates/user_registration/new.html.heex:39
|
||||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:49
|
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:48
|
||||||
#: lib/cannery_web/templates/user_reset_password/new.html.heex:31
|
#: 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:3
|
||||||
#: lib/cannery_web/templates/user_session/new.html.heex:34
|
#: lib/cannery_web/templates/user_session/new.html.heex:33
|
||||||
msgid "Log in"
|
msgid "Log in"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -102,24 +102,24 @@ msgstr ""
|
|||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/components/topbar.ex:101
|
#: 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:3
|
||||||
#: lib/cannery_web/templates/user_registration/new.html.heex:34
|
#: lib/cannery_web/templates/user_registration/new.html.heex:33
|
||||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:44
|
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:43
|
||||||
#: lib/cannery_web/templates/user_reset_password/new.html.heex:26
|
#: lib/cannery_web/templates/user_reset_password/new.html.heex:25
|
||||||
#: lib/cannery_web/templates/user_session/new.html.heex:41
|
#: lib/cannery_web/templates/user_session/new.html.heex:40
|
||||||
msgid "Register"
|
msgid "Register"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/templates/user_confirmation/new.html.heex:3
|
#: 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"
|
msgid "Resend confirmation instructions"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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: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"
|
msgid "Reset password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ msgid "Save"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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"
|
msgid "Send instructions to reset password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -231,7 +231,7 @@ msgid "Invites"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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"
|
msgid "Keep me logged in for 60 days"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@ -708,18 +708,18 @@ msgid "UPC"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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"
|
msgid "Confirm new password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:34
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:33
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:90
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:89
|
||||||
msgid "Current password"
|
msgid "Current password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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"
|
msgid "New password"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ msgid "Not found"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
#: lib/cannery_web/templates/user_registration/new.html.heex:17
|
#: lib/cannery_web/templates/user_registration/new.html.heex:16
|
||||||
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:17
|
#: lib/cannery_web/templates/user_reset_password/edit.html.heex:16
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:23
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:22
|
||||||
#: lib/cannery_web/templates/user_settings/edit.html.heex:67
|
#: lib/cannery_web/templates/user_settings/edit.html.heex:66
|
||||||
msgid "Oops, something went wrong! Please check the errors below."
|
msgid "Oops, something went wrong! Please check the errors below."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ msgid "Are you sure you want to delete this ammo?"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#, elixir-autogen, elixir-format
|
#, 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?"
|
msgid "Are you sure you want to delete your account?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -56,8 +56,8 @@ defmodule Cannery.Fixtures do
|
|||||||
|> Atom.to_string()
|
|> Atom.to_string()
|
||||||
|> Email.generate_email(Accounts.get_user!(user_id), attrs)
|
|> Email.generate_email(Accounts.get_user!(user_id), attrs)
|
||||||
|
|
||||||
[_, html_token, _] = email.html_body |> String.split("[TOKEN]")
|
[_, html_token | _] = email.html_body |> String.split("[TOKEN]")
|
||||||
[_, text_token, _] = email.text_body |> String.split("[TOKEN]")
|
[_, text_token | _] = email.text_body |> String.split("[TOKEN]")
|
||||||
^text_token = html_token
|
^text_token = html_token
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user