Browse Source

Fix dashboard greetings that show 'good morning' after noon

Updated dashboard greetings to show "Good afternoon" after 12:00 instead of 13:00.

Updated time periods for greetings:
- Morning: 5:00 to 11.59
- Afternoon: 12:00 to 17.59
- Evening: 18:00 to 21:59
- Night: 22:00 to 4.59

Updated night-time greeting to "Hello" as "Good night" is a kind of goodbye.

Closes #24938.

Signed-off-by: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
tags/v21.0.0beta5
Nina Pypchenko 3 years ago
parent
commit
98299d9c29
3 changed files with 36 additions and 11 deletions
  1. 1
    1
      apps/dashboard/js/dashboard.js
  2. 1
    1
      apps/dashboard/js/dashboard.js.map
  3. 34
    9
      apps/dashboard/src/App.vue

+ 1
- 1
apps/dashboard/js/dashboard.js
File diff suppressed because it is too large
View File


+ 1
- 1
apps/dashboard/js/dashboard.js.map
File diff suppressed because it is too large
View File


+ 34
- 9
apps/dashboard/src/App.vue View File

@@ -163,18 +163,43 @@ export default {
},
greeting() {
const time = this.timer.getHours()
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') }
}
if (time > 12) {
return { text: shouldShowName ? t('dashboard', 'Good afternoon, {name}', { name: this.displayName }) : t('dashboard', 'Good afternoon') }
// Determine part of the day
let partOfDay
if (time >= 22 && time < 5) {
partOfDay = 'night'
} else if (time >= 18) {
partOfDay = 'evening'
} else if (time >= 12) {
partOfDay = 'afternoon'
} else {
partOfDay = 'morning'
}
if (time > 5) {
return { text: shouldShowName ? t('dashboard', 'Good morning, {name}', { name: this.displayName }) : t('dashboard', 'Good morning') }

// Define the greetings
const good = {
morning: {
generic: t('dashboard', 'Good morning'),
withName: t('dashboard', 'Good morning, {name}', { name: this.displayName }),
},
afternoon: {
generic: t('dashboard', 'Good afternoon'),
withName: t('dashboard', 'Good afternoon, {name}', { name: this.displayName }),
},
evening: {
generic: t('dashboard', 'Good evening'),
withName: t('dashboard', 'Good evening, {name}', { name: this.displayName }),
},
night: {
// Don't use "Good night" as it's not a greeting
generic: t('dashboard', 'Hello'),
withName: t('dashboard', 'Hello, {name}', { name: this.displayName }),
},
}
return { text: shouldShowName ? t('dashboard', 'Good night, {name}', { name: this.displayName }) : t('dashboard', 'Good night') }

// Figure out which greeting to show
const shouldShowName = this.displayName && this.uid !== this.displayName
return { text: shouldShowName ? good[partOfDay].withName : good[partOfDay].generic }
},
isActive() {
return (panel) => this.layout.indexOf(panel.id) > -1

Loading…
Cancel
Save