From e43a30181d2fdd0bba526dd90df0844d809efedc Mon Sep 17 00:00:00 2001 From: tianma-if Date: Wed, 29 Jul 2026 02:21:53 +0800 Subject: [PATCH] fix: simplify login error messages --- apps/desktop/package.json | 2 +- apps/mobile/app.json | 4 ++-- package.json | 2 +- packages/shared/src/i18n/en-US.ts | 24 ++++++++++++------------ packages/shared/src/i18n/zh-CN.ts | 24 ++++++++++++------------ 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 0969ab0a..d6fb5cfb 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,6 +1,6 @@ { "name": "@edgeever/desktop", - "version": "1.6.42", + "version": "1.6.43", "desktopName": "EdgeEver", "private": true, "description": "Native EdgeEver desktop client", diff --git a/apps/mobile/app.json b/apps/mobile/app.json index 9385618f..941c3a8c 100644 --- a/apps/mobile/app.json +++ b/apps/mobile/app.json @@ -3,7 +3,7 @@ "name": "EdgeEver", "slug": "edgeever", "scheme": "edgeever", - "version": "1.6.42", + "version": "1.6.43", "runtimeVersion": { "policy": "appVersion" }, @@ -28,7 +28,7 @@ }, "android": { "package": "org.edgeever.mobile", - "versionCode": 51, + "versionCode": 52, "adaptiveIcon": { "backgroundColor": "#d1fae5", "backgroundImage": "./assets/icon.png", diff --git a/package.json b/package.json index ce053032..f64fcdaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edgeever", - "version": "1.6.42", + "version": "1.6.43", "private": true, "type": "module", "workspaces": [ diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.ts index 5eb70d3a..a85446ef 100644 --- a/packages/shared/src/i18n/en-US.ts +++ b/packages/shared/src/i18n/en-US.ts @@ -48,22 +48,22 @@ export const enUS = { desktopPreparingData: "Preparing local data", desktopPreparingDataDescription: "Switching to the current account's local data space.", submit: "Open workspace", - authNotConfigured: "This instance has not completed its security setup. Set EDGE_EVER_AUTH_PASSWORD as a Worker Secret and redeploy. Unauthenticated access stays blocked until it is fixed.", - databaseNotReady: "The database is not ready. Verify that the D1 binding is named DB, apply the remote migrations, and redeploy.", + authNotConfigured: "Sign-in is not set up for this instance. Contact the administrator.", + databaseNotReady: "This instance is not ready yet. Contact the administrator.", instanceUnavailable: "This instance is temporarily unavailable. Check the Worker logs and run bun run deploy:doctor to validate the deployment.", - instanceUnreachable: "EdgeEver could not reach this instance. Check the address and network, and confirm the instance is running. If it opens in a browser but still fails here, check its HTTPS certificate and CORS configuration.", - instanceApiNotFound: "No EdgeEver API was found at this address. Enter the instance root URL, not an admin page or another subpage.", + instanceUnreachable: "Cannot connect to the instance. Check the address and your network.", + instanceApiNotFound: "This address is not an EdgeEver instance. Check the instance address.", invalidCredentials: "The username or password is incorrect. Check both fields and try again.", - sessionExpired: "Your previous login session is no longer valid. Enter your username and password to sign in again.", - loginRateLimited: "There have been too many failed login attempts. Wait a moment before trying again.", - instanceServerError: "The instance returned a server error (HTTP {{status}}). Try again later or check the instance logs.", - requestRejected: "The instance rejected the login request (HTTP {{status}}). Verify the instance address and configuration.", - invalidInstanceResponse: "This address did not return a valid EdgeEver response. Confirm that it points to an EdgeEver instance.", - unexpectedError: "EdgeEver could not complete the login. Restart the desktop app and try again; if it continues, report the diagnostic code below.", - diagnosticCode: "Diagnostic code: {{code}}", + sessionExpired: "Your login has expired. Sign in again.", + loginRateLimited: "Too many attempts. Try again later.", + instanceServerError: "The instance is temporarily unavailable. Try again later.", + requestRejected: "Sign-in failed. Check the form and try again.", + invalidInstanceResponse: "This is not a valid EdgeEver instance. Check the instance address.", + unexpectedError: "Sign-in failed. Try again.", + diagnosticCode: "Error code: {{code}}", desktopScopeUnavailable: "The desktop local data scope could not be switched. The workspace is paused to protect account data.", desktopScopeRetry: "Retry", - passwordHashInvalid: "This account's password data is invalid; plaintext passwords are not supported. Follow the deployment guide and run auth:reset-password to reset it safely.", + passwordHashInvalid: "This account is not configured correctly. Ask the administrator to reset its password.", desktopInstanceTitle: "Connect an EdgeEver instance", desktopInstanceUrl: "Instance URL", desktopInstanceContinue: "Continue", diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.ts index 80b8dbd5..b929587c 100644 --- a/packages/shared/src/i18n/zh-CN.ts +++ b/packages/shared/src/i18n/zh-CN.ts @@ -48,22 +48,22 @@ export const zhCN = { desktopPreparingData: "正在准备本地数据", desktopPreparingDataDescription: "正在切换当前账户的数据空间。", submit: "开启工作区", - authNotConfigured: "实例尚未完成安全配置。请在 Worker 中设置 EDGE_EVER_AUTH_PASSWORD Secret，然后重新部署；在修复前不会开放免登录访问。", - databaseNotReady: "数据库尚未就绪。请确认 D1 绑定名称为 DB，并执行远程数据库迁移后重新部署。", + authNotConfigured: "这个实例还没配置好登录功能，请联系管理员。", + databaseNotReady: "这个实例还没准备好，请联系管理员。", instanceUnavailable: "实例暂时不可用。请查看 Worker 日志并运行 bun run deploy:doctor 检查部署配置。", - instanceUnreachable: "无法连接到这个实例。请检查实例地址和网络，并确认实例服务正在运行。如果浏览器能打开但这里仍然失败，请检查 HTTPS 证书和跨域配置。", - instanceApiNotFound: "这个地址没有找到 EdgeEver API。请填写实例根地址，不要填写管理页面或其他子页面地址。", + instanceUnreachable: "连接不到实例，请检查实例地址和网络。", + instanceApiNotFound: "这个地址不是 EdgeEver 实例，请检查实例地址。", invalidCredentials: "账号或密码错误，请检查后重试。", - sessionExpired: "之前的登录状态已经失效，请重新输入账号和密码。", - loginRateLimited: "登录失败次数过多，请稍等一会儿再试。", - instanceServerError: "实例服务返回错误（HTTP {{status}}）。请稍后重试，或检查实例服务日志。", - requestRejected: "实例拒绝了登录请求（HTTP {{status}}）。请检查实例地址和服务配置。", - invalidInstanceResponse: "这个地址没有返回有效的 EdgeEver 响应，请确认它指向 EdgeEver 实例。", - unexpectedError: "登录过程未能完成。请重启桌面客户端后重试；如果问题持续，请反馈下方诊断代码。", - diagnosticCode: "诊断代码：{{code}}", + sessionExpired: "登录已过期，请重新登录。", + loginRateLimited: "尝试次数太多，请稍后再试。", + instanceServerError: "实例暂时出错，请稍后再试。", + requestRejected: "登录请求未成功，请检查填写内容后重试。", + invalidInstanceResponse: "这个地址不是有效的 EdgeEver 实例，请检查实例地址。", + unexpectedError: "登录失败，请重试。", + diagnosticCode: "错误代码：{{code}}", desktopScopeUnavailable: "桌面本地数据空间暂时无法切换。为保护账户数据，工作区已暂停加载。", desktopScopeRetry: "重试", - passwordHashInvalid: "该账号的密码数据格式无效，不能使用明文密码。请按照部署指南运行 auth:reset-password 安全重置。", + passwordHashInvalid: "账号配置异常，请联系管理员重置密码。", desktopInstanceTitle: "连接 EdgeEver 实例", desktopInstanceUrl: "实例地址", desktopInstanceContinue: "继续",