Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 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>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 11 insertions, 1 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/translations.cpp b/SQLiteStudio3/coreSQLiteStudio/translations.cpp
index 56dc5f6..362d4fa 100644
--- a/SQLiteStudio3/coreSQLiteStudio/translations.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/translations.cpp
@@ -7,7 +7,7 @@
 #include <QRegularExpression>
 
 QHash<QString,QTranslator*> SQLITESTUDIO_TRANSLATIONS;
-QStringList SQLITESTUDIO_TRANSLATION_DIRS = QStringList({":/msg", ":/msg/translations", "msg", "translations"});
+QStringList SQLITESTUDIO_TRANSLATION_DIRS = QStringList({"msg", "translations", ":/msg", ":/msg/translations"});
 
 void loadTranslation(const QString& baseName)
 {
@@ -106,3 +106,13 @@ QMap<QString,QString> getAvailableLanguages()
 
     return langs;
 }
+
+void setDefaultLanguage(const QString& lang)
+{
+    CFG_CORE.General.Language.set(lang);
+}
+
+QString getConfigLanguageDefault()
+{
+    return CFG_CORE.General.Language.getDefultValue().toString();
+}