Skip to content

Commit 9b2e983

Browse files
authored
Merge pull request #27943 from nextcloud/backport/27912/stable21
[stable21] Do not escape display name in dashboard welcome text
2 parents ba99042 + 5681a79 commit 9b2e983

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

apps/dashboard/js/dashboard.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/dashboard/js/dashboard.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/dashboard/src/App.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,20 @@ export default {
180180
const good = {
181181
morning: {
182182
generic: t('dashboard', 'Good morning'),
183-
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }),
183+
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }),
184184
},
185185
afternoon: {
186186
generic: t('dashboard', 'Good afternoon'),
187-
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }),
187+
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }),
188188
},
189189
evening: {
190190
generic: t('dashboard', 'Good evening'),
191-
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }),
191+
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }),
192192
},
193193
night: {
194194
// Don't use "Good night" as it's not a greeting
195195
generic: t('dashboard', 'Hello'),
196-
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }),
196+
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }, undefined, { escape: false }),
197197
},
198198
}
199199

0 commit comments

Comments
 (0)