Fix string extraction from block.json - #253
Merged
Merged
Conversation
…nore-domain is specified
2 tasks
swissspidy
approved these changes
Jun 10, 2021
schlessera
pushed a commit
that referenced
this pull request
Jan 6, 2022
Fix string extraction from block.json
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
3 participants
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.
The current logic in BlockExtractor stops processing the block.json file when
--ignore-domainis present, but the json file contains non-empty"textdomain"property. This PR adjusts the check to make sure that the strings are always extracted when--ignore-domainis set, regardless of thetextdomainpresence or value. The possible flows can be summarized as:--ignore-domainis set - always extract the strings.--domain=<value>is present and block.json has notextdomainor has"textdomain":null- extract the strings.--domain=<value>is present and block.json has matchingtextdomainvalue - extract the strings.--domain=<value>is present and block.json has no matchingtextdomainvalue - ignore the file.Fixes #252