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

[Backport] Fix for #12081: missing translations in the js-translations.json #14

Merged
merged 23 commits into from
Jul 11, 2018

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)

scottsb and others added 23 commits July 3, 2018 05:51
…agento#16493

 - Merge Pull Request magento#16493 from gelanivishal/magento2:2.1-develop-PR-port-12314
 - Merged commits:
   1. e3e68e8
…nge to Transport variable event parameters magento#16601

 - Merge Pull Request magento#16601 from gwharton/magento2:2.1-develop-10210
 - Merged commits:
   1. 390fc2f
 - Merge Pull Request magento#16634 from sanganinamrata/magento2:2.1-develop-PR-port-16557
 - Merged commits:
   1. 10bf5b5
…idden by the loop magento#16643

 - Merge Pull Request magento#16643 from lfluvisotto/magento2:2.1-develop-PR-port-16143
 - Merged commits:
   1. 93d9b57
…popup class to let user click deeper than modals and reach to overlay's div in modal-wrapper div
…r-events rule to .modal-… magento#16665

 - Merge Pull Request magento#16665 from mageprince/magento2:2.1-develop-PR-port-15172
 - Merged commits:
   1. 4c53caf
…gento#16671

 - Merge Pull Request magento#16671 from mageprince/magento2:2.1-develop-PR-port-15791
 - Merged commits:
   1. 3f6105f
…nto#16667

 - Merge Pull Request magento#16667 from mageprince/magento2:2.1-develop-PR-port-16053
 - Merged commits:
   1. 31ecfe5
Accepted Public Pull Requests:
 - magento#16667: [Backport] Improve retrieval of first array element (by @mageprince)
 - magento#16671: [Backport] Removed unused class from forms less file. (by @mageprince)
 - magento#16665: [Backport] 7399-clickableOverlay-less-fix - added pointer-events rule to .modal-� (by @mageprince)
 - magento#16643: [Backport] Variable as a method parameter might be overridden by the loop (by @lfluvisotto)
 - magento#16601: [2.1-develop][BackPort] Fixed backwards incompatible change to Transport variable event parameters (by @gwharton)
 - magento#16634: [Backport] Updated SynonymGroup.xml (by @sanganinamrata)
 - magento#16493: [Backport] Prevent layout cache corruption in edge case (by @gelanivishal)


Fixed GitHub Issues:
 - magento#7399: Modal UI: clickableOverlay option doesn't work (reported by @thdoan) has been fixed in magento#16665 by @mageprince in 2.1-develop branch
   Related commits:
     1. 4c53caf

 - magento#10210: Transport variable can not be altered in email_invoice_set_template_vars_before Event (reported by @diybook) has been fixed in magento#16601 by @gwharton in 2.1-develop branch
   Related commits:
     1. 390fc2f
sanganinamrata pushed a commit that referenced this pull request Jul 11, 2018
…ot read property source_… #14 magento#15840

 - Merge Pull Request magento#15840 from chirag-wagento/magento2:2.2-develop-PR-port-14805
 - Merged commits:
   1. 7d2d8cc
sanganinamrata pushed a commit that referenced this pull request Jul 11, 2018
sanganinamrata pushed a commit that referenced this pull request Jul 11, 2018
Accepted Public Pull Requests:
 - magento#15539: FIX fo rissue magento#15510 - First PDF download / export after login (by @phoenix128)
 - magento#15791: Removed unused class from forms less file. (by @chirag-wagento)
 - magento#15795: Remove double semicolon from the style sheets. (by @namratachangani)
 - magento#15734: [Resolved : Styling <select> by changing less variables in Luma theme� (by @hitesh-wagento)
 - magento#15694: [Backport 2.2] Fix minor issues in ui export converter classes (by @dmytro-ch)
 - magento#12314: Prevent layout cache corruption in edge case (by @scottsb)
 - magento#15871: chore: remove unused less import (by @DanielRuf)
 - magento#15854: [Backport 2.2] Fixed return type hinting in DocBlocks for Wishlist module (by @rogyar)
 - magento#15840: [Backport] Fix for issue 911 found on MSI project - Cannot read property source_� #14 (by @chirag-wagento)
 - magento#15825: Fixed set template syntax issue (by @namratachangani)
 - magento#15789: Removed unnecessary css. (by @chirag-wagento)
 - magento#15782: [Backport 2.2]Fix translations (by @VitaliyBoyko)


Fixed GitHub Issues:
 - magento#15510: First PDF download / export after login (reported by @anthony-jullien) has been fixed in magento#15539 by @phoenix128 in 2.2-develop branch
   Related commits:
     1. 59e03c1

 - magento#15608: Styling <select> by changing less variables in Luma theme doesn't work as expected (reported by @denistrator) has been fixed in magento#15734 by @hitesh-wagento in 2.2-develop branch
   Related commits:
     1. 67778cd
@sanganinamrata sanganinamrata merged commit fbbedd1 into 2.1-develop Jul 11, 2018
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.

7 participants