| author | kergoth <kergoth> | 2002-02-04 22:14:18 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-02-04 22:14:18 (UTC) |
| commit | d46cb220a09b41312d86bb33573940d3dcba2588 (patch) (side-by-side diff) | |
| tree | 6aacb1589d5de2ca908d067f99ba64dc608a6fa5 /library/qpeapplication.cpp | |
| parent | 500e2f0cdbe82035516b7a1c576e08e0b2ad72b3 (diff) | |
| download | opie-d46cb220a09b41312d86bb33573940d3dcba2588.zip opie-d46cb220a09b41312d86bb33573940d3dcba2588.tar.gz opie-d46cb220a09b41312d86bb33573940d3dcba2588.tar.bz2 | |
latest qtopia merge as of 20020204.
| -rw-r--r-- | library/qpeapplication.cpp | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 70ffec1..4dbfbd8 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -21,2 +21,3 @@ **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST #include <stdlib.h> @@ -139,18 +140,3 @@ public: { - QStringList path; - QString lang = getenv("LANG"); - if ( !lang.isEmpty() ) - path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; - path += QPEApplication::qpeDir() + "/pics"; - path += QPEApplication::qpeDir() + "/help/en/html"; - path += QPEApplication::qpeDir() + "/docs"; - QString dir = QDir::current().canonicalPath(); - if ( dir == "/" ) - dir += "/docs"; - else { - path += dir + "/../pics"; - dir += "/../docs"; - path += dir; - } - setFilePath( path ); + setFilePath( Global::helpPath() ); setExtensionType("html","text/html;charset=UTF-8"); @@ -539,15 +525,11 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) #ifndef QT_NO_TRANSLATION - char *l = getenv( "LANG" ); - QString lang; - if ( l ) { - lang = l; + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { + QString lang = *it; - /* - Config config("qpe"); - config.setGroup( "Appearance" ); - lang = config.readEntry( "Language", lang ); - */ + QTranslator * trans; + QString tfn; - QTranslator * trans = new QTranslator(this); - QString tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; + trans = new QTranslator(this); + tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; if ( trans->load( tfn )) @@ -558,3 +540,3 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) trans = new QTranslator(this); - tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; + tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; if ( trans->load( tfn )) @@ -564,3 +546,3 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) - //###language/font hack; should look it up somewhere + //###language/font hack; should look it up somewhere if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { |