diff --git a/app/views/registrant/sessions/login_mid.haml b/app/views/registrant/sessions/login_mid.haml index 34da5a2ae..54a30fd3d 100644 --- a/app/views/registrant/sessions/login_mid.haml +++ b/app/views/registrant/sessions/login_mid.haml @@ -1,12 +1,12 @@ .row .form-signin.col-md-4.center-block.text-center - %h2.form-signin-heading.text-center= t(:log_in_with_mid) + %h2.form-signin-heading.text-center= t '.header' %hr = form_for @user, url: registrant_mid_path, auto_html5_validation: false, html: {class: 'form-signin'} do |f| = f.text_field :phone, class: 'form-control', placeholder: t(:phone_no), autocomplete: 'off', required: true - %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t(:log_in) + %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t '.submit_btn' - if ['development', 'alpha'].include?(Rails.env) %div.text-center diff --git a/app/views/registrar/sessions/login_mid.haml b/app/views/registrar/sessions/login_mid.haml index 78e39a3b7..0b27564e5 100644 --- a/app/views/registrar/sessions/login_mid.haml +++ b/app/views/registrar/sessions/login_mid.haml @@ -1,12 +1,12 @@ .row .form-signin.col-md-4.center-block.text-center - %h2.form-signin-heading.text-center= t(:log_in_with_mid) + %h2.form-signin-heading.text-center= t '.header' %hr = form_for @user, url: registrar_mid_path, auto_html5_validation: false, html: {class: 'form-signin'} do |f| = f.text_field :phone, class: 'form-control', placeholder: t(:phone_no), autocomplete: 'off', required: true - %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t('.login_btn') + %button.btn.btn-lg.btn-primary.btn-block.js-login{:type => 'submit'}= t '.submit_btn' - if ['development', 'alpha'].include?(Rails.env) %div.text-center diff --git a/app/views/registrar/sessions/new.html.erb b/app/views/registrar/sessions/new.html.erb index 945ae608b..701c41c9e 100644 --- a/app/views/registrar/sessions/new.html.erb +++ b/app/views/registrar/sessions/new.html.erb @@ -1,6 +1,6 @@
-

<%= t(:log_in) %>

+

<%= t '.header_html' %>


diff --git a/config/locales/en.yml b/config/locales/en.yml index 525baee17..2d5597e2c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -390,7 +390,6 @@ en: invoices: 'Invoices' no_such_user: 'No such user' phone_no: 'Phone number' - log_in_with_mid: 'Log in with mobile-id' confirmation_sms_was_sent_to_your_phone_verification_code_is: 'Confirmation sms was sent to your phone. Verification code is %{code}.' user_signature_is_invalid: 'User signature is invalid' session_timeout: 'Session timeout' @@ -422,7 +421,6 @@ en: blank: "Password can't be blank" username: 'Username' - log_in: 'Log in' domains: 'Domains' register: 'Register' contacts: 'Contacts' diff --git a/config/locales/et.yml b/config/locales/et.yml index 96839e4c1..05d32be24 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1,7 +1,6 @@ et: username: 'Kasutajanimi' password: 'Parool' - log_in: 'Logi sisse' date: # Don't forget the nil at the beginning; there's no such thing as a 0th month diff --git a/config/locales/registrant/sessions.en.yml b/config/locales/registrant/sessions.en.yml index 37d03e442..3032382c1 100644 --- a/config/locales/registrant/sessions.en.yml +++ b/config/locales/registrant/sessions.en.yml @@ -5,4 +5,8 @@ en: header: Log in hint: >- Access currently available only to Estonian citizens and e-residents with Estonian ID-card - or Mobile-ID. \ No newline at end of file + or Mobile-ID. + + login_mid: + header: Log in with mobile-id + submit_btn: Login \ No newline at end of file diff --git a/config/locales/registrar/sessions.en.yml b/config/locales/registrar/sessions.en.yml index 2278687ec..f74f74bc9 100644 --- a/config/locales/registrar/sessions.en.yml +++ b/config/locales/registrar/sessions.en.yml @@ -2,6 +2,8 @@ en: registrar: sessions: new: + header_html: Eesti Interneti SA
Registrar Portal submit_btn: Login login_mid: - login_btn: Login + header: Log in with mobile-id + submit_btn: Login