From 6202451c7c33fbdefd98a0abdaf3f133bacbc9f3 Mon Sep 17 00:00:00 2001 From: nkanaev Date: Mon, 22 Jun 2026 21:03:49 +0100 Subject: [PATCH] i18n: switch to fluent in login page --- src/assets/javascripts/i18n.js | 5 ++++ src/assets/login.html | 45 ++++++++++++++++++++++------------ src/server/auth/middleware.go | 3 ++- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/assets/javascripts/i18n.js b/src/assets/javascripts/i18n.js index d0e6fcb..50e729d 100644 --- a/src/assets/javascripts/i18n.js +++ b/src/assets/javascripts/i18n.js @@ -340,6 +340,11 @@ "zh": "登录", "ru": "Вход" }, + "login_error": { + "en": "Invalid username or password", + "zh": "用户名或密码错误", + "ru": "Неверное имя пользователя или пароль" + }, "username": { "en": "Username", "zh": "用户名", diff --git a/src/assets/login.html b/src/assets/login.html index 367d1ad..408ac1e 100644 --- a/src/assets/login.html +++ b/src/assets/login.html @@ -9,6 +9,7 @@ -
- - {% if .error %} -
{% .error %}
- {% end %} -
- - -
-
- - -
- -
+
+
+ +
{{ $t('login_error') }}
+
+ + +
+
+ + +
+ +
+
+ + + + diff --git a/src/server/auth/middleware.go b/src/server/auth/middleware.go index 0704622..6d2d8b9 100644 --- a/src/server/auth/middleware.go +++ b/src/server/auth/middleware.go @@ -46,13 +46,14 @@ func (m *Middleware) Handler(c *router.Context) { } else { c.HTML(http.StatusOK, assets.Template("login.html"), map[string]any{ "username": username, - "error": "Invalid username/password", + "hasError": true, "settings": m.DB.GetSettings().Map(), }) return } } c.HTML(http.StatusOK, assets.Template("login.html"), map[string]any{ + "hasError": false, "settings": m.DB.GetSettings().Map(), }) }