diff --git a/web/src/store/modules/theme/index.ts b/web/src/store/modules/theme/index.ts index bb3aa307..241bf76a 100644 --- a/web/src/store/modules/theme/index.ts +++ b/web/src/store/modules/theme/index.ts @@ -1,5 +1,5 @@ import type { GlobalThemeOverrides, NDateLocale, NLocale } from 'naive-ui' -import { darkTheme, dateEnUS, dateZhCN, enUS, zhCN } from 'naive-ui' +import { darkTheme, dateEnUS, dateJaJP, dateZhCN, dateZhTW, enUS, jaJP, zhCN, zhTW } from 'naive-ui' import type { BuiltInGlobalTheme } from 'naive-ui/es/themes/interface' import { defaultSettings, getNaiveThemeOverrides } from './helpers' @@ -7,8 +7,10 @@ import { defaultSettings, getNaiveThemeOverrides } from './helpers' type ThemeState = Theme.Setting const locales: Record = { + en: { locale: enUS, dateLocale: dateEnUS }, zh_CN: { locale: zhCN, dateLocale: dateZhCN }, - en: { locale: enUS, dateLocale: dateEnUS } + zh_TW: { locale: zhTW, dateLocale: dateZhTW }, + ja_JP: { locale: jaJP, dateLocale: dateJaJP } } export const useThemeStore = defineStore('theme', { diff --git a/web/src/views/apps/docker/IndexView.vue b/web/src/views/apps/docker/IndexView.vue index 40850246..30421289 100644 --- a/web/src/views/apps/docker/IndexView.vue +++ b/web/src/views/apps/docker/IndexView.vue @@ -22,7 +22,7 @@ const { data: config } = useRequest(docker.getConfig, { }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const getStatus = async () => { diff --git a/web/src/views/apps/fail2ban/IndexView.vue b/web/src/views/apps/fail2ban/IndexView.vue index 3e7cd8d0..6e6adadb 100644 --- a/web/src/views/apps/fail2ban/IndexView.vue +++ b/web/src/views/apps/fail2ban/IndexView.vue @@ -39,7 +39,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const jailsColumns: any = [ diff --git a/web/src/views/apps/frp/IndexView.vue b/web/src/views/apps/frp/IndexView.vue index 715f370a..e0862125 100644 --- a/web/src/views/apps/frp/IndexView.vue +++ b/web/src/views/apps/frp/IndexView.vue @@ -27,8 +27,8 @@ const config = ref({ const statusStr = computed(() => { return { - frpc: status.value.frpc ? $gettext('Running normally') : $gettext('Stopped'), - frps: status.value.frps ? $gettext('Running normally') : $gettext('Stopped') + frpc: status.value.frpc ? $gettext('Running') : $gettext('Stopped'), + frps: status.value.frps ? $gettext('Running') : $gettext('Stopped') } }) diff --git a/web/src/views/apps/gitea/IndexView.vue b/web/src/views/apps/gitea/IndexView.vue index fd949934..cb15d274 100644 --- a/web/src/views/apps/gitea/IndexView.vue +++ b/web/src/views/apps/gitea/IndexView.vue @@ -17,7 +17,7 @@ const isEnabled = ref(false) const config = ref('') const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const getStatus = async () => { diff --git a/web/src/views/apps/memcached/IndexView.vue b/web/src/views/apps/memcached/IndexView.vue index fe48d3dc..a23c42b3 100644 --- a/web/src/views/apps/memcached/IndexView.vue +++ b/web/src/views/apps/memcached/IndexView.vue @@ -19,7 +19,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const loadColumns: any = [ diff --git a/web/src/views/apps/minio/IndexView.vue b/web/src/views/apps/minio/IndexView.vue index 7454ae0f..9a211a5b 100644 --- a/web/src/views/apps/minio/IndexView.vue +++ b/web/src/views/apps/minio/IndexView.vue @@ -17,7 +17,7 @@ const isEnabled = ref(false) const env = ref('') const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const getStatus = async () => { diff --git a/web/src/views/apps/mysql/IndexView.vue b/web/src/views/apps/mysql/IndexView.vue index 5dfc1c42..c6e23147 100644 --- a/web/src/views/apps/mysql/IndexView.vue +++ b/web/src/views/apps/mysql/IndexView.vue @@ -32,7 +32,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const loadColumns: any = [ diff --git a/web/src/views/apps/nginx/IndexView.vue b/web/src/views/apps/nginx/IndexView.vue index d1f7e562..04440941 100644 --- a/web/src/views/apps/nginx/IndexView.vue +++ b/web/src/views/apps/nginx/IndexView.vue @@ -30,7 +30,7 @@ const statusType = computed(() => { }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const columns: any = [ diff --git a/web/src/views/apps/php/PhpView.vue b/web/src/views/apps/php/PhpView.vue index b4ca7de1..c88e8e29 100644 --- a/web/src/views/apps/php/PhpView.vue +++ b/web/src/views/apps/php/PhpView.vue @@ -44,7 +44,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const extensionColumns: any = [ diff --git a/web/src/views/apps/podman/IndexView.vue b/web/src/views/apps/podman/IndexView.vue index ac4bc768..7a92648a 100644 --- a/web/src/views/apps/podman/IndexView.vue +++ b/web/src/views/apps/podman/IndexView.vue @@ -18,7 +18,7 @@ const registryConfig = ref('') const storageConfig = ref('') const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const getStatus = async () => { diff --git a/web/src/views/apps/postgresql/IndexView.vue b/web/src/views/apps/postgresql/IndexView.vue index 8159e988..f31477f5 100644 --- a/web/src/views/apps/postgresql/IndexView.vue +++ b/web/src/views/apps/postgresql/IndexView.vue @@ -32,7 +32,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const loadColumns: any = [ diff --git a/web/src/views/apps/pureftpd/IndexView.vue b/web/src/views/apps/pureftpd/IndexView.vue index e63db62e..3d181a13 100644 --- a/web/src/views/apps/pureftpd/IndexView.vue +++ b/web/src/views/apps/pureftpd/IndexView.vue @@ -22,7 +22,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const addUserModel = ref({ diff --git a/web/src/views/apps/redis/IndexView.vue b/web/src/views/apps/redis/IndexView.vue index 9b14c264..6b36e9e6 100644 --- a/web/src/views/apps/redis/IndexView.vue +++ b/web/src/views/apps/redis/IndexView.vue @@ -26,7 +26,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const loadColumns: any = [ diff --git a/web/src/views/apps/supervisor/IndexView.vue b/web/src/views/apps/supervisor/IndexView.vue index bae5b415..d2810420 100644 --- a/web/src/views/apps/supervisor/IndexView.vue +++ b/web/src/views/apps/supervisor/IndexView.vue @@ -51,7 +51,7 @@ const statusType = computed(() => { return status.value ? 'success' : 'error' }) const statusStr = computed(() => { - return status.value ? $gettext('Running normally') : $gettext('Stopped') + return status.value ? $gettext('Running') : $gettext('Stopped') }) const processColumns: any = [ diff --git a/web/src/views/cert/CertView.vue b/web/src/views/cert/CertView.vue index 37fd2972..67747b92 100644 --- a/web/src/views/cert/CertView.vue +++ b/web/src/views/cert/CertView.vue @@ -166,7 +166,7 @@ const columns: any = [ { title: $gettext('Auto Renew'), key: 'auto_renew', - width: 100, + width: 120, align: 'center', resizable: true, render(row: any) { diff --git a/web/src/views/dashboard/IndexView.vue b/web/src/views/dashboard/IndexView.vue index 64f366df..3165ed48 100644 --- a/web/src/views/dashboard/IndexView.vue +++ b/web/src/views/dashboard/IndexView.vue @@ -159,7 +159,10 @@ const chartOptions = computed(() => { }, legend: { align: 'left', - data: chartType.value == 'net' ? [$gettext('Send'), $gettext('Receive')] : [$gettext('Read'), $gettext('Write')] + data: + chartType.value == 'net' + ? [$gettext('Send'), $gettext('Receive')] + : [$gettext('Read'), $gettext('Write')] }, xAxis: { type: 'category',