fix(i18n): use English runtime text and localize system UI

This commit is contained in:
Arthur Koba
2026-10-25 19:44:15 +03:00
parent ada0550571
commit 65a96670d5
289 changed files with 8092 additions and 3426 deletions
+6 -6
View File
@@ -5,10 +5,10 @@
package option
const (
errInvalidParams = "无效的参数"
errOptionInitFailed = "系统选项初始化失败"
errGeoIPProvider = "归属方式仅支持 disabled、mmdb、ip-api、geojs、ipinfo"
errGeoIPIPEmpty = "IP 不能为空"
errGeoIPIPInvalid = "IP 格式无效"
errGeoIPLookupDisabled = "GeoIP 查询已禁用"
errInvalidParams = "invalid parameters"
errOptionInitFailed = "Failed to initialize system options"
errGeoIPProvider = "geolocation provider must be disabled, mmdb, ip-api, geojs or ipinfo"
errGeoIPIPEmpty = "IP address must not be empty"
errGeoIPIPInvalid = "invalid IP address format"
errGeoIPLookupDisabled = "GeoIP lookup is disabled"
)
@@ -93,7 +93,7 @@ func validateOpenRestyDefaultServerReturnStatus(key, trimmed string) error {
}
statusCode, _ := strconv.Atoi(trimmed)
if statusCode < 100 || statusCode > 999 {
return fmt.Errorf("%s 必须在 100 到 999 之间", key)
return fmt.Errorf("%s must be between 100 and 999", key)
}
return nil
}
@@ -111,7 +111,7 @@ func validateOpenRestyGzipCompLevel(key, trimmed string) error {
}
level, _ := strconv.Atoi(trimmed)
if level > maxOpenRestyGzipCompLevel {
return fmt.Errorf("%s 不能大于 %d", key, maxOpenRestyGzipCompLevel)
return fmt.Errorf("%s must not exceed %d", key, maxOpenRestyGzipCompLevel)
}
return nil
}
@@ -124,7 +124,7 @@ func validateOpenRestyEventsUse(key, trimmed string) error {
case "epoll", "kqueue", "poll", "select", "rtsig", "/dev/poll", "eventport":
return nil
default:
return fmt.Errorf("%s 仅支持 epoll、kqueue、poll、select、rtsig、/dev/poll、eventport 或留空", key)
return fmt.Errorf("%s must be epoll, kqueue, poll, select, rtsig, /dev/poll, eventport or empty", key)
}
}
@@ -133,7 +133,7 @@ func validateOpenRestyResolvers(key, trimmed string) error {
return nil
}
if !regexp.MustCompile(`^[a-zA-Z0-9.:\-\s]+$`).MatchString(trimmed) {
return fmt.Errorf("%s 包含非法字符,请填入有效的 IP 地址或域名,以空格分隔", key)
return fmt.Errorf("%s contains invalid characters; enter valid IP addresses or domain names separated by spaces", key)
}
return nil
}
@@ -142,19 +142,19 @@ func validateOpenRestyProxyBuffers(key, trimmed string) error {
if openRestyProxyBuffersPattern.MatchString(trimmed) {
return nil
}
return fmt.Errorf("%s 格式必须类似 \"16 16k\"", key)
return fmt.Errorf("%s must use a format such as \\\"16 16k\\\"", key)
}
func validateOpenRestySizeValue(key, trimmed string) error {
if openRestySizePattern.MatchString(trimmed) {
return nil
}
return fmt.Errorf("%s 格式必须为整数或带 k/m/g 单位的大小值", key)
return fmt.Errorf("%s must be an integer or a size with a k/m/g suffix", key)
}
func validateOpenRestyCachePath(key, trimmed string) error {
if strings.ContainsAny(trimmed, "\r\n\t") {
return fmt.Errorf("%s 不能包含换行或制表符", key)
return fmt.Errorf("%s must not contain newlines or tabs", key)
}
return nil
}
@@ -163,29 +163,29 @@ func validateOpenRestyCacheLevels(key, trimmed string) error {
if openRestyCacheLevelsPattern.MatchString(trimmed) {
return nil
}
return fmt.Errorf("%s 格式必须类似 \"1:2\" 或 \"1:2:2\"", key)
return fmt.Errorf("%s must use a format such as \\\"1:2\\\" or \\\"1:2:2\\\"", key)
}
func validateOpenRestyDurationToken(key, trimmed string) error {
if openRestyDurationTokenPattern.MatchString(trimmed) {
return nil
}
return fmt.Errorf("%s 格式必须为带单位的时长,例如 30m 或 5s", key)
return fmt.Errorf("%s must be a duration with a unit, such as 30m or 5s", key)
}
func validateOpenRestyCacheKeyTemplate(key, trimmed string) error {
if trimmed == "" {
return fmt.Errorf("%s 不能为空", key)
return fmt.Errorf("%s must not be empty", key)
}
if strings.ContainsAny(trimmed, "\r\n") {
return fmt.Errorf("%s 不能包含换行", key)
return fmt.Errorf("%s must not contain newlines", key)
}
return nil
}
func validateOpenRestyCacheUseStale(key, trimmed string) error {
if trimmed == "" {
return fmt.Errorf("%s 不能为空", key)
return fmt.Errorf("%s must not be empty", key)
}
allowedTokens := map[string]struct{}{
"error": {}, "timeout": {}, "invalid_header": {}, "updating": {},
@@ -194,7 +194,7 @@ func validateOpenRestyCacheUseStale(key, trimmed string) error {
}
for token := range strings.FieldsSeq(trimmed) {
if _, ok := allowedTokens[token]; !ok {
return fmt.Errorf("%s 包含不支持的值 %q", key, token)
return fmt.Errorf("%s contains unsupported value %q", key, token)
}
}
return nil
@@ -202,7 +202,7 @@ func validateOpenRestyCacheUseStale(key, trimmed string) error {
func validateOpenRestyMainConfigTemplate(key, value string) error {
if strings.TrimSpace(value) == "" {
return fmt.Errorf("%s 不能为空", key)
return fmt.Errorf("%s must not be empty", key)
}
return nil
}
@@ -210,15 +210,15 @@ func validateOpenRestyMainConfigTemplate(key, value string) error {
func validateOpenRestyTrustedProxyCIDRs(key, value string) error {
var cidrs []string
if err := json.Unmarshal([]byte(value), &cidrs); err != nil || cidrs == nil {
return fmt.Errorf("%s 必须为 JSON 字符串数组", key)
return fmt.Errorf("%s must be a JSON array of strings", key)
}
if len(cidrs) > maxTrustedProxyCIDRs {
return fmt.Errorf("%s 最多允许 %d 个网段", key, maxTrustedProxyCIDRs)
return fmt.Errorf("%s must contain at most %d network ranges", key, maxTrustedProxyCIDRs)
}
for _, cidr := range cidrs {
prefix, err := netip.ParsePrefix(strings.TrimSpace(cidr))
if err != nil || prefix != prefix.Masked() {
return fmt.Errorf("%s 包含无效网段 %q", key, cidr)
return fmt.Errorf("%s contains invalid network range %q", key, cidr)
}
}
return nil
@@ -229,7 +229,7 @@ func validateOpenRestyDefaultLimitRate(key, trimmed string) error {
return nil
}
if !openRestyDefaultLimitRatePattern.MatchString(strings.ToLower(trimmed)) {
return fmt.Errorf("%s 格式不合法,请使用 512k、1m 或纯数字,空表示关闭", key)
return fmt.Errorf("invalid %s format; use 512k, 1m or a number, or leave empty to disable", key)
}
return nil
}
@@ -241,35 +241,35 @@ func validateOpenRestyDefaultLimitReqPerIP(key, trimmed string) error {
return nil
}
if !openRestyDefaultLimitReqPerIPPattern.MatchString(strings.ToLower(trimmed)) {
return fmt.Errorf("%s 格式不合法,请输入类似 10r/s、100r/m,或留空关闭", key)
return fmt.Errorf("invalid %s format; use a rate such as 10r/s or 100r/m, or leave empty to disable", key)
}
return nil
}
func validateOriginErrorPageStatusCodes(key, trimmed string) error {
if trimmed == "" {
return fmt.Errorf("%s 不能为空", key)
return fmt.Errorf("%s must not be empty", key)
}
var tags []string
if err := json.Unmarshal([]byte(trimmed), &tags); err != nil {
return fmt.Errorf("%s 必须为 JSON 字符串数组", key)
return fmt.Errorf("%s must be a JSON array of strings", key)
}
if len(tags) == 0 {
return fmt.Errorf("%s 至少包含一个状态码标签", key)
return fmt.Errorf("%s must contain at least one status code tag", key)
}
codes, err := openrestyrender.ExpandStatusCodeTags(tags)
if err != nil {
return fmt.Errorf("%s: %w", key, err)
}
if len(codes) == 0 {
return fmt.Errorf("%s 展开后不能为空", key)
return fmt.Errorf("%s must not be empty after expansion", key)
}
return nil
}
func validateOriginErrorPageHTML(key, value string) error {
if len(value) > maxOriginErrorPageHTMLBytes {
return fmt.Errorf("%s 长度不能超过 %d 字节(256 KiB)", key, maxOriginErrorPageHTMLBytes)
return fmt.Errorf("%s must not exceed %d bytes (256 KiB)", key, maxOriginErrorPageHTMLBytes)
}
return nil
}
@@ -281,22 +281,22 @@ func validateSWOfflineHTML(key, value string) error {
func validateSWOfflineDomains(key, value string) error {
var domains []string
if err := json.Unmarshal([]byte(value), &domains); err != nil || domains == nil {
return fmt.Errorf("%s 必须为 JSON 字符串数组", key)
return fmt.Errorf("%s must be a JSON array of strings", key)
}
if len(domains) > maxSWOfflineDomains {
return fmt.Errorf("%s 最多支持 %d 个域名", key, maxSWOfflineDomains)
return fmt.Errorf("%s supports at most %d domain names", key, maxSWOfflineDomains)
}
seen := make(map[string]struct{}, len(domains))
for _, raw := range domains {
domain := strings.ToLower(strings.TrimSpace(raw))
if domain == "" {
return fmt.Errorf("%s 包含空域名", key)
return fmt.Errorf("%s contains an empty domain name", key)
}
if raw != domain {
return fmt.Errorf("%s 域名必须为小写且不含首尾空格:%s", key, raw)
return fmt.Errorf("%s domain name must be lowercase without surrounding whitespace: %s", key, raw)
}
if _, ok := seen[domain]; ok {
return fmt.Errorf("%s 包含重复域名 %s", key, domain)
return fmt.Errorf("%s contains duplicate domain name %s", key, domain)
}
seen[domain] = struct{}{}
}
@@ -32,27 +32,27 @@ func TestValidateOriginErrorPageStatusCodes(t *testing.T) {
{
name: "非法标签",
value: `["abc"]`,
wantErr: "无效状态码",
wantErr: "invalid status code",
},
{
name: "非 JSON 数组",
value: `500-599`,
wantErr: "必须为 JSON 字符串数组",
wantErr: "must be a JSON array of strings",
},
{
name: "空数组",
value: `[]`,
wantErr: "至少包含一个状态码标签",
wantErr: "at least one status code tag",
},
{
name: "越界状态码",
value: `["399"]`,
wantErr: "状态码须在",
wantErr: "status code must be between",
},
{
name: "空字符串",
value: "",
wantErr: "不能为空",
wantErr: "must not be empty",
},
}
@@ -87,7 +87,7 @@ func TestValidateOriginErrorPageHTML(t *testing.T) {
oversized := strings.Repeat("a", maxOriginErrorPageHTMLBytes+1)
err := validateOpenRestyOption(model.ConfigKeyOriginErrorPageHTML, oversized)
require.Error(t, err)
assert.Contains(t, err.Error(), "长度不能超过")
assert.Contains(t, err.Error(), "must not exceed")
// 恰好上限应通过
atLimit := strings.Repeat("b", maxOriginErrorPageHTMLBytes)
@@ -101,7 +101,7 @@ func TestValidateOriginErrorPageEnabled(t *testing.T) {
require.NoError(t, validateOpenRestyOption(model.ConfigKeyOriginErrorPageEnabled, "false"))
err := validateOpenRestyOption(model.ConfigKeyOriginErrorPageEnabled, "yes")
require.Error(t, err)
assert.Contains(t, err.Error(), "true 或 false")
assert.Contains(t, err.Error(), "true or false")
}
func TestValidateSWOfflineDomains(t *testing.T) {
+1 -1
View File
@@ -139,5 +139,5 @@ func SyncUptimeKumaHandler(c *gin.Context) {
if apiutil.AbortBadRequestOnError(c, syncUptimeKuma(c.Request.Context())) {
return
}
c.JSON(http.StatusOK, response.OK("同步成功"))
c.JSON(http.StatusOK, response.OK("Synchronization succeeded"))
}
+15 -15
View File
@@ -28,7 +28,7 @@ var (
const optionValueTrue = "true"
// protectedConfigKeyMessage 命中受保护 key 时返回给管理员的业务错误文案。
const protectedConfigKeyMessage = "该配置项由系统任务管理,禁止手动修改"
const protectedConfigKeyMessage = "this configuration is managed by system tasks and cannot be changed manually"
// protectedConfigKeys 仅允许内部(迁移任务/bootstrap)写入的 key。
var protectedConfigKeys = map[string]bool{
@@ -79,7 +79,7 @@ func validateOptionWithState(ctx context.Context, option model.OpenFlareOption,
func validatePositiveIntegerOption(key, value string) error {
intValue, err := strconv.Atoi(value)
if err != nil || intValue <= 0 {
return fmt.Errorf("%s 必须为大于 0 的整数", key)
return fmt.Errorf("%s must be an integer greater than 0", key)
}
return nil
}
@@ -87,7 +87,7 @@ func validatePositiveIntegerOption(key, value string) error {
func validateNonNegativeIntegerOption(key, value string) error {
intValue, err := strconv.Atoi(value)
if err != nil || intValue < 0 {
return fmt.Errorf("%s 必须为大于等于 0 的整数", key)
return fmt.Errorf("%s must be a nonnegative integer", key)
}
return nil
}
@@ -97,7 +97,7 @@ func validateBooleanOption(key, value string) error {
case optionValueTrue, "false":
return nil
default:
return fmt.Errorf("%s 必须为 true 或 false", key)
return fmt.Errorf("%s must be true or false", key)
}
}
@@ -108,7 +108,7 @@ func validateGeoIPOption(key, value string) error {
if geoip.IsValidProvider(value) {
return nil
}
return fmt.Errorf("%s 仅支持 disabled、mmdb、ip-api、geojs、ipinfo", key)
return fmt.Errorf("%s must be disabled, mmdb, ip-api, geojs or ipinfo", key)
}
func validateLogRetentionOption(key, value string) error {
@@ -116,7 +116,7 @@ func validateLogRetentionOption(key, value string) error {
case model.ConfigKeyLogRetentionDaysPostgres, model.ConfigKeyLogRetentionDaysSQLite, model.ConfigKeyLogRetentionDaysClickHouse:
intValue, err := strconv.Atoi(value)
if err != nil || intValue < 1 {
return fmt.Errorf("%s 必须为大于等于 1 的整数天", key)
return fmt.Errorf("%s must be a whole number of days greater than or equal to 1", key)
}
}
return nil
@@ -135,12 +135,12 @@ func validatePagesOption(key, value string) error {
case model.ConfigKeyPagesMaxPackageSizeMB:
intValue, err := strconv.Atoi(trimmed)
if err != nil || intValue < 1 || intValue > 2048 {
return fmt.Errorf("%s 必须为 1~2048 的整数(MiB)", key)
return fmt.Errorf("%s must be an integer between 1 and 2048 (MiB)", key)
}
case model.ConfigKeyPagesMaxHistoryCount:
intValue, err := strconv.Atoi(trimmed)
if err != nil || intValue < 0 {
return fmt.Errorf("%s 必须为大于等于 0 的整数(0 表示不限制)", key)
return fmt.Errorf("%s must be a nonnegative integer (0 means unlimited)", key)
}
}
return nil
@@ -176,16 +176,16 @@ func validateUptimeKumaEnabled(ctx context.Context, key, trimmed string, state m
username := strings.TrimSpace(state[model.ConfigKeyUptimeKumaUsername])
password := strings.TrimSpace(state[model.ConfigKeyUptimeKumaPassword])
if url == "" {
return errors.New("启用 Uptime Kuma 时地址不能为空")
return errors.New("uptime Kuma address is required when the integration is enabled")
}
if username == "" {
return errors.New("启用 Uptime Kuma 时用户名不能为空")
return errors.New("uptime Kuma username is required when the integration is enabled")
}
// 如果待验证的密码为空,且当前配置中也没有密码,则报错
if password == "" {
existingPwd, _ := repository.GetSystemConfigByKey(ctx, model.ConfigKeyUptimeKumaPassword)
if strings.TrimSpace(existingPwd.Value) == "" {
return errors.New("启用 Uptime Kuma 时密码不能为空")
return errors.New("uptime Kuma password is required when the integration is enabled")
}
}
return nil
@@ -193,21 +193,21 @@ func validateUptimeKumaEnabled(ctx context.Context, key, trimmed string, state m
func validateUptimeKumaUsername(trimmed string, state map[string]string) error {
if trimmed == "" && state[model.ConfigKeyUptimeKumaEnabled] == optionValueTrue {
return errors.New("启用 Uptime Kuma 时用户名不能为空")
return errors.New("uptime Kuma username is required when the integration is enabled")
}
return nil
}
func validateUptimeKumaURL(trimmed string) error {
if trimmed != "" && !strings.HasPrefix(trimmed, "http://") && !strings.HasPrefix(trimmed, "https://") {
return errors.New("uptime Kuma 地址必须以 http:// 或 https:// 开头")
return errors.New("uptime Kuma address must start with http:// or https://")
}
return nil
}
func validateUptimeKumaMonitorScope(trimmed string) error {
if trimmed != "all" && trimmed != "selected" {
return errors.New("监控范围必须为全部站点 (all) 或选择站点 (selected)")
return errors.New("monitor scope must be all or selected sites")
}
return nil
}
@@ -215,7 +215,7 @@ func validateUptimeKumaMonitorScope(trimmed string) error {
func validateUptimeKumaRetry(key, trimmed string) error {
intValue, err := strconv.Atoi(trimmed)
if err != nil || intValue < 0 {
return fmt.Errorf("%s 必须为大于等于 0 的整数", key)
return fmt.Errorf("%s must be a nonnegative integer", key)
}
return nil
}