mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-19 02:12:10 +08:00
chore: update i18n
This commit is contained in:
+8
-2
@@ -3,6 +3,7 @@ import { fetch } from '@tauri-apps/plugin-http'
|
||||
import { asyncRetry } from 'foxts/async-retry'
|
||||
import { extractErrorMessage } from 'foxts/extract-error-message'
|
||||
import { once } from 'foxts/once'
|
||||
import i18n from 'i18next'
|
||||
|
||||
import { debugLog } from '@/utils/debug'
|
||||
|
||||
@@ -215,10 +216,15 @@ export const getIpInfo = async (): Promise<
|
||||
}
|
||||
|
||||
if (lastError) {
|
||||
console.error('[IP Info] All detection services failed:', lastError)
|
||||
throw new Error(
|
||||
`所有IP检测服务都失败: ${extractErrorMessage(lastError) || '未知错误'}`,
|
||||
i18n.t(($) => $.home.components.ipInfo.errors.loadWithDetails, {
|
||||
message:
|
||||
extractErrorMessage(lastError) ||
|
||||
i18n.t(($) => $.shared.feedback.errors.unknown),
|
||||
}),
|
||||
)
|
||||
} else {
|
||||
throw new Error('没有可用的IP检测服务')
|
||||
throw new Error(i18n.t(($) => $.home.components.ipInfo.errors.noServices))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,6 +45,32 @@ const DEFAULT_DURATIONS: Readonly<Record<NoticeType, number>> = {
|
||||
}
|
||||
|
||||
const TRANSLATION_KEY_PATTERN = /^[A-Za-z0-9_-]+(?:\.[A-Za-z0-9_-]+)+$/
|
||||
const CODED_ERROR_PATTERN = /^CVR_ERROR:([A-Z0-9_]+)(?:\n([\s\S]*))?$/
|
||||
const CODED_ERROR_TRANSLATION_KEYS: Readonly<Record<string, string>> = {
|
||||
CLASH_CONFIG_UPDATE_FAILED:
|
||||
'settings.feedback.errors.clash.configUpdateFailed',
|
||||
CLASH_MODE_UPDATE_FAILED: 'settings.feedback.errors.clash.modeUpdateFailed',
|
||||
CORE_CHANGE_FAILED: 'settings.feedback.notifications.clash.changeFailed',
|
||||
CORE_RESTART_FAILED: 'settings.feedback.errors.clash.restartFailed',
|
||||
CORE_START_FAILED: 'settings.feedback.errors.clash.startFailed',
|
||||
CORE_STOP_FAILED: 'settings.feedback.errors.clash.stopFailed',
|
||||
PROFILE_CREATE_FAILED: 'profiles.page.feedback.errors.createFailed',
|
||||
PROFILE_DELETE_FAILED: 'profiles.page.feedback.errors.deleteFailed',
|
||||
PROFILE_ENHANCE_FAILED: 'profiles.page.feedback.errors.enhanceFailed',
|
||||
PROFILE_IMPORT_FAILED: 'profiles.page.feedback.errors.importFailed',
|
||||
PROFILE_OPEN_FAILED: 'profiles.page.feedback.errors.openFailed',
|
||||
PROFILE_READ_FAILED: 'profiles.page.feedback.errors.readFailed',
|
||||
PROFILE_REORDER_FAILED: 'profiles.page.feedback.errors.reorderFailed',
|
||||
PROFILE_SWITCH_FAILED: 'profiles.page.feedback.errors.switchFailed',
|
||||
PROFILE_UPDATE_FAILED: 'profiles.page.feedback.errors.updateFailed',
|
||||
SERVICE_INSTALL_FAILED: 'settings.feedback.errors.clashService.installFailed',
|
||||
SERVICE_REINSTALL_FAILED:
|
||||
'settings.feedback.errors.clashService.reinstallFailed',
|
||||
SERVICE_REPAIR_FAILED: 'settings.feedback.errors.clashService.repairFailed',
|
||||
SERVICE_SIDECAR_FAILED: 'settings.feedback.errors.clashService.sidecarFailed',
|
||||
SERVICE_UNINSTALL_FAILED:
|
||||
'settings.feedback.errors.clashService.uninstallFailed',
|
||||
}
|
||||
|
||||
let nextId = 0
|
||||
let notices: NoticeItem[] = []
|
||||
@@ -195,12 +221,27 @@ function extractDisplayText(input: unknown): string | undefined {
|
||||
}
|
||||
}
|
||||
|
||||
function parseCodedError(input?: string) {
|
||||
if (!input) return undefined
|
||||
const match = input.match(CODED_ERROR_PATTERN)
|
||||
if (!match) return undefined
|
||||
|
||||
return {
|
||||
translationKey:
|
||||
CODED_ERROR_TRANSLATION_KEYS[match[1]] ??
|
||||
'shared.feedback.errors.operationFailed',
|
||||
detail: match[2]?.trim(),
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeNoticeMessage(
|
||||
message: NoticeContent,
|
||||
params?: Record<string, unknown>,
|
||||
raw?: unknown,
|
||||
): { message?: ReactNode; i18n?: NoticeTranslationDescriptor } {
|
||||
const rawText = raw !== undefined ? extractDisplayText(raw) : undefined
|
||||
const parsedRawError = parseCodedError(rawText)
|
||||
const rawDetail = parsedRawError?.detail ?? rawText
|
||||
|
||||
if (isValidElement(message)) {
|
||||
return { message }
|
||||
@@ -212,7 +253,7 @@ function normalizeNoticeMessage(
|
||||
? { ...originalParams, ...params }
|
||||
: { ...originalParams }
|
||||
|
||||
if (rawText !== undefined) {
|
||||
if (rawDetail !== undefined) {
|
||||
return {
|
||||
i18n: {
|
||||
key: 'shared.feedback.notices.prefixedRaw',
|
||||
@@ -220,7 +261,7 @@ function normalizeNoticeMessage(
|
||||
...mergedParams,
|
||||
prefixKey: message.key,
|
||||
prefixParams: originalParams,
|
||||
message: rawText,
|
||||
message: rawDetail,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -234,8 +275,28 @@ function normalizeNoticeMessage(
|
||||
}
|
||||
}
|
||||
|
||||
const parsedMessageError = parseCodedError(extractDisplayText(message))
|
||||
if (parsedMessageError) {
|
||||
if (!parsedMessageError.detail) {
|
||||
return {
|
||||
i18n: {
|
||||
key: parsedMessageError.translationKey,
|
||||
},
|
||||
}
|
||||
}
|
||||
return {
|
||||
i18n: {
|
||||
key: 'shared.feedback.notices.prefixedRaw',
|
||||
params: {
|
||||
prefixKey: parsedMessageError.translationKey,
|
||||
message: parsedMessageError.detail,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof message === 'string') {
|
||||
if (rawText !== undefined) {
|
||||
if (rawDetail !== undefined) {
|
||||
if (shouldUseTranslationKey(message, params)) {
|
||||
return {
|
||||
i18n: {
|
||||
@@ -243,7 +304,7 @@ function normalizeNoticeMessage(
|
||||
params: {
|
||||
...(params ?? {}),
|
||||
prefixKey: message,
|
||||
message: rawText,
|
||||
message: rawDetail,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -255,7 +316,7 @@ function normalizeNoticeMessage(
|
||||
params: {
|
||||
...(params ?? {}),
|
||||
prefix: message,
|
||||
message: rawText,
|
||||
message: rawDetail,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -272,8 +333,8 @@ function normalizeNoticeMessage(
|
||||
return { i18n: createRawDescriptor(message) }
|
||||
}
|
||||
|
||||
if (rawText !== undefined) {
|
||||
return { i18n: createRawDescriptor(rawText) }
|
||||
if (rawDetail !== undefined) {
|
||||
return { i18n: createRawDescriptor(rawDetail) }
|
||||
}
|
||||
|
||||
const extracted = extractDisplayText(message)
|
||||
|
||||
Reference in New Issue
Block a user