Commit 59176c2c authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'gt-externalize-app-views-u2f' into 'master'

Externalize strings from `/app/views/u2f`

See merge request gitlab-org/gitlab-ce!23201
parents 320ae622 e109b76b
#js-authenticate-u2f #js-authenticate-u2f
%a.btn.btn-block.btn-info#js-login-2fa-device{ href: '#' } Sign in via 2FA code %a.btn.btn-block.btn-info#js-login-2fa-device{ href: '#' }= _("Sign in via 2FA code")
-# haml-lint:disable InlineJavaScript -# haml-lint:disable InlineJavaScript
%script#js-authenticate-u2f-in-progress{ type: "text/template" } %script#js-authenticate-u2f-in-progress{ type: "text/template" }
%p Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now. %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.")
%script#js-authenticate-u2f-error{ type: "text/template" } %script#js-authenticate-u2f-error{ type: "text/template" }
%div %div
%p <%= error_message %> (error code: <%= error_code %>) %p <%= error_message %> (#{_("error code:")} <%= error_code %>)
%a.btn.btn-block.btn-warning#js-u2f-try-again Try again? %a.btn.btn-block.btn-warning#js-u2f-try-again= _("Try again?")
%script#js-authenticate-u2f-authenticated{ type: "text/template" } %script#js-authenticate-u2f-authenticated{ type: "text/template" }
%div %div
%p We heard back from your U2F device. You have been authenticated. %p= _("We heard back from your U2F device. You have been authenticated.")
= form_tag(new_user_session_path, method: :post, id: 'js-login-u2f-form') do |f| = form_tag(new_user_session_path, method: :post, id: 'js-login-u2f-form') do |f|
- resource_params = params[resource_name].presence || params - resource_params = params[resource_name].presence || params
= hidden_field_tag 'user[remember_me]', resource_params.fetch(:remember_me, 0) = hidden_field_tag 'user[remember_me]', resource_params.fetch(:remember_me, 0)
......
...@@ -2,39 +2,39 @@ ...@@ -2,39 +2,39 @@
-# haml-lint:disable InlineJavaScript -# haml-lint:disable InlineJavaScript
%script#js-register-u2f-not-supported{ type: "text/template" } %script#js-register-u2f-not-supported{ type: "text/template" }
%p Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer). %p= _("Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer).")
%script#js-register-u2f-setup{ type: "text/template" } %script#js-register-u2f-setup{ type: "text/template" }
- if current_user.two_factor_otp_enabled? - if current_user.two_factor_otp_enabled?
.row.append-bottom-10 .row.append-bottom-10
.col-md-4 .col-md-4
%button#js-setup-u2f-device.btn.btn-info.btn-block Set up new U2F device %button#js-setup-u2f-device.btn.btn-info.btn-block= _("Set up new U2F device")
.col-md-8 .col-md-8
%p Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left. %p= _("Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left.")
- else - else
.row.append-bottom-10 .row.append-bottom-10
.col-md-4 .col-md-4
%button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true } Set up new U2F device %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true }= _("Set up new U2F device")
.col-md-8 .col-md-8
%p.text-warning You need to register a two-factor authentication app before you can set up a U2F device. %p.text-warning= _("You need to register a two-factor authentication app before you can set up a U2F device.")
%script#js-register-u2f-in-progress{ type: "text/template" } %script#js-register-u2f-in-progress{ type: "text/template" }
%p Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now. %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.")
%script#js-register-u2f-error{ type: "text/template" } %script#js-register-u2f-error{ type: "text/template" }
%div %div
%p %p
%span <%= error_message %> (error code: <%= error_code %>) %span <%= error_message %> (#{_("error code:")} <%= error_code %>)
%a.btn.btn-warning#js-u2f-try-again Try again? %a.btn.btn-warning#js-u2f-try-again= _("Try again?")
%script#js-register-u2f-registered{ type: "text/template" } %script#js-register-u2f-registered{ type: "text/template" }
.row.append-bottom-10 .row.append-bottom-10
.col-md-12 .col-md-12
%p Your device was successfully set up! Give it a name and register it with the GitLab server. %p= _("Your device was successfully set up! Give it a name and register it with the GitLab server.")
= form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do = form_tag(create_u2f_profile_two_factor_auth_path, method: :post) do
.row.append-bottom-10 .row.append-bottom-10
.col-md-3 .col-md-3
= text_field_tag 'u2f_registration[name]', nil, class: 'form-control', placeholder: "Pick a name" = text_field_tag 'u2f_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name")
.col-md-3 .col-md-3
= hidden_field_tag 'u2f_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response" = hidden_field_tag 'u2f_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response"
= submit_tag "Register U2F device", class: "btn btn-success" = submit_tag _("Register U2F device"), class: "btn btn-success"
...@@ -4434,6 +4434,9 @@ msgstr "" ...@@ -4434,6 +4434,9 @@ msgstr ""
msgid "Personal Access Token" msgid "Personal Access Token"
msgstr "" msgstr ""
msgid "Pick a name"
msgstr ""
msgid "Pipeline" msgid "Pipeline"
msgstr "" msgstr ""
...@@ -5156,6 +5159,9 @@ msgstr "" ...@@ -5156,6 +5159,9 @@ msgstr ""
msgid "Register / Sign In" msgid "Register / Sign In"
msgstr "" msgstr ""
msgid "Register U2F device"
msgstr ""
msgid "Register and see your runners for this group." msgid "Register and see your runners for this group."
msgstr "" msgstr ""
...@@ -5596,6 +5602,9 @@ msgstr "" ...@@ -5596,6 +5602,9 @@ msgstr ""
msgid "Set up a specific Runner automatically" msgid "Set up a specific Runner automatically"
msgstr "" msgstr ""
msgid "Set up new U2F device"
msgstr ""
msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically." msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
msgstr "" msgstr ""
...@@ -5676,6 +5685,9 @@ msgstr "" ...@@ -5676,6 +5685,9 @@ msgstr ""
msgid "Sign in / Register" msgid "Sign in / Register"
msgstr "" msgstr ""
msgid "Sign in via 2FA code"
msgstr ""
msgid "Sign out" msgid "Sign out"
msgstr "" msgstr ""
...@@ -6678,6 +6690,12 @@ msgstr "" ...@@ -6678,6 +6690,12 @@ msgstr ""
msgid "Try again" msgid "Try again"
msgstr "" msgstr ""
msgid "Try again?"
msgstr ""
msgid "Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now."
msgstr ""
msgid "Twitter" msgid "Twitter"
msgstr "" msgstr ""
...@@ -6942,6 +6960,9 @@ msgstr "" ...@@ -6942,6 +6960,9 @@ msgstr ""
msgid "We don't have enough data to show this stage." msgid "We don't have enough data to show this stage."
msgstr "" msgstr ""
msgid "We heard back from your U2F device. You have been authenticated."
msgstr ""
msgid "We want to be sure it is you, please confirm you are not a robot." msgid "We want to be sure it is you, please confirm you are not a robot."
msgstr "" msgstr ""
...@@ -7191,6 +7212,9 @@ msgstr "" ...@@ -7191,6 +7212,9 @@ msgstr ""
msgid "You need permission." msgid "You need permission."
msgstr "" msgstr ""
msgid "You need to register a two-factor authentication app before you can set up a U2F device."
msgstr ""
msgid "You will loose all changes you've made to this file. This action cannot be undone." msgid "You will loose all changes you've made to this file. This action cannot be undone."
msgstr "" msgstr ""
...@@ -7251,12 +7275,18 @@ msgstr "" ...@@ -7251,12 +7275,18 @@ msgstr ""
msgid "Your Todos" msgid "Your Todos"
msgstr "" msgstr ""
msgid "Your U2F device needs to be set up. Plug it in (if not already) and click the button on the left."
msgstr ""
msgid "Your applications (%{size})" msgid "Your applications (%{size})"
msgstr "" msgstr ""
msgid "Your authorized applications" msgid "Your authorized applications"
msgstr "" msgstr ""
msgid "Your browser doesn't support U2F. Please use Google Chrome desktop (version 41 or newer)."
msgstr ""
msgid "Your changes can be committed to %{branch_name} because a merge request is open." msgid "Your changes can be committed to %{branch_name} because a merge request is open."
msgstr "" msgstr ""
...@@ -7266,6 +7296,9 @@ msgstr "" ...@@ -7266,6 +7296,9 @@ msgstr ""
msgid "Your comment will not be visible to the public." msgid "Your comment will not be visible to the public."
msgstr "" msgstr ""
msgid "Your device was successfully set up! Give it a name and register it with the GitLab server."
msgstr ""
msgid "Your groups" msgid "Your groups"
msgstr "" msgstr ""
...@@ -7319,6 +7352,9 @@ msgstr "" ...@@ -7319,6 +7352,9 @@ msgstr ""
msgid "enabled" msgid "enabled"
msgstr "" msgstr ""
msgid "error code:"
msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command." msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment