Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions apps/dashboard/src/DashboardApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -234,28 +234,28 @@ export default {
const good = {
morning: {
generic: t('dashboard', 'Good morning'),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, undefined, { escape: false }),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }, { escape: false }),
},

afternoon: {
generic: t('dashboard', 'Good afternoon'),
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, undefined, { escape: false }),
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }, { escape: false }),
},

evening: {
generic: t('dashboard', 'Good evening'),
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, undefined, { escape: false }),
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }, { 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 }, undefined, { escape: false }),
generic: t('dashboard', 'Hello') /* TRANSLATORS: Greeting to be used at night (in English there is no specific greeting, think of it like "good morning") */,
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }, { escape: false }) /* TRANSLATORS: Greeting to be used at night (in English there is no specific greeting, think of it like "Good morning, J. Doe" but at night) */,
},

birthday: {
generic: t('dashboard', 'Happy birthday 🥳🤩🎂🎉'),
withName: t('dashboard', 'Happy birthday, {name} 🥳🤩🎂🎉', { name: this.displayName }, undefined, { escape: false }),
withName: t('dashboard', 'Happy birthday, {name} 🥳🤩🎂🎉', { name: this.displayName }, { escape: false }),
},
}

Expand Down
1 change: 0 additions & 1 deletion dist/dashboard-dashboard-main-CiWxwGSm.chunk.css

This file was deleted.

1 change: 1 addition & 0 deletions dist/dashboard-dashboard-main-DBQeZOKy.chunk.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dashboard-main.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* extracted by css-entry-points-plugin */
@import './dashboard-dashboard-main-CiWxwGSm.chunk.css';
@import './dashboard-dashboard-main-DBQeZOKy.chunk.css';
@import './common-createElementId-DhjFt1I9-C_oBIsvc.chunk.css';
@import './common-logger-D3RVzcfQ-Ks0gkIDB.chunk.css';
@import './common-NcModal-DiDvgcU8-B-yi1OwC.chunk.css';
Expand Down
2 changes: 1 addition & 1 deletion dist/dashboard-main.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.mjs.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test('dashboard: only loads the data of enabled widgets', async ({ page, user })

const loaded = page.waitForResponse((r) => WIDGET_ITEMS_API.test(r.url()))
await page.goto('apps/dashboard')
await expect(page.getByRole('heading', { name: /Good (morning|afternoon|evening|night)/ })).toBeVisible()
await expect(page.getByRole('heading', { name: /(Good (morning|afternoon|evening)|Hello)/ })).toBeVisible()
await loaded

// Give any further (unwanted) widget request time to be fired …
Expand Down
Loading