| author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
| commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (side-by-side diff) | |
| tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /library/config.cpp | |
| parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
| download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 | |
Backing out unintentional merge from TT branch.
| -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 @@ -33,7 +33,9 @@ #include <stdlib.h> #include <unistd.h> +#define QTOPIA_INTERNAL_LANGLIST #include "config.h" +#include "global.h" /*! @@ -95,14 +97,9 @@ Config::Config( const QString &name, Domain 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]; } /*! |