Skip to content

Commit c71dbb8

Browse files
Julien Veyssiernpmbuildbot-nextcloud[bot]
authored andcommitted
refs #26113 do not escape display name in dashboard welcome text
Signed-off-by: Julien Veyssier <eneiluj@posteo.net> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
1 parent dd26b3f commit c71dbb8

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
@@ -164,15 +164,15 @@ export default {
164164
const shouldShowName = this.displayName && this.uid !== this.displayName
165165
166166
if (time > 18) {
167-
return { text: shouldShowName ? t('dashboard', 'Good evening, {name}', { name: this.displayName }) : t('dashboard', 'Good evening') }
167+
return { text: shouldShowName ? t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good evening') }
168168
}
169169
if (time > 12) {
170-
return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }) : t('dashboard', 'Good afternoon') }
170+
return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good afternoon') }
171171
}
172172
if (time > 5) {
173-
return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }) : t('dashboard', 'Good morning') }
173+
return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good morning') }
174174
}
175-
return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }) : t('dashboard', 'Good night') }
175+
return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }, undefined, { escape: false }) : t('dashboard', 'Good night') }
176176
},
177177
isActive() {
178178
return (panel) => this.layout.indexOf(panel.id) > -1

0 commit comments

Comments
 (0)