fix: strip any extensions that might be passed in with the locale [ANDR-14]#330
Merged
Rafal Niski (rafalniski) merged 2 commits intomasterfrom Nov 11, 2025
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes locale handling to strip Unicode extension tags (e.g., "-u-fw-sun-mu-celsius") that Android 14+ includes in locale strings. Contentful's API doesn't support these extensions, so they need to be removed while preserving the base locale code (language, script, and region).
- Added
stripExtensionsFromLocale()method to normalize locale strings by removing Unicode extensions - Updated
withLocale()to normalize locales before storing them - Added comprehensive test coverage for various locale formats including edge cases
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/main/java/com/contentful/java/cda/AbsQuery.java | Implements locale normalization by stripping Unicode extensions using -u- as the separator |
| src/test/java/com/contentful/java/cda/AbsQueryTest.java | Adds 11 test cases covering standard locales, Unicode extensions, edge cases, and locale format variations |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Collaborator
Rafal Niski (rafalniski)
left a comment
Rafal Niski (rafalniski)
left a comment
There was a problem hiding this comment.
Good work!
Rafal Niski (rafalniski)
approved these changes
Nov 11, 2025
Lisa White (whitelisab)
approved these changes
Nov 11, 2025
Rafal Niski (rafalniski)
deleted the
andr-14-strip-extensions-from-locale
branch
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
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.
No description provided.