From 4f1c0371d169f39ad428596bd4c7e4193422716b Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Sun, 25 Nov 2007 16:45:47 +0000
Subject: [PATCH] now lang id is correctly got from fp_config[locale][lang];
 todo: check encoding!

---
 admin/panels/config/admin.config.php | 4 +---
 fp-defaults/settings-defaults.php    | 1 -
 fp-includes/core/core.language.php   | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/admin/panels/config/admin.config.php b/admin/panels/config/admin.config.php
index 88ab315..824c508 100755
--- a/admin/panels/config/admin.config.php
+++ b/admin/panels/config/admin.config.php
@@ -65,9 +65,7 @@
 				'theme'	=> $fp_config['general']['theme'],
 				'style'	=> @$fp_config['general']['style'],
 				'blogid' => $fp_config['general']['blogid'],
-				
-				 'lang'	=> 'en-us',
-				 'charset'=> 'utf-8',
+				'charset'=> 'utf-8',
 	
 			);
 			
diff --git a/fp-defaults/settings-defaults.php b/fp-defaults/settings-defaults.php
index ed1d048..b24f73b 100755
--- a/fp-defaults/settings-defaults.php
+++ b/fp-defaults/settings-defaults.php
@@ -15,7 +15,6 @@ $fp_config = array (
     'theme' => 'leggero',
     'style' => 'leggero',
     'blogid' => 'fpdefid',
-    'lang' => 'en-us',
     'charset' => 'utf-8',
   ),
   'locale' => 
diff --git a/fp-includes/core/core.language.php b/fp-includes/core/core.language.php
index 409243b..8248dc3 100644
--- a/fp-includes/core/core.language.php
+++ b/fp-includes/core/core.language.php
@@ -28,7 +28,7 @@
 			
 		}
 		
-		$fpath=LANG_DIR."{$fp_config['general']['lang']}/$file";
+		$fpath=LANG_DIR."{$fp_config['locale']['lang']}/$file";
 		$fallback=LANG_DIR.LANG_DEFAULT."/$file";