Index: sources/storage/Settings.cpp =================================================================== diff -u -ra75bc5b80ad4ebde50f028b550cd534e589bd059 -ra522e6aa7a36ac696a9a956200e89d838f319e25 --- sources/storage/Settings.cpp (.../Settings.cpp) (revision a75bc5b80ad4ebde50f028b550cd534e589bd059) +++ sources/storage/Settings.cpp (.../Settings.cpp) (revision a522e6aa7a36ac696a9a956200e89d838f319e25) @@ -99,13 +99,14 @@ detail.location = mSettingFile.absolutePath() + "/"; detail.category = mCategory; - if ( parse(detail) ) { - LOG_DEBUG( (QString("Configuration file '%1' successfully loaded").arg(mSettingFile.fileName())) ); + if ( ! parse(detail) ) { + LOG_DEBUG( (QString("Configuration file '%1' failed to load").arg(mSettingFile.fileName())) ); } else { - LOG_DEBUG( (QString("Configuration file '%1' failed to load").arg(mSettingFile.fileName())) ); + LOG_DEBUG( (QString("Configuration file '%1' successfully loaded").arg(mSettingFile.fileName())) ); } } + return err; } @@ -270,3 +271,55 @@ if ( vMessage ) { *vMessage = msg; } return err; } + +/*! + * \brief Settings::loadTranslation + * \return + */ +int Settings::loadTranslation() +{ + int err = Settings_Error::eError_None; + QString qmFile; + bool ok = true; + +// QString mCategory = Storage::Settings_Category_SettingsSystem; +// QString mLanguage = ""; +// mLanguage = _Settings.value(mCategory, "Localization", "Language").toString(); +// if ( mLanguage.isEmpty() ) { +// qDebug() << __FUNCTION__ << ":" << __LINE__ << "-------------Could Not Find the Language"; +// } +// else { +// qDebug() << __FUNCTION__ << ":" << __LINE__ << "-------------mLanguage:" << mLanguage; +// } +// QLocale::setDefault(QLocale::German); + + + QString locale = _Settings.systemLocale(); + if( locale.isEmpty()) { + err = Settings_Error::eError_No_SettingsLocale; + qDebug() << __FUNCTION__ << ":" << __LINE__ << "-------------Could Not Find the Language"; + LOG_DEBUG(errorMessage(err)); +// goto lOut; + } + + qmFile = QString("%1%2%4.%3") + .arg(Storage::Settings_Path()) + .arg(Storage::Settings_Category_Translation) + .arg("qm") + .arg(_settingsLocalSeparator + QString("de")); // locale); + + qDebug() << __FUNCTION__ << ":" << __LINE__ << "-------------qmFile:" << qmFile; + + ok = _translator.load(qmFile); + if ( ! ok) { + qDebug() << __FUNCTION__ << ":" << __LINE__ << "-------------FAILED"; + err = Settings_Error::eError_SettingNotExists; + goto lOut; + } + + QApplication::installTranslator(&_translator); + +lOut: + + return err; +}