Skip to content

[stable20] Do not escape display name in dashboard welcome text #27913

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

Merged
merged 1 commit into from
Jul 14, 2021
Merged

[stable20] Do not escape display name in dashboard welcome text #27913

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion apps/dashboard/js/dashboard.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/dashboard/js/dashboard.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions apps/dashboard/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ export default {
const shouldShowName = this.displayName && this.uid !== this.displayName

if (time > 18) {
return { text: shouldShowName ? t('dashboard', 'Good evening, {name}', { name: this.displayName }) : t('dashboard', 'Good evening') }
return { text: shouldShowName ? t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good evening') }
}
if (time > 12) {
return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }) : t('dashboard', 'Good afternoon') }
return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good afternoon') }
}
if (time > 5) {
return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }) : t('dashboard', 'Good morning') }
return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good morning') }
}
return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }) : t('dashboard', 'Good night') }
return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good night') }
},
isActive() {
return (panel) => this.layout.indexOf(panel.id) > -1
Expand Down