Merge branch 'ee-js-i18n-u2f' into 'master'

Internationalisation of u2f directory - EE

See merge request gitlab-org/gitlab-ee!11861

app/assets/javascripts/u2f/error.js

+import { __ } from '~/locale';
+
 export default class U2FError {
   constructor(errorCode, u2fFlowType) {
     this.errorCode = errorCode;
@@ -8,15 +10,17 @@ export default class U2FError {
 
   message() {
     if (this.errorCode === window.u2f.ErrorCodes.BAD_REQUEST && this.httpsDisabled) {
-      return 'U2F only works with HTTPS-enabled websites. Contact your administrator for more details.';
+      return __(
+        'U2F only works with HTTPS-enabled websites. Contact your administrator for more details.',
+      );
     } else if (this.errorCode === window.u2f.ErrorCodes.DEVICE_INELIGIBLE) {
       if (this.u2fFlowType === 'authenticate') {
-        return 'This device has not been registered with us.';
+        return __('This device has not been registered with us.');
       }
       if (this.u2fFlowType === 'register') {
-        return 'This device has already been registered with us.';
+        return __('This device has already been registered with us.');
       }
     }
-    return 'There was a problem communicating with your device.';
+    return __('There was a problem communicating with your device.');
   }
 }

locale/gitlab.pot

@@ -11943,6 +11943,9 @@ msgstr ""
 msgid "There is already a repository with that name on disk"
 msgstr ""
 
+msgid "There was a problem communicating with your device."
+msgstr ""
+
 msgid "There was an error adding a todo."
 msgstr ""
 
@@ -12051,6 +12054,12 @@ msgstr ""
 msgid "This date is before the start date, so this epic won't appear in the roadmap."
 msgstr ""
 
+msgid "This device has already been registered with us."
+msgstr ""
+
+msgid "This device has not been registered with us."
+msgstr ""
+
 msgid "This diff is collapsed."
 msgstr ""
 
@@ -12724,6 +12733,9 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+msgid "U2F only works with HTTPS-enabled websites. Contact your administrator for more details."
+msgstr ""
+
 msgid "URL"
 msgstr ""