Fix dashboard greetings that show 'good morning' after noon#24970
Merged
julien-nc merged 1 commit intonextcloud:masterfrom Jan 5, 2021
nina-py:24938-dashboard-greetings-show-good-morning-after-noon
Merged
Fix dashboard greetings that show 'good morning' after noon#24970julien-nc merged 1 commit intonextcloud:masterfrom nina-py:24938-dashboard-greetings-show-good-morning-after-noon
julien-nc merged 1 commit intonextcloud:masterfrom
nina-py:24938-dashboard-greetings-show-good-morning-after-noon
Conversation
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>
juliusknorr
approved these changes
Jan 5, 2021
nina-py
deleted the
24938-dashboard-greetings-show-good-morning-after-noon
branch
Contributor
Author
|
Thank you for reviewing and merging this so quickly! |
graue70
reviewed
Jan 13, 2021
| 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) { |
There was a problem hiding this comment.
This should be a logical OR instead of AND.
julien-nc
pushed a commit
that referenced
this pull request
Jan 13, 2021
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Member
|
Thanks a lot for the fix @nina-py! If you would like to contribute more, we also have some community chat channels on our Nextcloud Talk instance, including specific channels e.g. for the Dashboard app and others. Let me know if you are interested and I can add you there. :) |
Contributor
Author
|
Hi @jancborchardt, my pleasure! Yes, I'd like to be added to the community chat - I've participated there as a guest. And thanks for the invite to the Nextcloud org - I'm definitely taking you up on that :). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updated dashboard greetings to show "Good afternoon" after 12:00 instead of 13:00.
Updated time periods for greetings:
Updated night-time greeting to "Hello" as "Good night" is a kind of goodbye.
Had a look at the history of that component and noted how it evolved over time. Decided to do a bit of a refactor to remove repetitive code; some code duplication is inevitable though as translation strings need to remain intact.
Closes #24938.
Signed-off-by: Nina Pypchenko 22447785+nina-py@users.noreply.github.com