From 877998b50efc9619fcb4eeb8a95b85d356272a23 Mon Sep 17 00:00:00 2001
From: godcong <jumbycc@163.com>
Date: Mon, 11 Jun 2018 23:53:43 +0800
Subject: [PATCH] 1. fix two_factor and redirect scratch page cannot back to
 the passcode page(has no back button)

2. fix scratch logged in , redirect to the 404 page
---
 options/locale/locale_de-DE.ini        | 1 +
 options/locale/locale_en-US.ini        | 1 +
 options/locale/locale_zh-CN.ini        | 1 +
 options/locale/locale_zh-HK.ini        | 1 +
 options/locale/locale_zh-TW.ini        | 1 +
 templates/user/auth/twofa_scratch.tmpl | 1 +
 6 files changed, 6 insertions(+)

diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 7895827ba..8c46a035c 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -30,6 +30,7 @@ captcha=CAPTCHA
 twofa=Zwei-Faktor-Authentifizierung
 twofa_scratch=Zwei-Faktor-Einmalpasswort
 passcode=PIN
+use_passcode=PIN verwenden
 
 u2f_insert_key=Hardware-Sicherheitsschlüssel einstecken
 u2f_sign_in=Drücke den Knopf auf deinem Sicherheitsschlüssel. Wenn deiner keinen Knopf hat, stecke ihn erneut ein.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8cf6111c6..e003fa086 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -30,6 +30,7 @@ captcha = CAPTCHA
 twofa = Two-Factor Authentication
 twofa_scratch = Two-Factor Scratch Code
 passcode = Passcode
+use_passcode = Use Passcode
 
 u2f_insert_key = Insert your security key
 u2f_sign_in = Press the button on your security key. If you can't find a button, re-insert it.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 8b23e404c..372181e65 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -30,6 +30,7 @@ captcha=验证码
 twofa=两步验证
 twofa_scratch=两步验证口令
 passcode=验证码
+use_passcode=使用验证码
 
 u2f_insert_key=插入安全密钥
 u2f_sign_in=按下安全密钥上的按钮。如果找不到按钮, 请重新插入。
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index a64367d39..cfd0cf53e 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -16,6 +16,7 @@ notifications=訊息
 
 password=密碼
 passcode=驗證碼
+use_passcode=使用驗證碼
 
 
 repository=儲存庫
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index fa716b27d..332d64ddc 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -18,6 +18,7 @@ signed_in_as=已登入用戶
 username=用戶名稱
 password=密碼
 passcode=驗證碼
+use_passcode=使用驗證碼
 
 
 repository=儲存庫
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 78aab3e57..c3f9986a5 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -17,6 +17,7 @@
 					<div class="inline field">
 						<label></label>
 						<button class="ui green button">{{.i18n.Tr "auth.verify"}}</button>
+						 <a href="{{AppSubUrl}}/user/two_factor">{{.i18n.Tr "use_passcode" | Str2html}}</a>
 					</div>
 				</div>
 			</form>