fix: Correctly resolve resource bundle #22823
Merged
Conversation
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
jason-p-pickering
changed the base branch from
DHIS2-20731-locale
to
DHIS2-20731-languageTag
|
Base automatically changed from
DHIS2-20731-languageTag
to
DHIS2-20731-locale
January 22, 2026 10:02
jbee
added a commit
that referenced
this pull request
Jan 22, 2026
* feat: DHIS2 own locale class * chore: switch to DHIS2 Locale class * fix: failing tests, handle outdates codes * fix: mark region as nullable for more convinience as it is nullable * fix: unit tests * feat: Add script to locale controller (#22820) * Fix locale controller * Remove duplicative validation code * Add language tag to locales (#22822) * fix: Correctly resolve resource bundle (#22823) * Add language tag to locales * Fix resource bundle handling * Linting --------- Co-authored-by: Jason Pickering <[email protected]>
jbee
added a commit
that referenced
this pull request
Jan 22, 2026
* feat: DHIS2 own locale class * chore: switch to DHIS2 Locale class * fix: failing tests, handle outdates codes * fix: mark region as nullable for more convinience as it is nullable * fix: unit tests * feat: Add script to locale controller (#22820) * Fix locale controller * Remove duplicative validation code * Add language tag to locales (#22822) * fix: Correctly resolve resource bundle (#22823) * Add language tag to locales * Fix resource bundle handling * Linting --------- Co-authored-by: Jason Pickering <[email protected]>
jbee
added a commit
that referenced
this pull request
Jan 22, 2026
* feat: Use DHIS2 specific Locale class (#22819) * feat: DHIS2 own locale class * chore: switch to DHIS2 Locale class * fix: failing tests, handle outdates codes * fix: mark region as nullable for more convinience as it is nullable * fix: unit tests * feat: Add script to locale controller (#22820) * Fix locale controller * Remove duplicative validation code * Add language tag to locales (#22822) * fix: Correctly resolve resource bundle (#22823) * Add language tag to locales * Fix resource bundle handling * Linting --------- Co-authored-by: Jason Pickering <[email protected]> * fix: imports --------- Co-authored-by: Jason Pickering <[email protected]>
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.
Summary:
Updated resource bundle locale parsing to use
Locale.of(...)and made bundle lookup treat script as the Java variant so that more exotic translations likei18n_global_uz_UZ_Cyrl.propertiesresolves correctly. Added tests for Uzbek Cyrillic/Latin resource bundle resolution.