[Forwardport] Fix for #12081: missing translations in the js-translations.json#15
Merged
sanganinamrata merged 79 commits into2.3-developfrom Oct 1, 2019
Merged
Conversation
… using match by products rule - clone category IDs MC-2269: [Visual Merchandiser] Admin should be able to assign products using match by products rule - sku equal MC-2270: [Visual Merchandiser] Admin should be able to assign products using match by products rule - name contains MC-2275: [Visual Merchandiser] Admin should be able to assign products using match by products rule - price and quantity - added mftf tests (cherry picked from commit c1a53ac)
… a percentage of original (for simple product) - Includes MC-60, MC-69, and MC-93
… a percentage of original (for simple product) - Reindex for ee stability
… a percentage of original (for simple product) - Flush cache after reindexing
…roduct position in the category by editing Position field in grid mode - move in the middle within same page - added mftf tests
…rt without selecting options
…rt without selecting options - Fixed code review feedback
…by attributes of child products
…y products list and grid views
…by attributes of child products - Account for pagebuilder description
…by attributes of child products
…by attributes of child products
…by attributes of child products
…y products list and grid views
…anged website scope - Add some waitForPageLoads to make test more robust
- Fix flaky failure
…ore Views - Fix flaky failures
…y products list and grid views
… a percentage of original (for simple product) - Delete unecessary CLI commands. Affects MC-60, MC-65, MC-69, and MC-93
…y products list and grid views - Re-add composer.lock file that was accidentally deleted
… website scope - Fixed bad merge
…by attributes of child products - Adjust based on feedback
…imple Products are a combination of 'Out of Stock' and deleted
…product position in the category by editing Position field in grid mode - move to 1st within same page MC-2355: [Visual Merchandiser] Admin should be able to move assigned product position in the category by editing Position field in grid mode - move to last within same page - added mftf tests
…ng Cart for Logged in Customer with Default Address - Added some waitForPageLoads to make more robust
- Add waitForPageLoad to fix flakiness
Fixed issues: - MAGETWO-88600: Error while saving Theme design configuration - MAGETWO-88642: Sort Order Field Values
[pangolin] Weekly RE-develop functional tests
…ependencies [borg] MC-2338: 3rd party library/dependency upgrade for 2.3 pre Alpha
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
9 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.
Original Pull Request
magento#13528
Description
This PR adds an additional pattern to the module responsible for generating the js-translations.json file. The translation routine doesn't translate strings in tags like
<translate args="This won't be translated".This is related to (but doesn't fix) magento#13471 where the Html parser of the phrase collection module is also missing a pattern matching the
<translate args=tags.Fixed Issues (if relevant)
Manual testing scenarios
Contribution checklist