MAGETWO-70599: Product Edit Page Can't Load

- Refactoring code and change regexp pattern;

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 ' + this.getTitle() + ' can\'t be initialized'));
+                        braintree.showError($t('Payment {title} can\'t be initialized').replace('{title}', this.getTitle()));
                         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 ' + this.getTitle() + ' can\'t be initialized.')
+                    message: $t('Payment {title} can\'t be initialized').replace('{title}', this.getTitle())
                 });
             }
         },

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

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

app/code/Magento/Translation/Model/Js/PreProcessor.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Translation\Model\Js;
 
 use Magento\Framework\App\AreaList;

app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php

@@ -3,13 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Translation\Test\Unit\Model\Js;
 
 use Magento\Translation\Model\Js\PreProcessor;
 use Magento\Translation\Model\Js\Config;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\TranslateInterface;
 
+/**
+ * Class with unit tests for PreProcessor
+ */
 class PreProcessorTest extends \PHPUnit\Framework\TestCase
 {
     /**

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

@@ -65,25 +65,12 @@
             <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)[^'"]*?(['"])(?P<translate>.+?)(?<!\\)\1(?s).*?\)~]]></item>
-                <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'")]*?(["'])(?P<translate>.+?)\1(?s).*?\)~]]></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="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>
     </type>
-    <virtualType name="embeddedJsConfig" type="Magento\Translation\Model\Js\Config">
-        <arguments>
-            <argument name="patterns" xsi:type="array">
-                <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'")]*?(['"])(?P<translate>.+?)(?<!\\)\1(?s).*?\)~]]></item>
-                <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'")]*?(["'])(?P<translate>.+?)\1(?s).*?\)~]]></item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Translation\Model\Js\PreProcessor">
-        <arguments>
-            <argument name="config" xsi:type="object">embeddedJsConfig</argument>
-        </arguments>
-    </type>
     <virtualType name="AssetPreProcessorPool">
         <arguments>
             <argument name="preprocessors" xsi:type="array">

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

@@ -125,22 +125,54 @@ public function contentForTranslateDataProvider()
                 <<<EOT
                 title: $.mage.__(
                     'Original value for Magento_Store module'
-                )
+                ),
 EOT
                 ,
                 <<<EOT
-                title: 'Translated value for Magento_Store module in en_AU'
+                title: 'Translated value for Magento_Store module in en_AU',
 EOT
             ],
             [
                 <<<EOT
                 title: \$t(
                     'Original value for Magento_Store module'
+                );
+EOT
+                ,
+                <<<EOT
+                title: 'Translated value for Magento_Store module in en_AU';
+EOT
+            ],
+            [
+                <<<EOT
+                $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
+EOT
+                ,
+                <<<EOT
+                $.mage.__('The maximum you may purchase is %1.').replace('%1', params.maxAllowed);
+EOT
+            ],
+            [
+                <<<EOT
+                \$t("text double quote");
+                \$t('text "some');
+                \$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
                 ,
                 <<<EOT
-                title: 'Translated value for Magento_Store module in en_AU'
+                'text double quote';
+                'text "some';
+                \$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
             ],
         ];