Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Forwardport] Fix for #12081: missing translations in the js-translations.json #15

Merged
merged 79 commits into from
Oct 1, 2019

Conversation

sanganinamrata
Copy link
Owner

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)

  1. Magento 2.2.0: Translations for 'Item in Cart' missing in mini cart. magento/magento2#12081: Magento 2.2.0: Translations for 'Item in Cart' missing in mini cart.

Manual testing scenarios

  1. Clean Magento installation with a translation file translating the string "Item in Cart" from Magento_Checkout.
  2. Run setup:static-content:deploy
  3. Without the fix, the string isn't in the generated js-translations.json file. With the fix it will be.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Oleksandr Gorkun and others added 30 commits May 21, 2018 14:25
… 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

- Fixed code review feedback
…by attributes of child products

 - Account for pagebuilder description
…anged website scope

- Add some waitForPageLoads to make test more robust
… 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
Dmytro Voskoboinikov and others added 29 commits July 5, 2018 19:43
…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
@sanganinamrata sanganinamrata merged this pull request into 2.3-develop Oct 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants