From d93e60d4dda2c3ddf7a2acdb3f31f23df5495400 Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Fri, 18 Jan 2019 13:20:32 +0900
Subject: Better 2FA input on sign in form (#3910)

* Update signin.vue

* Update ja-JP.yml

* Update settings.vue

* Update signin.vue

* Update init.ts
---
 src/client/app/common/views/components/signin.vue    | 5 ++++-
 src/client/app/desktop/views/components/settings.vue | 2 +-
 src/client/app/init.ts                               | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/client/app')

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 @@
 		<span>{{ $t('password') }}</span>
 		<span slot="prefix"><fa icon="lock"/></span>
 	</ui-input>
-	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill"/>
+	<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required styl="fill">
+		<span>{{ $t('@.2fa') }}</span>
+		<span slot="prefix"><fa icon="gavel"/></span>
+	</ui-input>
 	<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('signin') }}</ui-button>
 	<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
 	<p v-if="meta && meta.enableGithubIntegration"  style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
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 @@
 		</ui-card>
 
 		<ui-card class="2fa" v-show="page == 'security'">
-			<div slot="title"><fa icon="mobile-alt"/> {{ $t('2fa') }}</div>
+			<div slot="title"><fa icon="mobile-alt"/> {{ $t('@.2fa') }}</div>
 			<section>
 				<x-2fa/>
 			</section>
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,
-- 
cgit v1.2.3-freya