From 48a38156f7ea70468de5a14e0cf609d02c69022f Mon Sep 17 00:00:00 2001 From: lejianwen <84855512@qq.com> Date: Thu, 8 May 2025 11:11:13 +0800 Subject: [PATCH] fix: i18n (lejianwen/rustdesk-api#222) --- src/components/changePwdDialog.vue | 22 +++++++++++----------- src/utils/i18n/en.json | 11 ++++++++++- src/utils/i18n/es.json | 9 +++++++++ src/utils/i18n/fr.json | 9 +++++++++ src/utils/i18n/ko.json | 9 +++++++++ src/utils/i18n/ru.json | 9 +++++++++ src/utils/i18n/zh_CN.json | 3 +++ src/utils/i18n/zh_TW.json | 3 +++ 8 files changed, 63 insertions(+), 12 deletions(-) diff --git a/src/components/changePwdDialog.vue b/src/components/changePwdDialog.vue index 059710a..0c9bf83 100644 --- a/src/components/changePwdDialog.vue +++ b/src/components/changePwdDialog.vue @@ -52,14 +52,14 @@ new_password: '', confirmPwd: '', }) - const chagePwdRules = reactive({ - old_password: [{ required: true, message: '请输入旧密码', trigger: 'blur' }], + const chagePwdRules = computed(_ => ({ + old_password: [{ required: true, message: T('ParamRequired', { param: T('OldPassword') }), trigger: 'blur' }], new_password: [ - { required: true, message: '请输入新密码', trigger: 'blur' }, + { required: true, message: T('ParamRequired', { param: T('NewPassword') }), trigger: 'blur' }, { validator: (rule, value, callback) => { if (value === changePwdForm.old_password) { - callback(new Error('新密码不能与旧密码相同')) + callback(new Error(T('NewPasswordEqualOldPassword'))) //'新密码不能与旧密码相同' } else { callback() } @@ -67,11 +67,11 @@ trigger: 'blur', }], confirmPwd: [ - { required: true, message: '请再次输入新密码', trigger: 'blur' }, + { required: true, message: T('ParamRequired', { param: T('ConfirmPassword') }), trigger: 'blur' }, { validator: (rule, value, callback) => { if (value !== changePwdForm.new_password) { - callback(new Error('两次输入密码不一致')) + callback(new Error(T('PasswordNotMatchConfirmPassword'))) } else { callback() } @@ -79,7 +79,7 @@ trigger: 'blur', }, ], - }) + })) const cpwd = ref(null) const cancelChangePwd = () => { emit('update:visible', false) @@ -94,9 +94,9 @@ return } console.log('changePassword') - const confirm = await ElMessageBox.confirm('确定修改密码么？', { - confirmButtonText: '确定', - cancelButtonText: '取消', + const confirm = await ElMessageBox.confirm(T('Confirm?', { param: T('ChangePassword') }), { + confirmButtonText: T('Confirm'), + cancelButtonText: T('Cancel'), }).catch(_ => false) if (!confirm) { return @@ -105,7 +105,7 @@ if (!res) { return } - ElMessageBox.alert('修改成功', '修改密码', { + ElMessageBox.alert(T('OperationSuccess'), T('ChangePassword'), { autofocus: true, confirmButtonText: 'OK', callback: (action) => { diff --git a/src/utils/i18n/en.json b/src/utils/i18n/en.json index 95f78aa..b90cd9e 100644 --- a/src/utils/i18n/en.json +++ b/src/utils/i18n/en.json @@ -439,6 +439,15 @@ "LastOnlineIp": { "One": "Last Online Ip" }, + "OldPassword": { + "One": "Old Password" + }, + "NewPasswordEqualOldPassword": { + "One": "New Password cannot be the same as Old Password" + }, + "NewPassword": { + "One": "New Password" + }, "ConfirmPassword": { "One": "Confirm Password" }, @@ -518,6 +527,6 @@ "One": "Columns" }, "You can reference export file": { - "One": "You can reference export file" + "One": "You can reference export file" } } diff --git a/src/utils/i18n/es.json b/src/utils/i18n/es.json index d7dfbef..076a433 100644 --- a/src/utils/i18n/es.json +++ b/src/utils/i18n/es.json @@ -439,6 +439,15 @@ "LastOnlineIp": { "One": "Última IP en línea" }, + "OldPassword": { + "One": "Contraseña antigua" + }, + "NewPasswordEqualOldPassword": { + "One": "La nueva contraseña no puede ser igual a la antigua" + }, + "NewPassword": { + "One": "Nueva contraseña" + }, "ConfirmPassword": { "One": "Confirmar contraseña" }, diff --git a/src/utils/i18n/fr.json b/src/utils/i18n/fr.json index 2301e40..b05f71c 100644 --- a/src/utils/i18n/fr.json +++ b/src/utils/i18n/fr.json @@ -439,6 +439,15 @@ "LastOnlineIp": { "One": "Dernière adresse IP en ligne" }, + "OldPassword": { + "One": "Ancien mot de passe" + }, + "NewPasswordEqualOldPassword": { + "One": "Le nouveau mot de passe est identique à l'ancien mot de passe" + }, + "NewPassword": { + "One": "Nouveau mot de passe" + }, "ConfirmPassword": { "One": "Confirmer le mot de passe" }, diff --git a/src/utils/i18n/ko.json b/src/utils/i18n/ko.json index bd78447..f2fbfe3 100644 --- a/src/utils/i18n/ko.json +++ b/src/utils/i18n/ko.json @@ -425,6 +425,15 @@ "LastOnlineIp": { "One": "마지막 온라인 IP" }, + "OldPassword": { + "One": "이전 비밀번호" + }, + "NewPasswordEqualOldPassword": { + "One": "새 비밀번호는 이전 비밀번호와 같을 수 없습니다" + }, + "NewPassword": { + "One": "새 비밀번호" + }, "ConfirmPassword": { "One": "비밀번호 확인" }, diff --git a/src/utils/i18n/ru.json b/src/utils/i18n/ru.json index cb5cad9..de8fc6b 100644 --- a/src/utils/i18n/ru.json +++ b/src/utils/i18n/ru.json @@ -439,6 +439,15 @@ "LastOnlineIp": { "One": "Последний IP онлайн" }, + "OldPassword": { + "One": "Старый пароль" + }, + "NewPasswordEqualOldPassword": { + "One": "Новый пароль совпадает со старым паролем" + }, + "NewPassword": { + "One": "Новый пароль" + }, "ConfirmPassword": { "One": "Подтвердите пароль" }, diff --git a/src/utils/i18n/zh_CN.json b/src/utils/i18n/zh_CN.json index 41f699c..5729116 100644 --- a/src/utils/i18n/zh_CN.json +++ b/src/utils/i18n/zh_CN.json @@ -446,6 +446,9 @@ "NewPassword": { "One": "新密码" }, + "NewPasswordEqualOldPassword": { + "One": "New Password cannot be the same as Old Password" + }, "ConfirmPassword": { "One": "确认密码" }, diff --git a/src/utils/i18n/zh_TW.json b/src/utils/i18n/zh_TW.json index 9f4592f..63b2150 100644 --- a/src/utils/i18n/zh_TW.json +++ b/src/utils/i18n/zh_TW.json @@ -446,6 +446,9 @@ "NewPassword": { "One": "新密碼" }, + "NewPasswordEqualOldPassword": { + "One": "新密碼不能與舊密碼相同" + }, "ConfirmPassword": { "One": "確認密碼" },