| -rw-r--r-- | library/config.cpp | 13 |
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 @@ -28,17 +28,19 @@ #include <qtextstream.h> #include <sys/stat.h> #include <sys/types.h> #include <fcntl.h> #include <stdlib.h> #include <unistd.h> +#define QTOPIA_INTERNAL_LANGLIST #include "config.h" +#include "global.h" /*! \internal */ QString Config::configFilename(const QString& name, Domain d) { switch (d) { @@ -90,24 +92,19 @@ QString Config::configFilename(const QString& name, Domain d) In the File Domain, \a name is an absolute filename. */ Config::Config( const QString &name, Domain domain ) : filename( configFilename(name,domain) ) { git = groups.end(); 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]; } /*! Writes any changes to disk and destroys the in-memory object. */ Config::~Config() { if ( changed ) |