GUI: Better handling of unknown language loading.

kimmov · kimmov · commit e15bc488c921 · 2011-02-08T18:22:44.000+02:00
If there were unknown language in settings the fallback to English
language didn't work as expected. And there were no proper current
language set after that. Initialize current language to English
so we always have English as proper fallback.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -410,10 +410,8 @@ void MainWindow::ProgramSettings()
                                      dialog.SaveFullPath(),
                                      dialog.SaveAllErrors(),
                                      dialog.ShowNoErrorsMessage());
-        const QString currentLang = mTranslation->GetCurrentLanguage();
         const QString newLang = mSettings->value(SETTINGS_LANGUAGE, "en").toString();
-        if (currentLang != newLang)
-            SetLanguage(newLang);
+        SetLanguage(newLang);
     }
 }
 
@@ -650,20 +648,18 @@ void MainWindow::FormatAndSetTitle(const QString &text)
     setWindowTitle(title);
 }
 
-
 void MainWindow::SetLanguage(const QString &code)
 {
-    if (mTranslation->GetCurrentLanguage() == code)
-    {
+    const QString currentLang = mTranslation->GetCurrentLanguage();
+    if (currentLang == code)
         return;
-    }
 
     QString error;
     if (!mTranslation->SetLanguage(code, error))
     {
         QMessageBox msg(QMessageBox::Critical,
                         tr("Cppcheck"),
-                        QString(tr("Failed to change the language:\n\n%1\n\n")).arg(error),
+                        QString(tr("Failed to change the language:\n\n%1")).arg(error),
                         QMessageBox::Ok,
                         this);
 
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
@@ -24,6 +24,7 @@
 
 TranslationHandler::TranslationHandler(QObject *parent) :
     QObject(parent),
+    mCurrentLanguage("en"),
     mTranslator(new QTranslator(this))
 {
     // Add our available languages
@@ -85,7 +86,7 @@ bool TranslationHandler::SetLanguage(const QString &code, QString &error)
     int index = GetLanguageIndexByCode(code);
     if (index == -1)
     {
-        error = QObject::tr("Incorrect language specified!");
+        error = QObject::tr("Unknown language specified!");
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`TranslationHandler::TranslationHandler(QObject *parent) :`
`26`	`26`	`QObject(parent),`
	`27`	`+ mCurrentLanguage("en"),`
`27`	`28`	`mTranslator(new QTranslator(this))`
`28`	`29`	`{`
`29`	`30`	`// Add our available languages`
`@@ -85,7 +86,7 @@ bool TranslationHandler::SetLanguage(const QString &code, QString &error)`
`85`	`86`	`int index = GetLanguageIndexByCode(code);`
`86`	`87`	`if (index == -1)`
`87`	`88`	`{`
`88`		`- error = QObject::tr("Incorrect language specified!");`
	`89`	`+ error = QObject::tr("Unknown language specified!");`
`89`	`90`	`return false;`
`90`	`91`	`}`
`91`	`92`