| -rw-r--r-- | noncore/settings/language/language.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp index 397d372..5c4284b 100644 --- a/noncore/settings/language/language.cpp +++ b/noncore/settings/language/language.cpp @@ -66,2 +66,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f + QString tfn = QPEApplication::qpeDir()+"/i18n/"; @@ -88,2 +89,6 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f } + if ( langAvail. find ( "en" ) == -1 ) { + langAvail. prepend ( "" ); // no tr + languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 ); + } @@ -94,4 +99,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f LanguageSettings::~LanguageSettings() -{ -} +{} @@ -105,4 +109,3 @@ void LanguageSettings::applyLanguage() { - QString lang = langAvail.at( languages->currentItem() ); - setLanguage( lang ); + setLanguage ( langAvail. at ( languages-> currentItem ( ))); } @@ -119,5 +122,7 @@ void LanguageSettings::reset() QString l = getenv("LANG"); - Config config("language"); + Config config("locale"); + config.setGroup("Language"); l = config.readEntry( "Language", l ); - if(l.isEmpty()) l = "en"; + if (l.isEmpty()) + l = "en"; actualLanguage = l; @@ -135,2 +140,5 @@ void LanguageSettings::setLanguage(const QString& lang) config.setGroup( "Language" ); + if ( lang. isEmpty ( )) + config. removeEntry ( "Language" ); + else config.writeEntry( "Language", lang ); @@ -139,2 +147,3 @@ void LanguageSettings::setLanguage(const QString& lang) #if defined(Q_WS_QWS) && !defined(QT_NO_COP) + QCopEnvelope e("QPE/System","language(QString)"); @@ -142,2 +151,3 @@ void LanguageSettings::setLanguage(const QString& lang) #endif + } |