upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #27913 from nextcloud/fix/26113/stable20-dashboard-escaped-display-name

Browse source 
[stable20] Do not escape display name in dashboard welcome text
This commit is contained in:
Julius Härtl 2021-07-14 21:42:33 +02:00 committed by GitHub
commit 970e5d6d65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dashboard/js/dashboard.js
View file

File diff suppressed because one or more lines are too long

2
apps/dashboard/js/dashboard.js.map
View file

File diff suppressed because one or more lines are too long

8
apps/dashboard/src/App.vue
View file

@ -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