0ct0pu5/typemill
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve environment control

Browse source
This commit is contained in:
severoiuliano@gmail.com 2020-06-15 09:41:01 +02:00
parent 486c21c996
commit c26cf7711d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
system/system.php
View file

@ -222,7 +222,11 @@ $container['view'] = function ($container)
* LOAD TRANSLATIONS *
******************************/
$uri = $_SERVER['REQUEST_URI'];
if(isset($uri) && (strpos($uri,'/tm/') !== false OR strpos($uri,'/setup') !== false))
$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');
@ -231,7 +235,6 @@ $container['view'] = function ($container)
// 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 ));