Skip to content

Commit e41e74d

Browse files
authored
Refine English translation (#7232)
1 parent 0ef1a26 commit e41e74d

File tree

7 files changed

+102
-97
lines changed

7 files changed

+102
-97
lines changed

Diff for: backend/i18n/lang/en.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ErrApiConfigDisable: "This interface prohibits the use of API Interface calls: {
1616
#common
1717
ErrNameIsExist: "Name is already exist"
1818
ErrDemoEnvironment: "Demo server, prohibit this operation!"
19-
ErrCmdTimeout: "Command execution timed out"
19+
ErrCmdTimeout: "Command execution timed out!"
2020
ErrCmdIllegal: "The command contains illegal characters. Please modify and try again!"
2121
ErrPortExist: '{{ .port }} port is already occupied by {{ .type }} [{{ .name }}]'
2222
TYPE_APP: "Application"
@@ -34,13 +34,13 @@ ErrAppLimit: "App exceeds install limit"
3434
ErrAppRequired: "{{ .detail }} app is required"
3535
ErrNotInstall: "App not installed"
3636
ErrPortInOtherApp: "{{ .port }} port already in use by app {{ .apps }}"
37-
ErrDbUserNotValid: "Stock database, username and password do not match"
37+
ErrDbUserNotValid: "Stock database, username and password do not match!"
3838
ErrDockerComposeNotValid: "docker-compose file format error!"
3939
ErrUpdateBuWebsite: 'The application was updated successfully, but the modification of the website configuration file failed, please check the configuration!'
4040
Err1PanelNetworkFailed: 'Default container network creation failed! {{ .detail }}'
4141
ErrFileParse: 'Application docker-compose file parsing failed!'
4242
ErrInstallDirNotFound: 'installation directory does not exist'
43-
AppStoreIsUpToDate: 'The app store is already up to date'
43+
AppStoreIsUpToDate: 'Up to date'
4444
LocalAppVersionNull: 'The {{.name}} app is not synced to version! Could not add to application list'
4545
LocalAppVersionErr: '{{.name}} failed to sync version {{.version}}! {{.err}}'
4646
ErrFileNotFound: '{{.name}} file does not exist'
@@ -95,7 +95,7 @@ ErrAppDelete: 'Other Website use this App'
9595
ErrGroupIsUsed: 'The group is in use and cannot be deleted'
9696
ErrBackupMatch: 'the backup file does not match the current partial data of the website: {{ .detail}}'
9797
ErrBackupExist: 'the backup file corresponds to a portion of the original data that does not exist: {{ .detail}}'
98-
ErrPHPResource: 'The local runtime does not support switching'
98+
ErrPHPResource: 'The local runtime does not support switching!'
9999
ErrPathPermission: 'A folder with non-1000:1000 permissions was detected in the index directory, which may cause an Access denied error when accessing the website. Please click the save button above'
100100
ErrDomainIsUsed: "Domain is already used by website {{ .name }}"
101101
ErrDomainFormat: "{{ .name }} domain format error"
@@ -105,7 +105,7 @@ ErrImageNotExist: "Running environment {{.name}} image does not exist, please re
105105
#ssl
106106
ErrSSLCannotDelete: "The certificate {{ .name }} is being used by the website and cannot be removed"
107107
ErrAccountCannotDelete: "The certificate associated with the account cannot be deleted"
108-
ErrSSLApply: "The certificate continues to be signed successfully, but openresty reload fails, please check the configuration"
108+
ErrSSLApply: "The certificate continues to be signed successfully, but openresty reload fails, please check the configuration!"
109109
ErrEmailIsExist: 'Email is already exist'
110110
ErrSSLKeyNotFound: 'The private key file does not exist'
111111
ErrSSLCertificateNotFound: 'The certificate file does not exist'
@@ -147,10 +147,10 @@ ErrPortRules: "The number of ports does not match, please re-enter!"
147147
ErrPgImagePull: "Image pull timeout. Please configure image acceleration or manually pull the postgres:16.0-alpine image and try again"
148148

149149
#runtime
150-
ErrDirNotFound: "The build folder does not exist! Please check file integrity"
151-
ErrFileNotExist: "{{ .detail }} file does not exist! Please check source file integrity"
150+
ErrDirNotFound: "The build folder does not exist! Please check file integrity!"
151+
ErrFileNotExist: "{{ .detail }} file does not exist! Please check source file integrity!"
152152
ErrImageBuildErr: "Image build failed"
153-
ErrImageExist: "Image is already exist"
153+
ErrImageExist: "Image is already exist!"
154154
ErrDelWithWebsite: "The operating environment has been associated with a website and cannot be deleted"
155155
ErrRuntimeStart: "Failed to start"
156156
ErrPackageJsonNotFound: "package.json file does not exist"

Diff for: frontend/src/components/app-status/index.vue

+5-9
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,11 @@ const clear = () => {
189189
const onOperate = async (operation: string) => {
190190
em('update:maskShow', false);
191191
operateReq.operate = operation;
192-
ElMessageBox.confirm(
193-
i18n.global.t('app.operatorHelper', [i18n.global.t('app.' + operation)]),
194-
i18n.global.t('app.' + operation),
195-
{
196-
confirmButtonText: i18n.global.t('commons.button.confirm'),
197-
cancelButtonText: i18n.global.t('commons.button.cancel'),
198-
type: 'info',
199-
},
200-
)
192+
ElMessageBox.confirm(i18n.global.t(`app.${operation}OperatorHelper`), i18n.global.t('app.' + operation), {
193+
confirmButtonText: i18n.global.t('commons.button.confirm'),
194+
cancelButtonText: i18n.global.t('commons.button.cancel'),
195+
type: 'info',
196+
})
201197
.then(() => {
202198
em('update:maskShow', true);
203199
em('update:loading', true);

0 commit comments

Comments
 (0)