Backing out unintentional merge from TT branch.

1 files changed, 5 insertions, 8 deletions

diff --git a/library/config.cpp b/library/config.cpp
index 9634571..e07eecb 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -35,3 +35,5 @@
 
+#define QTOPIA_INTERNAL_LANGLIST
 #include "config.h"
+#include "global.h"
 
@@ -97,10 +99,5 @@ Config::Config( const QString &name, Domain domain )
     read();
-
-    lang = getenv("LANG");
-    int i  = lang.find(".");
-    if ( i > 0 )
-        lang = lang.left( i );
-    i = lang.find( "_" );
-    if ( i > 0 )
-        glang = lang.left(i);
+    QStringList l = Global::languageList();
+    lang = l[0];
+    glang = l[1];
 }