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

vpodorozh · vpodorozh · commit 10d9cc9d1a20 · 2018-11-02T15:15:35.000+02:00
(cherry picked from commit 21f5225)
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -388,14 +388,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
`@@ -388,14 +388,16 @@ protected function _getModuleTranslationFile($moduleName, $locale)`
`388`	`388`	`*`
`389`	`389`	`* @param string $locale`
`390`	`390`	`* @param array $config`
`391`		`- * @return string`
	`391`	`+ * @return string\|null`
`392`	`392`	`*/`
`393`		`- private function getThemeTranslationFileName(string $locale, array $config): string`
	`393`	`+ private function getThemeTranslationFileName(string $locale, array $config): ?string`
`394`	`394`	`{`
`395`		`- return $this->_viewFileSystem->getLocaleFileName(`
	`395`	`+ $fileName = $this->_viewFileSystem->getLocaleFileName(`
`396`	`396`	`'i18n' . '/' . $locale . '.csv',`
`397`	`397`	`$config`
`398`	`398`	`);`
	`399`	`+`
	`400`	`+ return $fileName ? $fileName : null;`
`399`	`401`	`}`
`400`	`402`
`401`	`403`	`/**`