From 4e554363395b4529b9bc34d3951d9badf18cb4f0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 29 Dec 2018 22:10:54 +0900
Subject: [PATCH] [Client] Improve 2fa settings

---
 locales/ja-JP.yml                                        | 1 +
 src/client/app/desktop/views/components/settings.2fa.vue | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index bdce0ca009..52d5ff8f62 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -952,6 +952,7 @@ desktop/views/components/settings.2fa.vue:
   enter-password: "パスワードを入力してください"
   authenticator: "まず、Google Authenticatorをお使いのデバイスにインストールします:"
   howtoinstall: "インストール方法はこちら"
+  token: "トークン"
   scan: "次に、表示されているQRコードをスキャンします:"
   done: "お使いのデバイスに表示されているトークンを入力して完了します:"
   submit: "完了"
diff --git a/src/client/app/desktop/views/components/settings.2fa.vue b/src/client/app/desktop/views/components/settings.2fa.vue
index 9d32685be5..636c3270ee 100644
--- a/src/client/app/desktop/views/components/settings.2fa.vue
+++ b/src/client/app/desktop/views/components/settings.2fa.vue
@@ -7,16 +7,16 @@
 		<p>{{ $t('already-registered') }}</p>
 		<ui-button @click="unregister">{{ $t('unregister') }}</ui-button>
 	</template>
-	<div v-if="data">
+	<div v-if="data && !$store.state.i.twoFactorEnabled">
 		<ol>
 			<li>{{ $t('authenticator') }}<a href="https://support.google.com/accounts/answer/1066447" target="_blank">{{ $t('howtoinstall') }}</a></li>
 			<li>{{ $t('scan') }}<br><img :src="data.qr"></li>
 			<li>{{ $t('done') }}<br>
-				<input type="number" v-model="token" class="ui">
+				<ui-input v-model="token">{{ $t('token') }}</ui-input>
 				<ui-button primary @click="submit">{{ $t('submit') }}</ui-button>
 			</li>
 		</ol>
-		<div class="ui info"><p><fa icon="info-circle"/>{{ $t('info') }}</p></div>
+		<ui-info>{{ $t('info') }}</ui-info>
 	</div>
 </div>
 </template>