1 files changed, 5 insertions, 83 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index ba1c6d1..f44debc 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -48,7 +48,2 @@
 
-const char *germanwords[][2] = { 
-#include "wordsgerman.h"
-  "", ""
-};
-
 KOPrefs *KOPrefs::mInstance = 0;
@@ -60,3 +55,2 @@ KOPrefs::KOPrefs() :
   mCategoryColors.setAutoDelete(true);
-  mLocaleDict = 0;
   fillMailDefaults();
@@ -102,3 +96,3 @@ KOPrefs::KOPrefs() :
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
-  addItemBool("LanguageChanged",&mLanguageChanged,false); 
+  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
 
@@ -206,9 +200,3 @@ KOPrefs::KOPrefs() :
   KPrefs::setCurrentGroup("Locale");
-  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
-  addItemInt("PreferredTime",&mPreferredTime,0);
-  addItemInt("PreferredDate",&mPreferredDate,0);
-  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
-  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
-  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
@@ -318,5 +306,3 @@ KOPrefs::~KOPrefs()
       mInstance = insd.setObject(0); 
-  setLocaleDict( 0 );
-  if ( mLocaleDict )
-      delete mLocaleDict;
+ 
   //qDebug("KOPrefs::~KOPrefs() ");
@@ -379,68 +365,2 @@ void KOPrefs::usrReadConfig()
 {
-    mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
-    mLocaleDict = 0;
-    // pending LR fix translation
-    // qDebug("KOPrefs::usrReadConfig() fix translation ");
-    if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
-        if ( mPreferredLanguage == 1 ) {
-            mLocaleDict = new QDict<QString>;
-            int i = 0;
-            QString fw ( germanwords[i] [0]);
-            while ( !fw.isEmpty() ) {
-                mLocaleDict->insert( fw, new QString (germanwords[i] [1] ));
-                ++i;
-                fw = germanwords[i] [0];
-            }
-        
-            setLocaleDict( mLocaleDict );
-        } else {
-            QString fileName ;
-            if ( mPreferredLanguage == 4 ) 
-                fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
-            else if ( mPreferredLanguage == 2 ) 
-                fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; 
-            else if ( mPreferredLanguage == 3 ) 
-                fileName = MainWindow::resourcePath()+"italiantranslation.txt";
-            QFile file( fileName );
-            if (file.open( IO_ReadOnly ) ) {
-                QTextStream ts( &file );
-                ts.setEncoding( QTextStream::Latin1 );
-                //ts.setCodec( QTextCodec::latin1 );
-                QString  text = ts.read();
-                file.close();  
-                text.replace( QRegExp("\\\\n"), "\n" );
-                QString line;
-                QString we;
-                QString wt;
-                int br = 0;
-                int nbr;
-                nbr = text.find ( "},", br );
-                line = text.mid( br, nbr - br );
-                br = nbr+1;
-                int se, ee, st, et;
-                mLocaleDict = new QDict<QString>;
-                QString end = "{ \"\",\"\" }";
-                while ( (line != end) && (br > 1)  ) {
-                    //qDebug("%d *%s* ", br, line.latin1());
-                    se = line.find("\"")+1;
-                    et = line.findRev("\"",-1);
-                    ee = line.find("\",\"");
-                    st = ee+3;
-                    we = line.mid( se, ee-se );
-                    wt = line.mid( st, et-st );
-                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
-                    mLocaleDict->insert( we, new QString (wt) );
-                    nbr = text.find ( "}", br );
-                    line = text.mid( br, nbr - br );
-                    br = nbr+1;
-                }
-                //qDebug("end *%s* ", end.latin1());
-
-                setLocaleDict( mLocaleDict );
-            } else {
-                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
-            }
-    
-        }
-    }
     config()->setGroup("General");
@@ -448,3 +368,3 @@ void KOPrefs::usrReadConfig()
     mCustomCategories = config()->readListEntry("Custom Categories");
-    if ( KOPrefs::instance()->mLanguageChanged ) {
+    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
         mLocationDefaults.clear();
@@ -453,2 +373,4 @@ void KOPrefs::usrReadConfig()
     }
+    mOldLoadedLanguage = mOldLanguage ;
+    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
    if (mLocationDefaults.isEmpty()) {