Skip to content

Commit d8b18dd

Browse files
author
Oleksii Korshenko
committed
Merge commit 'refs/pull/3892/head' of https://github.com/magento/magento2 into MAGETWO-52573
2 parents 135f967 + 4086dfb commit d8b18dd

File tree

1 file changed

+2
-2
lines changed
  • app/code/Magento/Translation/etc

1 file changed

+2
-2
lines changed

app/code/Magento/Translation/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<arguments>
5959
<argument name="patterns" xsi:type="array">
6060
<item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
61-
<item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((['"])(.+?)\1\)~</item>
62-
<item name="mage_translation_static" xsi:type="string">~\$t\((["'])(.+?)\1\)~</item>
61+
<item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((?s)[^'"]*?(['"])(.+?)\1(?s).*?\)~</item>
62+
<item name="mage_translation_static" xsi:type="string">~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~</item>
6363
</argument>
6464
</arguments>
6565
</type>

0 commit comments

Comments
 (0)