From e37a696e7df33ae15d6a97634f23d3db04a6d83d Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 18 Dec 2016 14:33:59 +0800
Subject: [PATCH 1/2] Refactor

Move default value to preference class
Rename variable
Reorder headers
Remove extra parentheses
---
 src/app/application.cpp  | 34 ++++++++++++----------------------
 src/base/preferences.cpp |  5 +++--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/app/application.cpp b/src/app/application.cpp
index 85bf2de25..1ffa2bc7e 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -511,36 +511,26 @@ void Application::initializeTranslation()
 {
     Preferences* const pref = Preferences::instance();
     // Load translation
-    QString locale = pref->getLocale();
+    QString localeStr = pref->getLocale();
 
-    if (locale.isEmpty()) {
-        locale = QLocale::system().name();
-        pref->setLocale(locale);
-    }
-
-    if (m_qtTranslator.load(
+    if (
 #ifdef QBT_USES_QT5
-            QString::fromUtf8("qtbase_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) ||
-        m_qtTranslator.load(
+        m_qtTranslator.load(QString::fromUtf8("qtbase_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) ||
 #endif
-            QString::fromUtf8("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
-            qDebug("Qt %s locale recognized, using translation.", qPrintable(locale));
-    }
-    else {
-        qDebug("Qt %s locale unrecognized, using default (en).", qPrintable(locale));
-    }
+        m_qtTranslator.load(QString::fromUtf8("qt_") + localeStr, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+            qDebug("Qt %s locale recognized, using translation.", qPrintable(localeStr));
+    else
+        qDebug("Qt %s locale unrecognized, using default (en).", qPrintable(localeStr));
     installTranslator(&m_qtTranslator);
 
-    if (m_translator.load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
-        qDebug("%s locale recognized, using translation.", qPrintable(locale));
-    }
-    else {
-        qDebug("%s locale unrecognized, using default (en).", qPrintable(locale));
-    }
+    if (m_translator.load(QString::fromUtf8(":/lang/qbittorrent_") + localeStr))
+        qDebug("%s locale recognized, using translation.", qPrintable(localeStr));
+    else
+        qDebug("%s locale unrecognized, using default (en).", qPrintable(localeStr));
     installTranslator(&m_translator);
 
 #ifndef DISABLE_GUI
-    if (locale.startsWith("ar") || locale.startsWith("he")) {
+    if (localeStr.startsWith("ar") || localeStr.startsWith("he")) {
         qDebug("Right to Left mode");
         setLayoutDirection(Qt::RightToLeft);
     }
diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp
index 28184ea95..ed4e54f8c 100644
--- a/src/base/preferences.cpp
+++ b/src/base/preferences.cpp
@@ -31,8 +31,9 @@
  */
 
 #include <QCryptographicHash>
-#include <QPair>
 #include <QDir>
+#include <QLocale>
+#include <QPair>
 #include <QSettings>
 
 #ifndef DISABLE_GUI
@@ -92,7 +93,7 @@ void Preferences::setValue(const QString &key, const QVariant &value)
 // General options
 QString Preferences::getLocale() const
 {
-    return value("Preferences/General/Locale").toString();
+    return value("Preferences/General/Locale", QLocale::system().name()).toString();
 }
 
 void Preferences::setLocale(const QString &locale)

From 75ef6356d35eeff2f356e8bb43cc190da3738ba3 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sun, 18 Dec 2016 14:40:19 +0800
Subject: [PATCH 2/2] Set default locale

---
 src/app/application.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/application.cpp b/src/app/application.cpp
index 1ffa2bc7e..199911c1c 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -512,6 +512,7 @@ void Application::initializeTranslation()
     Preferences* const pref = Preferences::instance();
     // Load translation
     QString localeStr = pref->getLocale();
+    QLocale::setDefault(QLocale(localeStr));
 
     if (
 #ifdef QBT_USES_QT5