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

vpodorozh · vpodorozh · commit a3db8d3f7898 · 2018-11-08T10:08:29.000+02:00
- fix php7.0 compatibility
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -390,7 +390,7 @@ protected function _getModuleTranslationFile($moduleName, $locale)
      * @param array $config
      * @return string|null
      */
-    private function getThemeTranslationFileName(string $locale, array $config): ?string
+    private function getThemeTranslationFileName(string $locale, array $config)
     {
         $fileName = $this->_viewFileSystem->getLocaleFileName(
             'i18n' . '/' . $locale . '.csv',

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ protected function _getModuleTranslationFile($moduleName, $locale)`
`390`	`390`	`* @param array $config`
`391`	`391`	`* @return string\|null`
`392`	`392`	`*/`
`393`		`- private function getThemeTranslationFileName(string $locale, array $config): ?string`
	`393`	`+ private function getThemeTranslationFileName(string $locale, array $config)`
`394`	`394`	`{`
`395`	`395`	`$fileName = $this->_viewFileSystem->getLocaleFileName(`
`396`	`396`	`'i18n' . '/' . $locale . '.csv',`