From 71c44d41ed6fa527ef319f74664576837c8ccd19 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 22 Nov 2016 17:42:29 +0100
Subject: [PATCH] fix(app): property set locale

---
 tests/src/app/App.cpp | 10 +++++++---
 tests/src/app/App.hpp |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/src/app/App.cpp b/tests/src/app/App.cpp
index 8518c048e..0b9686d30 100644
--- a/tests/src/app/App.cpp
+++ b/tests/src/app/App.cpp
@@ -23,12 +23,16 @@
 App *App::m_instance = nullptr;
 
 App::App (int &argc, char **argv) : QApplication(argc, argv) {
+  QString current_locale = QLocale::system().name();
+
   // Try to use default locale. Otherwise use english.
-  if (m_translator.load(QString(LANGUAGES_PATH) + QLocale::system().name()) ||
-      m_translator.load(LANGUAGES_PATH "en")) {
+  if (m_translator.load(QString(LANGUAGES_PATH) + current_locale)) {
+    installTranslator(&m_translator);
+    m_locale = current_locale;
+  } else if (m_translator.load(LANGUAGES_PATH "en")) {
     installTranslator(&m_translator);
   } else {
-    qWarning("No translation found.");
+    qFatal("No translation found.");
   }
 
   setWindowIcon(QIcon(WINDOW_ICON_PATH));
diff --git a/tests/src/app/App.hpp b/tests/src/app/App.hpp
index 58c836ea7..efe5457e6 100644
--- a/tests/src/app/App.hpp
+++ b/tests/src/app/App.hpp
@@ -50,7 +50,7 @@ private:
   QTranslator m_translator;
 
   Notifier *m_notifier = nullptr;
-  QString m_locale;
+  QString m_locale = "en";
 
   static App *m_instance;
 };