🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento#19365: Fixing a test for Magento Newsletter. (by @tiagosampaio)
 - magento#19358: [Backport] Fix the issue with repetitive "tbody" tag for order items table (by @gelanivishal)
 - magento#19023: [2.2 develop] [backport magento#19018] [issue magento#17833] child theme does not inherit translations from parent theme (by @vpodorozh)


Fixed GitHub Issues:
 - magento#17833: Child theme does not inherit translations from parent theme (reported by @rossmc) has been fixed in magento#19023 by @vpodorozh in 2.2-develop branch
   Related commits:
     1. caa2fe8
     2. 24330d6
     3. 10d9cc9
     4. a3db8d3
     5. 26ea51e
     6. e8a07c9

Author: magento-engcom-team

app/code/Magento/Newsletter/Test/Unit/Model/ProblemTest.php

@@ -68,6 +68,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->subscriberFactoryMock = $this->getMockBuilder(SubscriberFactory::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $this->subscriberMock = $this->getMockBuilder(Subscriber::class)
             ->disableOriginalConstructor()

app/code/Magento/Sales/view/frontend/templates/order/items.phtml

@@ -29,9 +29,10 @@
         </thead>
         <?php $items = $block->getItems(); ?>
         <?php $giftMessage = ''?>
+        <tbody>
         <?php foreach ($items as $item): ?>
             <?php if ($item->getParentItem()) continue; ?>
-            <tbody>
+
                 <?= $block->getItemHtml($item) ?>
                 <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
                     <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
@@ -62,8 +63,8 @@
                         </td>
                     </tr>
                 <?php endif ?>
-            </tbody>
         <?php endforeach; ?>
+        </tbody>
         <tfoot>
             <?php if($block->isPagerDisplayed()): ?>
                 <tr>

app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less

@@ -612,10 +612,6 @@
         padding: 25px;
 
         .col {
-            &.name {
-                padding-left: 0;
-            }
-
             &.price {
                 text-align: center;
             }

lib/internal/Magento/Framework/Translate.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework;
 
@@ -327,16 +328,21 @@ protected function _addData($data)
     }
 
     /**
-     * Load current theme translation
+     * Load current theme translation according to fallback
      *
      * @return $this
      */
     protected function _loadThemeTranslation()
     {
-        $file = $this->_getThemeTranslationFile($this->getLocale());
-        if ($file) {
-            $this->_addData($this->_getFileData($file));
+        $themeFiles = $this->getThemeTranslationFilesList($this->getLocale());
+
+        /** @var string $file */
+        foreach ($themeFiles as $file) {
+            if ($file) {
+                $this->_addData($this->_getFileData($file));
+            }
         }
+
         return $this;
     }
 
@@ -377,11 +383,74 @@ protected function _getModuleTranslationFile($moduleName, $locale)
         return $file;
     }
 
+    /**
+     * Get theme translation locale file name
+     *
+     * @param string|null $locale
+     * @param array $config
+     * @return string|null
+     */
+    private function getThemeTranslationFileName($locale, array $config)
+    {
+        $fileName = $this->_viewFileSystem->getLocaleFileName(
+            'i18n' . '/' . $locale . '.csv',
+            $config
+        );
+
+        return $fileName ? $fileName : null;
+    }
+
+    /**
+     * Get parent themes for the current theme in fallback order
+     *
+     * @return array
+     */
+    private function getParentThemesList(): array
+    {
+        $themes = [];
+
+        $parentTheme = $this->_viewDesign->getDesignTheme()->getParentTheme();
+        while ($parentTheme) {
+            $themes[] = $parentTheme;
+            $parentTheme = $parentTheme->getParentTheme();
+        }
+        $themes = array_reverse($themes);
+
+        return $themes;
+    }
+
+    /**
+     * Retrieve translation files for themes according to fallback
+     *
+     * @param string $locale
+     *
+     * @return array
+     */
+    private function getThemeTranslationFilesList($locale): array
+    {
+        $translationFiles = [];
+
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
+        foreach ($this->getParentThemesList() as $theme) {
+            $config = $this->_config;
+            $config['theme'] = $theme->getCode();
+            $translationFiles[] = $this->getThemeTranslationFileName($locale, $config);
+        }
+
+        $translationFiles[] = $this->getThemeTranslationFileName($locale, $this->_config);
+
+        return $translationFiles;
+    }
+
     /**
      * Retrieve translation file for theme
      *
      * @param string $locale
      * @return string
+     *
+     * @deprecated
+     *
+     * @see \Magento\Framework\Translate::getThemeTranslationFilesList
      */
     protected function _getThemeTranslationFile($locale)
     {