Backport of PR-10445 for Magento 2.1: Fix JS translation search #14349
Conversation
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
Don't only replace \' but also \" with ' and " (cherry picked from commit a150d24) Concatenate JS translations before translating them This enables support for $.mage.__("concatenating" + "strings"); (cherry picked from commit c79b583) +: put all regexes in cdata tags (cherry picked from commit f930471) Prevent translation string lookup from breaking on \' or \" with a negative lookbehind (cherry picked from commit 87d4ba4) Support $.mage.__('') as well as jQuery.mage.__('') (cherry picked from commit 5ae47df)
hostep
force-pushed
the
backport-pr-10445
branch
from
00f4ba7 to
893e4f2
Compare
hostep
changed the title
ihor-sviziev
approved these changes
Mar 24, 2018
|
Hi @ihor-sviziev, thank you for the review. |
magento-engcom-team
pushed a commit
that referenced
this pull request
Mar 26, 2018
magento-engcom-team
pushed a commit
that referenced
this pull request
Mar 26, 2018
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.
Don't only replace ' but also " with ' and "
(cherry picked from commit a150d24)
Concatenate JS translations before translating them
This enables support for $.mage.__("concatenating" + "strings");
(cherry picked from commit c79b583)
+: put all regexes in cdata tags
(cherry picked from commit f930471)
Prevent translation string lookup from breaking on ' or " with a negative lookbehind
(cherry picked from commit 87d4ba4)
Support $.mage.('') as well as jQuery.mage.('')
(cherry picked from commit 5ae47df)
Description
This is a backport of #10445 for Magento 2.1
Fixed Issues (if relevant)
Contribution checklist