diff --git a/app/views/devise/sessions/_omniauth_options.html.erb b/app/views/devise/sessions/_omniauth_options.html.erb index c4eef6b55..79112a607 100644 --- a/app/views/devise/sessions/_omniauth_options.html.erb +++ b/app/views/devise/sessions/_omniauth_options.html.erb @@ -5,7 +5,9 @@ <% if config.options[:logo] %> <%= image_tag(config.options[:logo], class: "omniauth-logo omniauth-#{provider}") -%> <% else %> - <%= "Log in with #{t("authentication.omniauth.providers.#{provider}", default: provider.to_s.titleize)}" -%> + <%= t('authentication.omniauth.log_in_with', + provider: t("authentication.omniauth.providers.#{provider}", + default: provider.to_s.titleize)) -%> <% end %> <% end -%> <% end -%> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 0e0f0845b..61728b088 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -13,13 +13,14 @@ <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<%= t('authentication.password.title') %>

<%= t('authentication.password.description') %>

- <%= f.input :login, label: 'Email or username', autofocus: true %> - <%= f.input :password, input_html: { autocomplete: 'off' } %> + <%= f.input :login, label: t('authentication.password.email_or_username'), autofocus: true %> + <%= f.input :password, label: t('authentication.password.password'), + input_html: { autocomplete: 'off' } %> <% if devise_mapping.rememberable? -%> - <%= f.input :remember_me, as: :boolean %> + <%= f.input :remember_me, label: t('authentication.password.remember_me'), as: :boolean %> <% end -%>
- <%= f.submit "Log in", :class => 'btn btn-primary' %> + <%= f.submit t('authentication.password.log_in'), :class => 'btn btn-primary' %>
<% end %> <%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index 6b935900e..e7120aed2 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,21 +1,26 @@ diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 094831797..e23511680 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -54,6 +54,16 @@ en: send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." unlocked: "Your account has been unlocked successfully. Please log in to continue." + links: + already_on: 'Already on %{title}?' + log_in: 'Log in' + new_to: 'New to %{title}?' + register: 'Register' + forgot_your_password: 'Forgot your password?' + request_a_reset: 'Request a reset' + didnt_receive_confirmation_instructions: "Didn’t receive confirmation instructions?" + didnt_receive_unlock_instructions: "Didn't receive unlock instructions?" + resend: 'Resend' errors: messages: already_confirmed: "was already confirmed, please try logging in" diff --git a/config/locales/en.yml b/config/locales/en.yml index 1315dfaea..ed18b5ab5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -708,6 +708,10 @@ en: password: title: Login description: '' + email_or_username: 'Email or username' + password: 'Password' + remember_me: 'Remember me' + log_in: 'Log in' omniauth: title: Institutional Login description: '' @@ -715,6 +719,7 @@ en: elixir_aai: LS Login oidc: AAF (Australia) oidc2: Tuakiri (NZ) + log_in_with: 'Log in with %{provider}' ingestion: categories: events: 'Events'