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

Externalize strings from `/app/views/u2f`

See merge request gitlab-org/gitlab-ce!23201

app/views/u2f/_authenticate.html.haml

 #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
 %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" }
   %div
-    %p <%= error_message %> (error code: <%= error_code %>)
-    %a.btn.btn-block.btn-warning#js-u2f-try-again Try again?
+    %p <%= error_message %> (#{_("error code:")} <%= error_code %>)
+    %a.btn.btn-block.btn-warning#js-u2f-try-again= _("Try again?")
 
 %script#js-authenticate-u2f-authenticated{ type: "text/template" }
   %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|
       - resource_params = params[resource_name].presence || params
       = hidden_field_tag 'user[remember_me]', resource_params.fetch(:remember_me, 0)

app/views/u2f/_register.html.haml

@@ -2,39 +2,39 @@
 
 -# haml-lint:disable InlineJavaScript
 %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" }
   - if current_user.two_factor_otp_enabled?
     .row.append-bottom-10
       .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
-        %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
     .row.append-bottom-10
       .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
-        %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" }
-  %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" }
   %div
     %p
-      %span <%= error_message %> (error code: <%= error_code %>)
-    %a.btn.btn-warning#js-u2f-try-again Try again?
+      %span <%= error_message %> (#{_("error code:")} <%= error_code %>)
+    %a.btn.btn-warning#js-u2f-try-again= _("Try again?")
 
 %script#js-register-u2f-registered{ type: "text/template" }
   .row.append-bottom-10
     .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
         .row.append-bottom-10
           .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
             = 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"

locale/gitlab.pot

@@ -4434,6 +4434,9 @@ msgstr ""
 msgid "Personal Access Token"
 msgstr ""
 
+msgid "Pick a name"
+msgstr ""
+
 msgid "Pipeline"
 msgstr ""
 
@@ -5156,6 +5159,9 @@ msgstr ""
 msgid "Register / Sign In"
 msgstr ""
 
+msgid "Register U2F device"
+msgstr ""
+
 msgid "Register and see your runners for this group."
 msgstr ""
 
@@ -5596,6 +5602,9 @@ msgstr ""
 msgid "Set up a specific Runner automatically"
 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."
 msgstr ""
 
@@ -5676,6 +5685,9 @@ msgstr ""
 msgid "Sign in / Register"
 msgstr ""
 
+msgid "Sign in via 2FA code"
+msgstr ""
+
 msgid "Sign out"
 msgstr ""
 
@@ -6678,6 +6690,12 @@ msgstr ""
 msgid "Try again"
 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"
 msgstr ""
 
@@ -6942,6 +6960,9 @@ msgstr ""
 msgid "We don't have enough data to show this stage."
 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."
 msgstr ""
 
@@ -7191,6 +7212,9 @@ msgstr ""
 msgid "You need permission."
 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."
 msgstr ""
 
@@ -7251,12 +7275,18 @@ msgstr ""
 msgid "Your Todos"
 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})"
 msgstr ""
 
 msgid "Your authorized applications"
 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."
 msgstr ""
 
@@ -7266,6 +7296,9 @@ msgstr ""
 msgid "Your comment will not be visible to the public."
 msgstr ""
 
+msgid "Your device was successfully set up! Give it a name and register it with the GitLab server."
+msgstr ""
+
 msgid "Your groups"
 msgstr ""
 
@@ -7319,6 +7352,9 @@ msgstr ""
 msgid "enabled"
 msgstr ""
 
+msgid "error code:"
+msgstr ""
+
 msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
 msgstr ""