Merge branch 'b-7.1.x-pr963' into b-7.1.x

OXID-eSales · May 27, 2024 · 9445eac · 9445eac
2 parents dfe500f + ca04553
commit 9445eac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG-7.1.md b/CHANGELOG-7.1.md
@@ -5,6 +5,9 @@
 ### Deprecated
 - Deprecated the `BasicContextInterface::getCurrentShopId`. Use the `ContextInterface::getCurrentShopId` instead.
 
+### Fixed
+- Wrong path calculated for custom theme translations directory [PR-963](https://github.com/OXID-eSales/oxideshop_ce/pull/963) [#0007386](https://bugs.oxid-esales.com/view.php?id=7386) [#0007643](https://bugs.oxid-esales.com/view.php?id=7643)
+
 ## v7.1.0 - 2024-03-18
 
 ### Added

diff --git a/source/Core/Language.php b/source/Core/Language.php
@@ -724,7 +724,7 @@ protected function getCustomThemeLanguageFiles($language)
         $aLangFiles = [];
 
         if ($sCustomTheme) {
-            $customThemePath = $sAppDir . 'views/' . $sCustomTheme;
+            $customThemePath = $sAppDir . 'views/' . $sCustomTheme .'/';
             $aLangFiles = array_merge($aLangFiles, $this->getThemeLanguageFiles($customThemePath, $sLang));
         }