Merge pull request #27913 from nextcloud/fix/26113/stable20-dashboard…

…-escaped-display-name [stable20] Do not escape display name in dashboard welcome text
nextcloud · Jul 14, 2021 · 970e5d6 · 970e5d6
2 parents 707ee88 + 9e90542
commit 970e5d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
@@ -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