fix: return English descriptions for Locale.ENGLISH regardless of def…#1304
Open
derTobsch wants to merge 3 commits into
Open
fix: return English descriptions for Locale.ENGLISH regardless of def…#1304derTobsch wants to merge 3 commits into
derTobsch wants to merge 3 commits into
Conversation
…ault locale ResourceBundle.getBundle() falls back to Locale.getDefault() before the base bundle when the requested locale has no dedicated resource file. Since there is no country_descriptions_en.properties (the base .properties holds English text), requesting Locale.ENGLISH on a system with a German/French default locale would return German/French descriptions instead of English ones. The fix temporarily sets the thread default locale to Locale.ROOT during getBundle() calls, forcing ResourceBundle to skip the default-locale fallback and go directly to the base bundle. The original default locale is restored in a finally block, ensuring thread safety. closes #1294
derTobsch
force-pushed
the
1294-fallback-to-eng
branch
from
a4d6c57 to
c67cc17
Compare
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
Add tests for previously uncovered methods: - getCountryDescription(String) with various default locales - getHolidayDescription(String) with various default locales - getResource(String) for existing and nonexistent resources - getResource(String, boolean) searchOnlyInJar variant - UNDEFINED constant value closes #1294
|
| Locale.setDefault(Locale.FRANCE); | ||
|
|
||
| // Request English description for France | ||
| final String description = ResourceUtil.getCountryDescription(Locale.ENGLISH, "fr"); |
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
1 participant
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.
…ault locale
ResourceBundle.getBundle() falls back to Locale.getDefault() before the base bundle when the requested locale has no dedicated resource file. Since there is no country_descriptions_en.properties (the base .properties holds English text), requesting Locale.ENGLISH on a system with a German/French default locale would return German/French descriptions instead of English ones.
The fix temporarily sets the thread default locale to Locale.ROOT during getBundle() calls, forcing ResourceBundle to skip the default-locale fallback and go directly to the base bundle. The original default locale is restored in a finally block, ensuring thread safety.
closes #1294