Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 23 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
index 3595b21..8ff4f0d 100644
--- a/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/sqlitestudio.cpp
@@ -32,13 +32,14 @@
 #include "plugins/populateplugin.h"
 #include "services/bugreporter.h"
 #include "services/extralicensemanager.h"
+#include "translations.h"
 #include <QProcessEnvironment>
 #include <QThreadPool>
 #include <QCoreApplication>
 
 DEFINE_SINGLETON(SQLiteStudio)
 
-static const int sqlitestudioVersion = 30001;
+static const int sqlitestudioVersion = 30002;
 
 SQLiteStudio::SQLiteStudio()
 {
@@ -49,6 +50,21 @@ SQLiteStudio::SQLiteStudio()
 SQLiteStudio::~SQLiteStudio()
 {
 }
+QStringList SQLiteStudio::getInitialTranslationFiles() const
+{
+    return initialTranslationFiles;
+}
+
+void SQLiteStudio::setInitialTranslationFiles(const QStringList& value)
+{
+    initialTranslationFiles = value;
+}
+
+
+QString SQLiteStudio::getCurrentLang() const
+{
+    return currentLang;
+}
 
 ExtraLicenseManager* SQLiteStudio::getExtraLicenseManager() const
 {
@@ -263,6 +279,9 @@ void SQLiteStudio::init(const QStringList& cmdListArguments, bool guiAvailable)
     config = new ConfigImpl();
     config->init();
 
+    currentLang = CFG_CORE.General.Language.get();
+    loadTranslations(initialTranslationFiles);
+
     pluginManager = new PluginManagerImpl();
     dbManager = new DbManagerImpl();
 
@@ -325,7 +344,9 @@ void SQLiteStudio::cleanUp()
     disconnect(pluginManager, SIGNAL(unloaded(QString,PluginType*)), this, SLOT(pluginUnloaded(QString,PluginType*)));
     if (!immediateQuit)
     {
-        pluginManager->deinit();
+        if (pluginManager)
+            pluginManager->deinit();
+
         safe_delete(pluginManager); // PluginManager before DbManager, so Db objects are deleted while DbManager still exists
         safe_delete(updateManager);
         safe_delete(bugReporter);