Skip to content

Commit

Permalink
feat: 优化英文翻译 (1Panel-dev#5662)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengkunwang223 authored Jul 3, 2024
1 parent 180217f commit 838b327
Show file tree
Hide file tree
Showing 27 changed files with 182 additions and 208 deletions.
309 changes: 153 additions & 156 deletions frontend/src/lang/modules/en.ts

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions frontend/src/lang/modules/tw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,6 @@ const message = {
check: '查',
acmeAccountManage: 'Acme 賬戶',
email: '郵',
addAccount: '創建賬戶',
acmeAccount: 'Acme 賬戶',
provider: '驗證方式',
dnsManual: '手動解析',
Expand Down Expand Up @@ -1874,8 +1873,6 @@ const message = {
proxyPath: '前端請求路徑',
proxyPass: '後端代理地址',
cache: '緩',
createProxy: '創建反向代理',
editProxy: '編輯反向代理',
cacheTime: '緩存時間',
enableCache: '開啟緩存',
proxyHost: '後端域名',
Expand Down Expand Up @@ -2025,7 +2022,6 @@ const message = {
getDnsResolve: '正在取得 DNS 解析值,請稍後 ...',
selfSigned: '自簽證書',
ca: '證書頒發機構',
createCA: '創建機構',
commonName: '憑證主體名稱(CN)',
caName: '機構名稱',
company: '公/組織',
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/lang/modules/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,6 @@ const message = {
check: '查',
acmeAccountManage: 'Acme 账户',
email: '邮',
addAccount: '创建账户',
acmeAccount: 'Acme 账户',
provider: '验证方式',
dnsManual: '手动解析',
Expand Down Expand Up @@ -1875,8 +1874,6 @@ const message = {
proxyPath: '前端请求路径',
proxyPass: '后端代理地址',
cache: '缓',
createProxy: '创建反向代理',
editProxy: '编辑反向代理',
cacheTime: '缓存时间',
enableCache: '开启缓存',
proxyHost: '后端域名',
Expand Down Expand Up @@ -2026,7 +2023,6 @@ const message = {
getDnsResolve: '正在获取 DNS 解析值,请稍后 ...',
selfSigned: '自签证书',
ca: '证书颁发机构',
createCA: '创建机构',
commonName: '证书主体名称(CN)',
caName: '机构名称',
company: '公/组织',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
:label="$t('container.source')"
show-overflow-tooltip
prop="resource"
min-width="100"
min-width="120"
>
<template #default="{ row }">
<div v-if="row.hasLoad">
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/container/image/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
>
<template #default="{ row }">
<el-tag
style="margin-left: 5px"
class="ml-2.5"
v-for="(item, index) of row.tags"
:key="index"
:title="item"
Expand All @@ -78,7 +78,7 @@
:formatter="dateFormat"
/>
<fu-table-operations
width="200px"
width="250px"
:ellipsis="10"
:buttons="buttons"
:label="$t('commons.table.operate')"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/cronjob/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<el-row>
<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('commons.button.create') }}{{ $t('cronjob.cronTask') }}
{{ $t('commons.button.create') }} {{ $t('cronjob.cronTask') }}
</el-button>
<el-button-group class="ml-4">
<el-button plain :disabled="selects.length === 0" @click="onBatchChangeStatus('enable')">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/database/mysql/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
</el-card>
</div>
<LayoutContent :title="(currentDB?.type === 'mysql' ? 'MySQL ' : 'MariaDB ') + $t('menu.database')">
<LayoutContent :title="currentDB?.type === 'mysql' ? 'MySQL ' : 'MariaDB '">
<template #app v-if="currentDB?.from === 'local'">
<AppStatus
:app-key="appKey"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/database/postgresql/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
</el-card>
</div>
<LayoutContent :title="'PostgreSQL ' + $t('menu.database')">
<LayoutContent :title="'PostgreSQL'">
<template #app v-if="currentDB?.from === 'local'">
<AppStatus
:app-key="appKey"
Expand Down
1 change: 1 addition & 0 deletions frontend/src/views/host/file-management/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@
:label="$t('commons.table.operate')"
:min-width="mobile ? 'auto' : 200"
:fixed="mobile ? false : 'right'"
width="300"
fix
/>
</ComplexTable>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/firewall/forward/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<el-row>
<el-col :span="16">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('commons.button.create') }}{{ $t('firewall.forwardRule') }}
{{ $t('commons.button.create') }} {{ $t('firewall.forwardRule') }}
</el-button>
<el-button @click="onDelete(null)" plain :disabled="selects.length === 0">
{{ $t('commons.button.delete') }}
Expand Down
10 changes: 2 additions & 8 deletions frontend/src/views/host/firewall/port/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@
<el-option :label="$t('firewall.unUsed')" value="free"></el-option>
<el-option :label="$t('firewall.used')" value="used"></el-option>
</el-select>
<el-select
v-model="searchStrategy"
style="margin-left: 10px"
@change="search()"
clearable
class="p-w-200"
>
<el-select v-model="searchStrategy" @change="search()" clearable class="p-w-200 ml-2.5">
<template #prefix>{{ $t('firewall.strategy') }}</template>
<el-option :label="$t('commons.table.all')" value=""></el-option>
<el-option :label="$t('firewall.accept')" value="accept"></el-option>
Expand All @@ -61,7 +55,7 @@
<el-row>
<el-col :span="16">
<el-button type="primary" @click="onOpenDialog('create')">
{{ $t('commons.button.create') }}{{ $t('firewall.portRule') }}
{{ $t('commons.button.create') }} {{ $t('firewall.portRule') }}
</el-button>
<el-button @click="onDelete(null)" plain :disabled="selects.length === 0">
{{ $t('commons.button.delete') }}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/host/terminal/command/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</template>
<template #toolbar>
<el-button type="primary" @click="onCreate()">
{{ $t('commons.button.create') }}{{ $t('terminal.quickCommand') }}
{{ $t('commons.button.create') }} {{ $t('terminal.quickCommand') }}
</el-button>
<el-button type="primary" plain @click="onOpenGroupDialog()">
{{ $t('terminal.group') }}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/node/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
/>
<fu-table-operations
:ellipsis="10"
width="300px"
width="350px"
:buttons="buttons"
:label="$t('commons.table.operate')"
fixed="right"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="open"
:title="$t('website.addAccount')"
:title="$t('commons.button.create')"
:close-on-click-modal="false"
width="30%"
:before-close="handleClose"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/ssl/acme-account/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()" v-loading="loading">
<template #toolbar>
<el-button type="primary" @click="openCreate">{{ $t('website.addAccount') }}</el-button>
<el-button type="primary" @click="openCreate">{{ $t('commons.button.create') }}</el-button>
</template>
<el-table-column
:label="$t('website.email')"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/ssl/ca/create/index.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="open"
:title="$t('ssl.createCA')"
:title="$t('commons.button.create')"
:close-on-click-modal="false"
width="40%"
:before-close="handleClose"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/ssl/ca/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>
<ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()" v-loading="loading">
<template #toolbar>
<el-button type="primary" @click="openCreate">{{ $t('ssl.createCA') }}</el-button>
<el-button type="primary" @click="openCreate">{{ $t('commons.button.create') }}</el-button>
</template>
<el-table-column :label="$t('commons.table.name')" show-overflow-tooltip prop="name"></el-table-column>
<el-table-column :label="$t('website.keyType')" show-overflow-tooltip prop="keyType">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-dialog
v-model="open"
:title="$t('website.addAccount')"
:title="$t('commons.button.create')"
:destroy-on-close="true"
:close-on-click-modal="false"
width="40%"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/ssl/dns-account/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ComplexTable :data="data" :pagination-config="paginationConfig" @search="search()">
<template #toolbar>
<el-button type="primary" @click="openCreate">
{{ $t('website.addAccount') }}
{{ $t('commons.button.create') }}
</el-button>
</template>
<el-table-column :label="$t('commons.table.name')" fix show-overflow-tooltip prop="name"></el-table-column>
Expand Down
12 changes: 4 additions & 8 deletions frontend/src/views/website/ssl/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@
show-overflow-tooltip
prop="domains"
></el-table-column>
<el-table-column
:label="$t('ssl.applyType')"
fix
show-overflow-tooltip
prop="provider"
width="100px"
>
<el-table-column :label="$t('ssl.applyType')" fix show-overflow-tooltip prop="provider">
<template #default="{ row }">{{ getProvider(row.provider) }}</template>
</el-table-column>
<el-table-column
Expand Down Expand Up @@ -114,7 +108,7 @@
</fu-read-write-switch>
</template>
</el-table-column>
<el-table-column :label="$t('ssl.autoRenew')" fix width="100px">
<el-table-column :label="$t('ssl.autoRenew')" fix>
<template #default="{ row }">
<el-switch
:disabled="row.provider === 'dnsManual' || row.provider === 'manual'"
Expand All @@ -128,12 +122,14 @@
:label="$t('website.expireDate')"
:formatter="dateFormat"
show-overflow-tooltip
width="200px"
/>
<fu-table-operations
:ellipsis="3"
:buttons="buttons"
:label="$t('commons.table.operate')"
:fixed="mobile ? false : 'right'"
width="300px"
fix
/>
</ComplexTable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
:before-close="handleClose"
>
<template #header>
<DrawerHeader
:header="$t('commons.button.' + authBasic.operate) + $t('website.basicAuth')"
:back="handleClose"
/>
<DrawerHeader :header="$t('commons.button.' + authBasic.operate)" :back="handleClose" />
</template>
<el-row v-loading="loading">
<el-col :span="22" :offset="1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ComplexTable :data="data" @search="search" v-loading="loading">
<template #toolbar>
<el-button type="primary" plain @click="openCreate">
{{ $t('commons.button.create') + $t('website.basicAuth') }}
{{ $t('commons.button.create') }}
</el-button>
</template>
<el-table-column :label="$t('commons.login.username')" prop="username"></el-table-column>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</el-select>
</el-form-item>
<el-form-item :label="'HSTS'" prop="hsts">
<el-checkbox v-model="form.hsts">{{ $t('commons.button.start') }}</el-checkbox>
<el-checkbox v-model="form.hsts">{{ $t('commons.button.enable') }}</el-checkbox>
<span class="input-help">{{ $t('website.hstsHelper') }}</span>
</el-form-item>
<el-form-item :label="$t('website.sslConfig')" prop="type">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:before-close="handleClose"
>
<template #header>
<DrawerHeader :header="$t('website.' + proxy.operate + 'Proxy')" :back="handleClose" />
<DrawerHeader :header="$t('commons.button.' + proxy.operate)" :back="handleClose" />
</template>
<el-row v-loading="loading">
<el-col :span="22" :offset="1">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ComplexTable :data="data" @search="search" v-loading="loading">
<template #toolbar>
<el-button type="primary" plain @click="openCreate">{{ $t('website.createProxy') }}</el-button>
<el-button type="primary" plain @click="openCreate">{{ $t('commons.button.create') }}</el-button>
</template>
<el-table-column :label="$t('commons.table.name')" prop="name"></el-table-column>
<el-table-column :label="$t('website.proxyPath')" prop="match"></el-table-column>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
:before-close="handleClose"
>
<template #header>
<DrawerHeader
:header="$t('commons.button.' + redirect.operate) + $t('website.redirect')"
:back="handleClose"
/>
<DrawerHeader :header="$t('commons.button.' + redirect.operate)" :back="handleClose" />
</template>
<el-row v-loading="loading">
<el-col :span="22" :offset="1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ComplexTable :data="data" @search="search" v-loading="loading">
<template #toolbar>
<el-button type="primary" plain @click="openCreate">
{{ $t('commons.button.create') + $t('website.redirect') }}
{{ $t('commons.button.create') }}
</el-button>
</template>
<el-table-column :label="$t('commons.table.name')" prop="name" min-width="60px" show-overflow-tooltip />
Expand Down

0 comments on commit 838b327

Please sign in to comment.