i18n re-arrange

1 files changed, 8 insertions, 4 deletions

diff --git a/index.php b/index.php
index 91b864df8..cf20d35a2 100644
--- a/index.php
+++ b/index.php
@@ -123,14 +123,18 @@ $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
 $page    = $a->page;
 $profile = $a->profile;
 $lang    = get_config('system','language');
+if($lang === false)
+	$lang = 'en';
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = "view/" . (($lang) ? $lang . "/" : "") 
-	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) 
-	. ".php";
+$template = 'view/' . $lang . '/' 
+	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
-require_once($template);
+if(file_exists($template))
+	require_once($template);
+else
+	require_once(str_replace($lang . '/', '', $template));
 
 session_write_close();
 exit;