Merge remote-tracking branch 'chaika/MAGETWO-71591' into PR_in_2.1

Author: Oleksandr Dubovyk

app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

@@ -5,15 +5,16 @@
 define(
     [
         'jquery',
-        'Magento_Payment/js/view/payment/iframe'
+        'Magento_Payment/js/view/payment/iframe',
+        'mage/translate'
     ],
-    function ($, Component) {
+    function ($, Component, $t) {
         'use strict';
 
         return Component.extend({
             defaults: {
                 template: 'Magento_Authorizenet/payment/authorizenet-directpost',
-                timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
+                timeoutMessage: $t('Sorry, but something went wrong. Please contact the seller.')
             },
             placeOrderHandler: null,
             validateHandler: null,

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

@@ -12,6 +12,8 @@
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\TranslateInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\DesignInterface;
 
 /**
  * PreProcessor responsible for providing js translation dictionary
@@ -42,29 +44,38 @@ class PreProcessor implements PreProcessorInterface
      */
     protected $translate;
 
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
     /**
      * @param Config $config
      * @param DataProviderInterface $dataProvider
      * @param AreaList $areaList
      * @param TranslateInterface $translate
+     * @param DesignInterface|null $design
      */
     public function __construct(
         Config $config,
         DataProviderInterface $dataProvider,
         AreaList $areaList,
-        TranslateInterface $translate
+        TranslateInterface $translate,
+        DesignInterface $design = null
     ) {
         $this->config = $config;
         $this->dataProvider = $dataProvider;
         $this->areaList = $areaList;
         $this->translate = $translate;
+        $this->design = $design ?: ObjectManager::getInstance()->get(DesignInterface::class);
     }
 
     /**
      * Transform content and/or content type for the specified preprocessing chain object
      *
      * @param Chain $chain
      * @return void
+     * @throws \Exception
      */
     public function process(Chain $chain)
     {
@@ -77,7 +88,10 @@ public function process(Chain $chain)
             if ($context instanceof FallbackContext) {
                 $themePath = $context->getThemePath();
                 $areaCode = $context->getAreaCode();
-                $this->translate->setLocale($context->getLocale());
+                $this->design->setDesignTheme($themePath, $areaCode);
+                $this->translate
+                    ->setLocale($context->getLocale())
+                    ->loadData($areaCode);
             }
 
             $area = $this->areaList->getArea($areaCode);

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

@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Test\Unit\Model\Json;
 
 use Magento\Translation\Model\Js\Config;
@@ -36,17 +37,35 @@ class PreProcessorTest extends \PHPUnit_Framework_TestCase
      */
     protected $translateMock;
 
+    /**
+     * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $designMock;
+
     protected function setUp()
     {
         $this->configMock = $this->getMock('Magento\Translation\Model\Js\Config', [], [], '', false);
         $this->dataProviderMock = $this->getMock('Magento\Translation\Model\Js\DataProvider', [], [], '', false);
         $this->areaListMock = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
-        $this->translateMock = $this->getMockForAbstractClass('Magento\Framework\TranslateInterface');
+        $this->translateMock = $this->getMockBuilder(\Magento\Framework\Translate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->translateMock
+            ->expects($this->once())
+            ->method('setLocale')
+            ->willReturn($this->translateMock);
+
+        $this->designMock = $this->getMockBuilder(\Magento\Framework\View\DesignInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new PreProcessor(
             $this->configMock,
             $this->dataProviderMock,
             $this->areaListMock,
-            $this->translateMock
+            $this->translateMock,
+            $this->designMock
         );
     }
 
@@ -97,6 +116,16 @@ public function testGetData()
             ->method('setContentType')
             ->with('json');
 
+        $this->designMock
+            ->expects($this->once())
+            ->method('setDesignTheme')
+            ->with($themePath, $areaCode)
+            ->willReturn($this->translateMock);
+        $this->translateMock
+            ->expects($this->once())
+            ->method('loadData')
+            ->willReturn($this->translateMock);
+
         $this->model->process($chain);
     }
 }

dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php

@@ -18,7 +18,7 @@ protected function setUp()
         /** @var \Magento\Framework\View\FileSystem $viewFileSystem */
         $viewFileSystem = $this->getMock(
             'Magento\Framework\View\FileSystem',
-            ['getLocaleFileName', 'getDesignTheme'],
+            ['getLocaleFileName'],
             [],
             '',
             false
@@ -27,15 +27,16 @@ protected function setUp()
         $viewFileSystem->expects($this->any())
             ->method('getLocaleFileName')
             ->will(
-                $this->returnValue(dirname(__DIR__) . '/Theme/Model/_files/design/frontend/Test/default/i18n/en_US.csv')
+                $this->returnValue(
+                    dirname(__DIR__) . '/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv'
+                )
             );
 
         /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         $theme = $this->getMock('Magento\Framework\View\Design\ThemeInterface', []);
-        $theme->expects($this->any())->method('getId')->will($this->returnValue(10));
-
-        $viewFileSystem->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $theme->expects($this->once())->method('getThemePath')->will($this->returnValue('Magento/luma'));
 
+        /** @var \Magento\TestFramework\ObjectManager $objectManager */
         $objectManager = Bootstrap::getObjectManager();
         $objectManager->addSharedInstance($viewFileSystem, 'Magento\Framework\View\FileSystem');
 
@@ -67,7 +68,7 @@ protected function setUp()
             ]
         );
 
-        $designModel->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $designModel->expects($this->once())->method('getDesignTheme')->will($this->returnValue($theme));
 
         $objectManager->addSharedInstance($designModel, 'Magento\Theme\Model\View\Design\Proxy');
 
@@ -95,9 +96,34 @@ public function translateDataProvider()
     {
         return [
             ['', ''],
-            ['Text with different translation on different modules', 'Text translation that was last loaded'],
-            ['text_with_no_translation', 'text_with_no_translation'],
-            ['Design value to translate', 'Design translated value']
+            [
+                'Theme phrase will be translated',
+                'Theme phrase is translated',
+            ],
+            [
+                'Magento_Store module phrase will be translated',
+                'Magento_Store module translated phrase',
+            ],
+            [
+                'Magento_Catalog module phrase will be translated',
+                'Magento_Catalog module translated phrase',
+            ],
+            [
+                'Phrase in Magento_Store module that doesn\'t need translation',
+                'Phrase in Magento_Store module that doesn\'t need translation',
+            ],
+            [
+                'Phrase in Magento_Catalog module that doesn\'t need translation',
+                'Phrase in Magento_Catalog module that doesn\'t need translation',
+            ],
+            [
+                'Magento_Store module phrase will be override by theme translation',
+                'Magento_Store module phrase is override by theme translation',
+            ],
+            [
+                'Magento_Catalog module phrase will be override by theme translation',
+                'Magento_Catalog module phrase is override by theme translation',
+            ],
         ];
     }
 }

dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/Catalog/i18n/en_US.csv

@@ -2,3 +2,4 @@
 "Some non-translated value for Magento_Catalog","Translation for some value for Magento_Catalog"
 "Another non-translated value for Magento_Catalog","Translation for another value for Magento_Catalog"
 "Text with different translation on different modules","Text translation that was last loaded"
+"Magento_Catalog module phrase will be translated","Magento_Catalog module translated phrase"

dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/Store/i18n/en_US.csv

@@ -1,3 +1,4 @@
 "%s","%s"
 "Original value for Magento_Store module","Translated value for Magento_Store module"
 "Text with different translation on different modules","Text translation that was last loaded"
+"Magento_Store module phrase will be translated","Magento_Store module translated phrase"

dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv

@@ -0,0 +1,3 @@
+"Theme phrase will be translated","Theme phrase is translated"
+"Magento_Catalog module phrase will be override by theme translation","Magento_Catalog module phrase is override by theme translation"
+"Magento_Store module phrase will be override by theme translation","Magento_Store module phrase is override by theme translation"

lib/internal/Magento/Framework/Test/Unit/TranslateTest.php

@@ -104,27 +104,57 @@ protected function setUp()
      * @param string $area
      * @param bool $forceReload
      * @param array $cachedData
+     * @dataProvider dataProviderLoadDataCachedTranslation
+     */
+    public function testLoadDataCachedTranslation($area, $forceReload, $cachedData)
+    {
+        $this->expectsSetConfig('Magento/luma');
+        $this->cache->expects($this->once())
+            ->method('load')
+            ->will($this->returnValue(serialize($cachedData)));
+
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->will($this->returnValue('frontend'));
+
+        $this->translate->loadData($area, $forceReload);
+        $this->assertEquals($cachedData, $this->translate->getData());
+    }
+
+    public function dataProviderLoadDataCachedTranslation()
+    {
+        $cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
+        return [
+            ['adminhtml', false, $cachedData],
+            ['frontend', false, $cachedData],
+            [null, false, $cachedData],
+        ];
+    }
+
+    /**
+     * @param string $area
+     * @param bool $forceReload
      * @dataProvider dataProviderForTestLoadData
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function testLoadData($area, $forceReload, $cachedData)
+    public function testLoadData($area, $forceReload)
     {
-        $this->expectsSetConfig('themeId');
-
+        $this->expectsSetConfig('Magento/luma');
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->will($this->returnValue('frontend'));
         $this->cache->expects($this->exactly($forceReload ? 0 : 1))
             ->method('load')
-            ->will($this->returnValue(serialize($cachedData)));
-
-        if (!$forceReload && $cachedData !== false) {
-            $this->translate->loadData($area, $forceReload);
-            $this->assertEquals($cachedData, $this->translate->getData());
-            return;
-        }
+            ->will($this->returnValue(false));
 
         $this->directory->expects($this->any())->method('isExist')->will($this->returnValue(true));
 
         // _loadModuleTranslation()
-        $this->moduleList->expects($this->once())->method('getNames')->will($this->returnValue(['name']));
+        $modules = ['some_module', 'other_module', 'another_module', 'current_module'];
+        $this->request->expects($this->any())
+            ->method('getControllerModule')
+            ->willReturn('current_module');
+        $this->moduleList->expects($this->once())->method('getNames')->will($this->returnValue($modules));
         $moduleData = [
             'module original' => 'module translated',
             'module theme' => 'module-theme original translated',
@@ -170,9 +200,7 @@ public function testLoadData($area, $forceReload, $cachedData)
         ];
         $this->resource->expects($this->any())->method('getTranslationArray')->will($this->returnValue($dbData));
 
-        if (!$forceReload) {
-            $this->cache->expects($this->exactly(1))->method('save');
-        }
+        $this->cache->expects($this->exactly($forceReload ? 0 : 1))->method('save');
 
         $this->translate->loadData($area, $forceReload);
 
@@ -190,20 +218,13 @@ public function testLoadData($area, $forceReload, $cachedData)
 
     public function dataProviderForTestLoadData()
     {
-        $cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
         return [
-            ['adminhtml', true, false],
-            ['adminhtml', true, $cachedData],
-            ['adminhtml', false, $cachedData],
-            ['adminhtml', false, false],
-            ['frontend', true, false],
-            ['frontend', true, $cachedData],
-            ['frontend', false, $cachedData],
-            ['frontend', false, false],
-            [null, true, false],
-            [null, true, $cachedData],
-            [null, false, $cachedData],
-            [null, false, false]
+            ['adminhtml', true],
+            ['adminhtml', false],
+            ['frontend', true],
+            ['frontend', false],
+            [null, true],
+            [null, false]
         ];
     }
 
@@ -292,7 +313,14 @@ protected function expectsSetConfig($themeId, $localeCode = 'en_US')
                     ]
                 )
             );
-        $designTheme = new \Magento\Framework\DataObject(['id' => $themeId]);
+        $designTheme = $this->getMockBuilder(\Magento\Theme\Model\Theme::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $designTheme->expects($this->once())
+            ->method('getThemePath')
+            ->willReturn($themeId);
+
         $this->viewDesign->expects($this->any())->method('getDesignTheme')->will($this->returnValue($designTheme));
     }
 }