center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1508 from dataease/pr@dev@fix_i18n

Browse Source 
fix: 翻译优化
This commit is contained in:
fit2cloud-chenyw 2021-12-23 16:05:46 +08:00 committed by GitHub
commit 4afe0f8fe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml
View File

@ -24,6 +24,7 @@
inner join panel_group g inner join panel_group g
on s.panel_group_id = g.id on s.panel_group_id = g.id
where where
g.mobile_layout = 1 and (
( s.target_id = #{userId} and s.type = 0 ) or ( s.target_id = #{userId} and s.type = 0 ) or
( s.target_id = #{deptId} and s.type = 2 ) or ( s.target_id = #{deptId} and s.type = 2 ) or
( s.target_id in ( s.target_id in
@ -31,6 +32,7 @@
#{roleId} #{roleId}
</foreach> </foreach>
and s.type = 1 ) and s.type = 1 )
)
order by s.create_time desc order by s.create_time desc
</select> </select>

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

@ -1278,8 +1278,8 @@ export default {
link_share_desc: 'After opening the link, anyone can access the dashboard through this link.', link_share_desc: 'After opening the link, anyone can access the dashboard through this link.',
share: 'Share', share: 'Share',
remove_share_confirm: 'Sure removel All share ?', remove_share_confirm: 'Sure removel All share ?',
share_in: 'Share in', share_in: 'Share With Me',
share_out: 'Share out', share_out: 'I Share',
who_share: 'Who share', who_share: 'Who share',
when_share: 'When share', when_share: 'When share',
share_to: 'Share to', share_to: 'Share to',
@ -1289,7 +1289,7 @@ export default {
datalist: 'Chart List', datalist: 'Chart List',
group: 'Catalogue', group: 'Catalogue',
panel: 'Dashboard', panel: 'Dashboard',
groupAdd: 'Create Catalogue', groupAdd: 'New Group',
panelAdd: 'Create Dashboard', panelAdd: 'Create Dashboard',
delete: 'Delete', delete: 'Delete',
move_to: 'Move', move_to: 'Move',
@ -1325,7 +1325,7 @@ export default {
create_public_links: 'Create public links', create_public_links: 'Create public links',
to_default: 'Save To Default', to_default: 'Save To Default',
to_default_panel: 'Save To Default Dashboard', to_default_panel: 'Save To Default Dashboard',
store: 'Store', store: 'Favorites',
save_to_panel: 'Save to template', save_to_panel: 'Save to template',
export_to_panel: 'Export to template', export_to_panel: 'Export to template',
export_to_pdf: 'Export to PDF', export_to_pdf: 'Export to PDF',