diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index c7f42d981..bb2381539 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1007,6 +1007,10 @@ "168": "Uploading data repo snapshot %s", "169": "Uploading data repo file %v", "170": "Uploading data repo chunk %v", - "171": "Uploading data repo reference %s" + "171": "Uploading data repo reference %s", + "172": " If you forget the authorization code, you can search
for accessAuthCode in the workspace conf/conf.json", + "173": "Please enter the access auth code", + "174": "Unlock access", + "175": "Please enter the verification code" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index fcedc20cd..cb400eb26 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1007,6 +1007,10 @@ "168": "Cargando instantánea de repositorio de datos %s", "169": "Cargando archivo de repositorio de datos %v", "170": "Cargando fragmento de repositorio de datos %v", - "171": "Cargando referencia de repositorio de datos %s" + "171": "Cargando referencia de repositorio de datos %s", + "172": "Si olvida el código de autorización, puede buscar accessAuthCode en el archivo
conf/conf.json del espacio de trabajo", + "173": "Por favor ingrese el codigo de autorizacion de acceso", + "174": "Desbloquear acceso", + "175": "Por favor ingrese el código de verificación" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 10511d3ce..5304988b0 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1007,6 +1007,10 @@ "168": "Téléchargement de l'instantané du référentiel de données %s", "169": "Téléchargement du fichier de référentiel de données %v", "170": "Téléchargement du bloc de dépôt de données %v", - "171": "Téléchargement de la référence de référentiel de données %s" + "171": "Téléchargement de la référence de référentiel de données %s", + "172": "Si vous oubliez le code d'autorisation, vous pouvez rechercher accessAuthCode dans le fichier
conf/conf.json de l'espace de travail", + "173": "Veuillez entrer le code d'autorisation d'accès", + "174": "Déverrouiller l'accès", + "175": "Veuillez entrer le code de vérification" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 2b4f46a46..fae191823 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1007,6 +1007,10 @@ "168": "正在上傳數據倉庫快照 %s", "169": "正在上傳數據倉庫文件 %v", "170": "正在上傳數據倉庫分塊 %v", - "171": "正在上傳數據倉庫引用 %s" + "171": "正在上傳數據倉庫引用 %s", + "172": "如果你忘記了授權碼,可在工作空間
conf/conf.json 文件中搜索 accessAuthCode", + "173": "請輸入訪問授權碼", + "174": "解鎖訪問", + "175": "請輸入驗證碼" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index b1c4df33a..9e0ce05e2 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1007,6 +1007,10 @@ "168": "正在上传数据仓库快照 %s", "169": "正在上传数据仓库文件 %v", "170": "正在上传数据仓库分块 %v", - "171": "正在上传数据仓库引用 %s" + "171": "正在上传数据仓库引用 %s", + "172": "如果你忘记了授权码,可在工作空间
conf/conf.json 文件中搜索 accessAuthCode", + "173": "请输入访问授权码", + "174": "解锁访问", + "175": "请输入验证码" } } diff --git a/app/stage/auth.html b/app/stage/auth.html index 79bf4f02f..9d3e6e282 100644 --- a/app/stage/auth.html +++ b/app/stage/auth.html @@ -157,16 +157,15 @@ ">
-

思源 SiYuan

-
+

SiYuan

+
- +
- +
- 如果你忘记了授权码,可在工作空间
conf/conf.json 文件中搜索 accessAuthCode

- If you forget the authorization code, you can search
for accessAuthCode in the workspace conf/conf.json + {{.l2}}
diff --git a/kernel/server/serve.go b/kernel/server/serve.go index d5e68ee06..62f9f8deb 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -17,7 +17,9 @@ package server import ( + "bytes" "fmt" + "html/template" "net" "net/http" "net/http/httputil" @@ -267,6 +269,27 @@ func serveCheckAuth(c *gin.Context) { c.Status(500) return } + + tpl, err := template.New("auth").Parse(string(data)) + if nil != err { + logging.LogErrorf("parse auth page failed: %s", err) + c.Status(500) + return + } + + model := map[string]interface{}{ + "l0": model.Conf.Language(173), + "l1": model.Conf.Language(174), + "l2": template.HTML(model.Conf.Language(172)), + "l3": model.Conf.Language(175), + } + buf := &bytes.Buffer{} + if err = tpl.Execute(buf, model); nil != err { + logging.LogErrorf("execute auth page failed: %s", err) + c.Status(500) + return + } + data = buf.Bytes() c.Data(http.StatusOK, "text/html; charset=utf-8", data) }