From 054c67d5b9e5bf19ee76b0ff2354c2fa076e9a3f Mon Sep 17 00:00:00 2001
From: Steven Vandeputte <steven.vandeputte@studioemma.eu>
Date: Thu, 24 Mar 2016 17:05:36 +0100
Subject: [PATCH 1/2] Add support for placing the string to translate on
 another line then the one with the opening/closing brackets
 (mage_translation_widget)

---
 app/code/Magento/Translation/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index 7d2ec64b604d8..d575381bcbbb8 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -58,7 +58,7 @@
         <arguments>
             <argument name="patterns" xsi:type="array">
                 <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
-                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((['"])(.+?)\1\)~</item>
+                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((?s)[^'"]*?(['"])(.+?)\1(?s).*?\)~</item>
                 <item name="mage_translation_static" xsi:type="string">~\$t\((["'])(.+?)\1\)~</item>
             </argument>
         </arguments>

From 4086dfb892c4fa37fc301f0f0d3378da5aca72ef Mon Sep 17 00:00:00 2001
From: Steven Vandeputte <steven.vandeputte@studioemma.eu>
Date: Thu, 24 Mar 2016 17:06:29 +0100
Subject: [PATCH 2/2] Add support for placing the string to translate on
 another line then the one with the opening/closing brackets
 (mage_translation_static)

---
 app/code/Magento/Translation/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index d575381bcbbb8..7d5ad85103754 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -59,7 +59,7 @@
             <argument name="patterns" xsi:type="array">
                 <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
                 <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((?s)[^'"]*?(['"])(.+?)\1(?s).*?\)~</item>
-                <item name="mage_translation_static" xsi:type="string">~\$t\((["'])(.+?)\1\)~</item>
+                <item name="mage_translation_static" xsi:type="string">~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~</item>
             </argument>
         </arguments>
     </type>