MAGETWO-70599: Product Edit Page Can't Load

- Fix regexp and data for testing

Author: YuliyaLabudova

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/cc-form.js

@@ -78,7 +78,7 @@ define(
                      * @param {Object} response
                      */
                     onError: function (response) {
-                        braintree.showError($t('Payment {title} can\'t be initialized').replace('{title}', this.getTitle()));
+                        braintree.showError($t('Payment ' + this.getTitle() + ' can\'t be initialized'));
                         this.isPlaceOrderActionAllowed(true);
                         throw response.message;
                     },

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -428,7 +428,7 @@ define([
                 Braintree.checkout.paypal.initAuthFlow();
             } catch (e) {
                 this.messageContainer.addErrorMessage({
-                    message: $t('Payment {title} can\'t be initialized').replace('{title}', this.getTitle())
+                    message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
                 });
             }
         },

app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

@@ -171,7 +171,8 @@ define([
                     if (data.files.length > this.options.maxImageUploadCount) {
                         $('body').notification('clear').notification('add', {
                             error: true,
-                            message: $.mage.__('You can\'t upload more than {count} images in one time').replace('{count}', this.options.maxImageUploadCount),
+                            message: $.mage.__('You can\'t upload more than ' + this.options.maxImageUploadCount +
+                                ' images in one time'),
 
                             /**
                              * @param {*} message

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

@@ -65,8 +65,8 @@
             <argument name="patterns" xsi:type="array">
                 <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
-                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(?s)\)~]]></item>
-                <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)\s*(["'])(?<translate>[^']+(?!\s*\+\s*')+?)\1\s*(?s)\)~]]></item>
+                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?s)(?:\$|jQuery)\.mage\.__\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)\s*(?s)~]]></item>
+                <item name="mage_translation_static" xsi:type="string"><![CDATA[~(?s)\$t\(\s*(['"])(?<translate>.+?)(?<!\\)\1\s*(*SKIP)\)(?s)~]]></item>
                 <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>

dev/tests/integration/testsuite/Magento/Translation/Model/Js/PreProcessorTest.php

@@ -91,7 +91,7 @@ public function testProcess(string $content, string $translation)
     public function contentForTranslateDataProvider()
     {
         return [
-            [
+            'previousError' => [
                 'setTranslateProp = function (el, original) {
             var location = $(el).prop(\'tagName\').toLowerCase(),
                 translated = $.mage.__(original),
@@ -121,60 +121,49 @@ public function contentForTranslateDataProvider()
             setText(el, translationData.shown);
         },'
             ],
-            [
-                <<<EOT
+            'checkTranslationWithWhiteSpaces' => [
+                <<<i18n
                 title: $.mage.__(
                     'Original value for Magento_Store module'
                 ),
-EOT
-                ,
-                <<<EOT
-                title: 'Translated value for Magento_Store module in en_AU',
-EOT
-            ],
-            [
-                <<<EOT
                 title: \$t(
                     'Original value for Magento_Store module'
                 );
-EOT
+i18n
                 ,
-                <<<EOT
+                <<<i18n
+                title: 'Translated value for Magento_Store module in en_AU',
                 title: 'Translated value for Magento_Store module in en_AU';
-EOT
+i18n
             ],
-            [
-                <<<EOT
+            'checkTranslationWithReplace' => [
+                <<<i18n
                 $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
-EOT
+                \$t('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
+i18n
                 ,
-                <<<EOT
+                <<<i18n
+                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
                 'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
-EOT
+i18n
             ],
-            [
-                <<<EOT
-                \$t("text double quote");
-                \$t('text "some');
+            'checkAvoidingMatching' => [
+                <<<i18n
                 \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
-                \$t('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
                 \$t(
                     'Set unique country-state combinations within the same fixed product tax. ' +
                     'Verify the combinations and try again.'
                 )
-EOT
+i18n
                 ,
-                <<<EOT
-                'text double quote';
-                'text "some';
+                <<<i18n
                 \$t('Payment ' + this.getTitle() + ' can\'t be initialized')
-                'The maximum you may purchase is %1.'.replace('%1', params.maxAllowed);
                 \$t(
                     'Set unique country-state combinations within the same fixed product tax. ' +
                     'Verify the combinations and try again.'
                 )
-EOT
-            ],
+i18n
+            ]
         ];
     }
 }