fix: support "week", "bi-week" and months in period translations #3269
Conversation
This file contains 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
|
🚀 Deployed on https://pr-3269--dhis2-maps.netlify.app |
BRaimbault
changed the title
kabaros
reviewed
Jun 26, 2024
| @@ -27,6 +27,15 @@ export const appQueries = { | |||
| key: SYSTEM_SETTINGS, | |||
| }, | |||
| }, | |||
| systemInfo: { | |||
There was a problem hiding this comment.
I think you can get the systemInfo using the useConfig hook - this would make use of the settings already in the provider rather than making an extra API call.
import { useConfig } from '@dhis2/app-runtime'
const { systemInfo } = useConfig()
const { calendar = 'gregory' } = systemInfoThere was a problem hiding this comment.
I get your point.
I find it a bit more intuitive to have both requests comming from the same place (calendar + locale).
Down the road we are going to implement the standard periods selector so this will have to change.
Unless you think it is definitely better to make this change now, I would argue in favor of keeping the current version.
kabaros
approved these changes
Jun 26, 2024
edoardo
approved these changes
Jun 26, 2024
dhis2-bot
added a commit
that referenced
this pull request
Jun 26, 2024
## [100.5.6](v100.5.5...v100.5.6) (2024-06-26) ### Bug Fixes * support "week", "bi-week" and months in period translations ([#3269](#3269)) ([977e075](977e075))
|
🎉 This PR is included in version 100.5.6 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of the fix for DHIS2-16904
Requires dhis2/analytics#1685
Key features
getFixedPeriodsOptionsByIdDescription
The actual fix is in @dhis2/multi-calendar-dates which is a dependency of analytics and it's used in the PeriodSelector component the analytics apps use.
See also the PR in analytics.
For maps-app, the locale and calendar specs where not passed to the @dhis2/analytics utility function, so this was implemented as well.
Note: this has not been implemented for selectors limited to years.
Screenshots
Translations don't work for week/bi-week:
-After:
Translations don't work for months: