From d93e60d4dda2c3ddf7a2acdb3f31f23df5495400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Fri, 18 Jan 2019 13:20:32 +0900 Subject: [PATCH] Better 2FA input on sign in form (#3910) * Update signin.vue * Update ja-JP.yml * Update settings.vue * Update signin.vue * Update init.ts --- locales/ja-JP.yml | 2 +- src/client/app/common/views/components/signin.vue | 5 ++++- src/client/app/desktop/views/components/settings.vue | 2 +- src/client/app/init.ts | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index a7796c4d11..0fbbe69c68 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -27,6 +27,7 @@ common: do-not-copy-paste: "ここにコードを入力したり張り付けたりしないでください。アカウントが不正利用される可能性があります。" load-more: "もっと読み込む" enter-password: "パスワードを入力してください" + 2fa: "二段階認証" got-it: "わかった" customization-tips: @@ -855,7 +856,6 @@ desktop/views/components/settings.vue: security: "セキュリティ" signin: "サインイン履歴" password: "パスワード" - 2fa: "二段階認証" other: "その他" license: "ライセンス" theme: "テーマ" diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index 7efbde38b2..296863a486 100644 --- a/src/client/app/common/views/components/signin.vue +++ b/src/client/app/common/views/components/signin.vue @@ -10,7 +10,10 @@ {{ $t('password') }} - + + {{ $t('@.2fa') }} + + {{ signing ? $t('signing-in') : $t('signin') }}

{{ $t('signin-with-twitter') }}

{{ $t('signin-with-github') }}

diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index 5ffe69ef45..991412f27f 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -203,7 +203,7 @@ -
{{ $t('2fa') }}
+
{{ $t('@.2fa') }}
diff --git a/src/client/app/init.ts b/src/client/app/init.ts index cbd49b3690..7eb53eb7a5 100644 --- a/src/client/app/init.ts +++ b/src/client/app/init.ts @@ -124,7 +124,8 @@ import { faMapMarker, faRobot, faHourglassHalf, - faAlignLeft + faAlignLeft, + faGavel } from '@fortawesome/free-solid-svg-icons'; import { @@ -257,6 +258,7 @@ library.add( faRobot, faHourglassHalf, faAlignLeft, + faGavel, farBell, farEnvelope,