Skip to content

Decode html chars in dashboard greeting translation #26245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
julien-nc wants to merge 1 commit into from
Closed

Decode html chars in dashboard greeting translation #26245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
decode user display name in dashboard greeting 
Signed-off-by: Julien Veyssier <[email protected]>
  • Loading branch information
Julien Veyssier committed Mar 22, 2021
commit 178f28fb781dd0f8cb82bca3702772c38eb635f2
7 changes: 6 additions & 1 deletion apps/dashboard/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export default {

// Figure out which greeting to show
const shouldShowName = this.displayName && this.uid !== this.displayName
return { text: shouldShowName ? good[partOfDay].withName : good[partOfDay].generic }
return { text: shouldShowName ? this.htmlDecode(good[partOfDay].withName) : good[partOfDay].generic }
},
isActive() {
return (panel) => this.layout.indexOf(panel.id) > -1
Expand Down Expand Up @@ -396,6 +396,11 @@ export default {
document.body.classList.remove('dashboard--scrolled')
}
},
htmlDecode(s) {
return s.replace(/&#(\d+);/g, (match, code) => {
Copy link
Member

@skjnldsv skjnldsv Mar 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we have a lib for it?
I would prefer not to have random pieces of code here and there?

https://www.npmjs.com/package/html-entities

server/package.json

Line 55 in 6b4cfc5

"escape-html": "^1.0.3",

html-entities seems a bit big, but we have to see what real size is being added to the webpack bundle?

return String.fromCharCode(code)
})
},
},
}
</script>
Expand Down