Update localization plugin to support expressions #654
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
1ec5
reviewed
Sep 7, 2018
| String text = textFieldExpression.toString().replaceAll(EXPRESSION_REGEX, mapLocale.getMapLanguage()); | ||
| if (text.startsWith("[\"step") && textFieldExpression.toArray().length % 2 == 0) { | ||
| // got an invalid step expression from core, we need to add an additional name_x into step | ||
| text = text.replaceAll(STEP_REGEX, String.format(STEP_TEMPLATE, mapLocale.getMapLanguage())); |
There was a problem hiding this comment.
Yep, we’re doing this on iOS/macOS too when converting JSON expressions to NSExpressions:
langsmith
approved these changes
Sep 10, 2018
tobrun
force-pushed
the
tvn-upgrade-local-to-expressions
branch
from
1db7e50 to
bf53ce7
Compare
tobrun
force-pushed
the
tvn-upgrade-local-to-expressions
branch
from
bf53ce7 to
e03584f
Compare
12 tasks
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.
This PR updates our localization plugin to support expressions (also backwards compatible with our old token syntax setup). Atm it requires a beta.1 build of the Mapbox Maps SDK for Android, as it requires mapbox/mapbox-gl-native#12769 and mapbox/mapbox-gl-native#12768 to be fixed upstream. We will have to hold off merging and releasing this plugin until 6.5.0 final has been released, eta 1 week.
One issue I had with migration is that some step expression returned from core contain an invalid representation. On this line I'm fixing this up by introducing an additional 0 stop output based on the current locale. This fix will not break if the issue is fixed upstream though would love to remove it at some point.