latest changes

Author: webdevlabs

app/views/layout.tpl

@@ -40,10 +40,10 @@
               <h3 class="masthead-brand">{$page_title}</h3>
               <nav>{$requestURI}
                 <ul class="nav masthead-nav">
-                  <li {if $requestURI eq '/'}class="active"{/if}><a href="{$BASE_URL}">Home</a></li>
-                  <li {if $requestURI eq '/admin'}class="active"{/if}><a href="{$BASE_URL}/admin">Admin</a></li>
-                  <li {if $requestURI eq '/admin/dashboard'}class="active"{/if}><a href="{$BASE_URL}/admin/dashboard">Dashboard</a></li>
-                  <li {if $requestURI eq '/test'}class="active"{/if}><a href="{$BASE_URL}/test">test</a></li>
+                  <li {if $requestURI eq '/'}class="active"{/if}><a href="{$baseurl}">Home</a></li>
+                  <li {if $requestURI eq '/admin'}class="active"{/if}><a href="{$baseurl}/admin">Admin</a></li>
+                  <li {if $requestURI eq '/admin/dashboard'}class="active"{/if}><a href="{$baseurl}/admin/dashboard">Dashboard</a></li>
+                  <li {if $requestURI eq '/test'}class="active"{/if}><a href="{$baseurl}/test">test</a></li>
                   <li><a href="#">({$language})</a></li>
                 </ul>
               </nav>

system/Language.php

@@ -2,12 +2,13 @@
 namespace System;
 
 class Language {
-    public $current;    
-    public $available_languages = array('en', 'it', 'de', 'fr','bg');
+    public $current, $default;    
+    public $available_languages = ['en', 'it', 'de', 'fr','bg'];
 
     public function __construct (Config $conf) {
         $this->conf = $conf;
-        $this->current = 'en';
+        $this->default = 'en';
+        $this->current = $this->default;
     }
 
 }

system/Template.php

@@ -26,7 +26,13 @@ public function __construct (Config $conf, Language $language) {
 
 		$this->assign('requestURI',$_SESSION['requestURI']);
 		$this->assign('language',$language->current);
-		
+		if ($language->default !== $language->current) {
+			$baseurl = BASE_URL.'/'.$language->current;
+		}else {
+			$baseurl = BASE_URL;
+		}		
+		$this->assign('baseurl',$baseurl);
+
 		$this->setTemplateDir(ROOT_DIR.'/App/views/')
 		->setCompileDir(ROOT_DIR."/storage/cache/smarty")
 		->setCacheDir(ROOT_DIR."/storage/cache/smarty")