| 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/network.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/network.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/library/network.cpp b/library/network.cpp index 7d51016..e6d2781 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -18,6 +18,7 @@ ** **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST #include "qpe/network.h" #include "qpe/networkinterface.h" #include "qpe/global.h" @@ -418,14 +419,16 @@ NetworkInterface* Network::loadPlugin(const QString& type) if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK ) return 0; ifaces->insert(type,iface); - QString lang = getenv( "LANG" ); - QTranslator * trans = new QTranslator(qApp); - QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm"; - if ( trans->load( tfn )) - qApp->installTranslator( trans ); - else - delete trans; - + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { + QString lang = *it; + QTranslator * trans = new QTranslator(qApp); + QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm"; + if ( trans->load( tfn )) + qApp->installTranslator( trans ); + else + delete trans; + } } return iface; #else |