From 8df40a1902b76b45fabf6aeb00e860a01caac2e4 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sun, 5 Jul 2020 09:30:25 +0200 Subject: [PATCH] fixed translations --- system/system.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/system.php b/system/system.php index 720681f..e8c1a70 100644 --- a/system/system.php +++ b/system/system.php @@ -221,7 +221,12 @@ $container['view'] = function ($container) use ($uri) /****************************** * LOAD TRANSLATIONS * ******************************/ - if(isset($uri->getPath()) && (strpos($uri->getPath(),'/tm/') !== false OR strpos($uri->getPath(),'/setup') !== false)) + $uri = $_SERVER['REQUEST_URI']; + + $base_path = $container['request']->getUri()->getBasePath(); + $uri = str_replace($base_path,'',$uri); + $pieces = explode('/',$uri); + if(isset($uri) && ($pieces[1] === 'tm' OR $pieces[1] === 'setup') ) { // Admin environment labels $labels = Typemill\Translations::loadTranslations('admin'); @@ -230,7 +235,6 @@ $container['view'] = function ($container) use ($uri) // For now it is useless, but it will prove useful in the future $labels = Typemill\Translations::loadTranslations('user'); } - $container['translations'] = $labels; $view['translations'] = $labels; $view->addExtension(new Typemill\Extensions\TwigLanguageExtension( $labels ));