Skip to content

Commit

Permalink
Merge pull request #27912 from nextcloud/fix/26113/dashboard-escaped-…
Browse files Browse the repository at this point in the history
…display-name

Do not escape display name in dashboard welcome text
  • Loading branch information
juliusknorr authored Jul 13, 2021
2 parents 6615cdb + 984f390 commit 2a0bd66
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions apps/dashboard/js/dashboard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/dashboard/js/dashboard.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions apps/dashboard/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,20 @@ export default {
const good = {
morning: {
generic: t('dashboard', 'Good morning'),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }),
},
afternoon: {
generic: t('dashboard', 'Good afternoon'),
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }),
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }),
},
evening: {
generic: t('dashboard', 'Good evening'),
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }),
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }),
},
night: {
// Don't use "Good night" as it's not a greeting
generic: t('dashboard', 'Hello'),
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }),
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }, undefined, { escape: false }),
},
}
Expand Down

0 comments on commit 2a0bd66

Please sign in to comment.