Merge branch 'mastofe/system-font' into 'develop'

[akkoma] / lib / pleroma / web / templates / mastodon_api / mastodon / login.html.eex

diff --git a/lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex b/lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
index 89d97561b109254525e048b59bebdccc1a8fbae3..34cd7ed898e61c3f92d2d1f79b672b9d0d6f7c6a 100644 (file)
--- a/lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
+++ b/lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
@@ -1,6 +1,9 @@
-<h2>Login in to Mastodon Frontend</h2>
+<h2>Login to Mastodon Frontend</h2>
+<%= if @error do %>
+  <h2><%= @error %></h2>
+<% end %>
 <%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %>
-<%= text_input f, :name, placeholder: "Username" %>
+<%= text_input f, :name, placeholder: "Username or email" %>
 <br>
 <%= password_input f, :password, placeholder: "Password" %>
 <br>