github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 20:42:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(国际化): 代码冲突

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-10-27 16:25:48 +08:00
parent 3b5b4a3bb9
commit b3a96336f9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/lang/en.js
View File

@ -2639,9 +2639,7 @@ export default {
log_resource_delete_tips: 'Delete related resources (irrecoverable after deletion)'
},
<<<<<<< pr@dev@fix_oidc_exit_error
app_group_delete_content: 'After deletion, all application templates in this category will also be deleted.'
},
logout: {
oidc_logout_error: 'OIDC failed to exit, do you continue to exit DataEase?',
cas_logout_error: 'The CAS service is abnormal, please contact the administrator!'

2
frontend/src/lang/tw.js
View File

@ -2640,7 +2640,7 @@ export default {
log_resource_delete_tips: '刪除相關資源（刪除後不可恢復）'
},
logout: {
oidc_logout_error: 'OIDC退出失敗，是否繼續退出DataEase？',
cas_logout_error: 'CAS服務異常，請聯系管理員！'