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

vpodorozh · vpodorozh · commit 26ea51e007a9 · 2018-11-10T10:37:47.000+02:00
- take into account into "null" locale value
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
@@ -386,11 +386,11 @@ protected function _getModuleTranslationFile($moduleName, $locale)
     /**
      * Get theme translation locale file name
      *
-     * @param string $locale
+     * @param string|null $locale
      * @param array $config
      * @return string|null
      */
-    private function getThemeTranslationFileName(string $locale, array $config)
+    private function getThemeTranslationFileName($locale, array $config)
     {
         $fileName = $this->_viewFileSystem->getLocaleFileName(
             'i18n' . '/' . $locale . '.csv',

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