From 5a434ba6672ded85f359c3d6a69cfb2fa79232a8 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@open-sankore.org>
Date: Fri, 28 Sep 2012 12:09:23 +0200
Subject: [PATCH] fixed issue related to translation loading

---
 src/core/UBApplication.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index a2043121..580ef897 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -216,14 +216,17 @@ QString UBApplication::checkLanguageAvailabilityForSankore(QString &language)
 
 void UBApplication::setupTranslators(QStringList args)
 {
-    QString forcedLanguage;
+    QString forcedLanguage("");
     if(args.contains("-lang"))
         forcedLanguage=args.at(args.indexOf("-lang") + 1);
-    else{
-        QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString();
-        if(!setLanguage.isEmpty())
-            forcedLanguage = setLanguage;
-    }
+// TODO claudio: this has been commented because some of the translation seem to be loaded at this time
+//               especially tools name. This is a workaround and we have to be able to load settings without
+//               impacting the translations
+//    else{
+//        QString setLanguage = UBSettings::settings()->appPreferredLanguage->get().toString();
+//        if(!setLanguage.isEmpty())
+//            forcedLanguage = setLanguage;
+//    }
 
     QString language("");
 
@@ -242,7 +245,6 @@ void UBApplication::setupTranslators(QStringList args)
     else{
         mApplicationTranslator = new QTranslator(this);
         mQtGuiTranslator = new QTranslator(this);
-
         mApplicationTranslator->load(UBPlatformUtils::translationPath(QString("sankore_"),language));
         installTranslator(mApplicationTranslator);
 
@@ -256,7 +258,6 @@ void UBApplication::setupTranslators(QStringList args)
         }
 
         if(!qtGuiTranslationPath.isEmpty()){
-            qDebug() << "qtGuiTranslationPath " << qtGuiTranslationPath;
             mQtGuiTranslator->load(qtGuiTranslationPath);
             installTranslator(mQtGuiTranslator);
         }