Language settings didn't let you de-select a language (i.e. if you have

opie-i18n-de, but NOT opie-i18n-en installed, you can't go back to english)
Now there's always a "English (default)" entry, as long as opie-i18n-en is
not installed.

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
@@ -64,6 +64,7 @@ LanguageSettings::LanguageSettings( QWidget* parent,  const char* name, WFlags f
     if ( FontManager::hasUnicodeFont() )
        languages->setFont(FontManager::unicodeFont(FontManager::Proportional));
 
+
     QString tfn = QPEApplication::qpeDir()+"/i18n/";
     QDir langDir = tfn;
     QStringList list = langDir.entryList("*", QDir::Dirs );
@@ -86,14 +87,17 @@ 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 );
+        }
   
     dl = new QPEDialogListener(this);
     reset();
 }
 
 LanguageSettings::~LanguageSettings()
-{
-}
+{}
 
 void LanguageSettings::accept()
 {
@@ -103,8 +107,7 @@ void LanguageSettings::accept()
 
 void LanguageSettings::applyLanguage()
 {
-  QString lang = langAvail.at( languages->currentItem() );
-  setLanguage( lang );
+        setLanguage ( langAvail. at ( languages-> currentItem ( )));
 }
 
 
@@ -117,9 +120,11 @@ void LanguageSettings::reject()
 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;
 
     int n = langAvail.find( l );
@@ -133,13 +138,18 @@ void LanguageSettings::setLanguage(const QString& lang)
   if( lang != actualLanguage ) {
     Config config("locale");
     config.setGroup( "Language" );
+                if ( lang. isEmpty ( ))
+                        config. removeEntry ( "Language" );
+                else
     config.writeEntry( "Language", lang );
     config.write();
     
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+
     QCopEnvelope e("QPE/System","language(QString)");
     e << lang;
 #endif
+
   }
 }