From 95e32b1e445a77de9558ff8fce948f4a6a177b93 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Mon, 12 May 2014 12:35:33 +0300
Subject: [PATCH] In release mode on Unix search translations first in local
 directory.

--HG--
branch : develop
---
 src/app/main.cpp                 |  8 --------
 src/app/widgets/vapplication.cpp | 33 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 067effe65..3f6a00fc3 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -155,15 +155,7 @@ int main(int argc, char *argv[])
     app.installTranslator(&qtTranslator);
 
     QTranslator appTranslator;
-#ifdef Q_OS_WIN
     appTranslator.load("valentina_" + checkedLocale, qApp->translationsPath());
-#else
-    #ifdef QT_DEBUG
-        appTranslator.load("valentina_" + checkedLocale, qApp->translationsPath());
-    #else
-        appTranslator.load("valentina_" + checkedLocale, qApp->translationsPath());
-    #endif
-#endif
     app.installTranslator(&appTranslator);
 
     static const char * GENERIC_ICON_TO_CHECK = "document-open";
diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp
index be1e45304..43de0a2d7 100644
--- a/src/app/widgets/vapplication.cpp
+++ b/src/app/widgets/vapplication.cpp
@@ -35,6 +35,7 @@
 
 #include <QMessageBox>
 #include <QDebug>
+#include <QDir>
 
 const qreal VApplication::PrintDPI = 96.0;
 
@@ -146,7 +147,15 @@ QString VApplication::pathToTables() const
             #ifdef QT_DEBUG
                 return QApplication::applicationDirPath() + QStringLiteral("/tables/individual");
             #else
-                return QStringLiteral("/usr/share/valentina/tables/individual");
+                QDir dir(QApplication::applicationDirPath() + QStringLiteral("/tables/individual"));
+                if(dir.exist())
+                {
+                    return dir.absolutePath();
+                }
+                else
+                {
+                    return QStringLiteral("/usr/share/valentina/tables/individual");
+                }
             #endif
         #endif
     }
@@ -158,7 +167,15 @@ QString VApplication::pathToTables() const
             #ifdef QT_DEBUG
                 return QApplication::applicationDirPath() + QStringLiteral("/tables/standard");
             #else
-                return QStringLiteral("/usr/share/valentina/tables/standard");
+                QDir dir(QApplication::applicationDirPath() + QStringLiteral("/tables/standard"));
+                if(dir.exist())
+                {
+                    return dir.absolutePath();
+                }
+                else
+                {
+                    return QStringLiteral("/usr/share/valentina/tables/standard");
+                }
             #endif
         #endif
     }
@@ -172,10 +189,18 @@ QString VApplication::translationsPath() const
 #else
 #ifdef QT_DEBUG
     return QApplication::applicationDirPath() + QStringLiteral("/translations");
-        #else
+    #else
+        QDir dir(QApplication::applicationDirPath() + QStringLiteral("/translations"));
+        if(dir.exist())
+        {
+            return dir.absolutePath();
+        }
+        else
+        {
             return QStringLiteral("/usr/share/valentina/translations");
-        #endif
+        }
     #endif
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------------------