Fix i18nTextCollector merge does not work with vendor modules #9720
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
|
This looks reasonable - is there any existing test coverage that could be modified so that this regression could not happen again (without a test failing)? |
|
Is this somehow related to #10179? |
|
Related easy PR to merge silverstripe/silverstripe-asset-admin#1249 |
emteknetnz
approved these changes
Jan 16, 2022
There was a problem hiding this comment.
Have tested locally, this works as intended
Note: the code when this PR was originally raised lacked /vendor/ where $masterFile was defined. This was since fixed here.
This PR is functionally the same as the existing code, just now it's less hardcoded
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.
While running the i18nTextCollector against a vendor-module - with merge option enabled - it won't merge with existing files due to a wrong module-path determination.
i18nTextCollector should use the ModuleLoader to determine the correct module-path.