Merge remote-tracking branch 'remotes/api/MAGETWO-43739-Translations-Are-Not-Picked-From-The-Right-Module' into API-M11-Bug-Fixes

Author: Cari Spruiell

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

@@ -68,7 +68,15 @@ public function setUp()
         $this->resource = $this->getMock('\Magento\Framework\Translate\ResourceInterface', [], [], '', false);
         $this->locale = $this->getMock('\Magento\Framework\Locale\ResolverInterface', [], [], '', false);
         $this->appState = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
-        $this->request = $this->getMock('\Magento\Framework\App\RequestInterface', [], [], '', false);
+        $this->request = $this->getMockForAbstractClass(
+            '\Magento\Framework\App\RequestInterface',
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getParam', 'getControllerModule']
+        );
         $this->csvParser = $this->getMock('\Magento\Framework\File\Csv', [], [], '', false);
         $this->packDictionary = $this->getMock('\Magento\Framework\App\Language\Dictionary', [], [], '', false);
         $this->directory = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface', [], [], '', false);

lib/internal/Magento/Framework/Translate.php

@@ -204,6 +204,9 @@ protected function setConfig($config)
         if (!isset($this->_config['theme'])) {
             $this->_config['theme'] = $this->_viewDesign->getDesignTheme()->getId();
         }
+        if (!isset($this->_config['module'])) {
+            $this->_config['module'] = $this->getControllerModuleName();
+        }
         return $this;
     }
 
@@ -232,14 +235,39 @@ protected function getConfig($key)
         return null;
     }
 
+    /**
+     * Retrieve name of the current module
+     * @return mixed
+     */
+    protected function getControllerModuleName()
+    {
+        return $this->request->getControllerModule();
+    }
+
     /**
      * Load data from module translation files
      *
      * @return $this
      */
     protected function _loadModuleTranslation()
     {
-        foreach ($this->_moduleList->getNames() as $module) {
+        $currentModule = $this->getControllerModuleName();
+        $allModulesExceptCurrent = array_diff($this->_moduleList->getNames(), [$currentModule]);
+
+        $this->loadModuleTranslationByModulesList($allModulesExceptCurrent);
+        $this->loadModuleTranslationByModulesList([$currentModule]);
+        return $this;
+    }
+
+    /**
+     * Load data from module translation files by list of modules
+     *
+     * @param array $modules
+     * @return $this
+     */
+    protected function loadModuleTranslationByModulesList(array $modules)
+    {
+        foreach ($modules as $module) {
             $moduleFilePath = $this->_getModuleTranslationFile($module, $this->getLocale());
             $this->_addData($this->_getFileData($moduleFilePath));
         }
@@ -428,6 +456,9 @@ protected function getCacheId($forceReload = false)
             if (isset($this->_config['theme'])) {
                 $this->_cacheId .= '_' . $this->_config['theme'];
             }
+            if (isset($this->_config['module'])) {
+                $this->_cacheId .= '_' . $this->_config['module'];
+            }
         }
         return $this->_cacheId;
     }