[3.x] Fix locale resource remapping with binary conversion on export #63629
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
dsnopek
force-pushed
the
fix-locale-remap-with-binary-resources-3.x
branch
from
9f7c04a
to
a6e08e4
Compare
akien-mga
added
the
cherrypick:3.5
dsnopek
force-pushed
the
fix-locale-remap-with-binary-resources-3.x
branch
from
a6e08e4
to
0cf4ba0
Compare
akien-mga
approved these changes
Aug 8, 2022
|
Thanks! |
|
Cherry-picked for 3.5.1. |
akien-mga
removed
the
cherrypick:3.5
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.
Fixes #63606
I have no idea if this is the right fix, but it works and seems to make sense. The previous
if (new_path == p_path) {seems to be checking if thepath_remaphad anything, so replacing that with anelseallows the .remap files to get used even when there was a locale remap.