magento#17833: Child theme does not inherit translations from parent theme

vpodorozh · vpodorozh · commit 21f52259c1f4 · 2018-11-02T15:14:28.000+02:00
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -400,14 +400,16 @@ protected function _getModuleTranslationFile($moduleName, $locale)
      *
      * @param string $locale
      * @param array $config
-     * @return string
+     * @return string|null
      */
-    private function getThemeTranslationFileName(string $locale, array $config): string
+    private function getThemeTranslationFileName(string $locale, array $config): ?string
     {
-        return $this->_viewFileSystem->getLocaleFileName(
+        $fileName = $this->_viewFileSystem->getLocaleFileName(
             'i18n' . '/' . $locale . '.csv',
             $config
         );
+
+        return $fileName ? $fileName : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -400,14 +400,16 @@ protected function _getModuleTranslationFile($moduleName, $locale)`
`400`	`400`	`*`
`401`	`401`	`* @param string $locale`
`402`	`402`	`* @param array $config`
`403`		`- * @return string`
	`403`	`+ * @return string\|null`
`404`	`404`	`*/`
`405`		`- private function getThemeTranslationFileName(string $locale, array $config): string`
	`405`	`+ private function getThemeTranslationFileName(string $locale, array $config): ?string`
`406`	`406`	`{`
`407`		`- return $this->_viewFileSystem->getLocaleFileName(`
	`407`	`+ $fileName = $this->_viewFileSystem->getLocaleFileName(`
`408`	`408`	`'i18n' . '/' . $locale . '.csv',`
`409`	`409`	`$config`
`410`	`410`	`);`
	`411`	`+`
	`412`	`+ return $fileName ? $fileName : null;`
`411`	`413`	`}`
`412`	`414`
`413`	`415`	`/**`