Fix translations

mitchcurtis · Feb 2, 2020 · 996644e · 996644e
1 parent 770ea37
commit 996644e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/application.cpp b/app/application.cpp
@@ -164,8 +164,16 @@ Application::Application(int &argc, char **argv, const QString &applicationName)
     QTranslator translator;
     const QLocale locale(mSettings->language());
     QDir translationsDir = QDir::current();
+#if defined(Q_OS_WIN32)
+    translationsDir.cd(QStringLiteral("translations"));
+#elif defined(Q_OS_MAC)
     translationsDir.cdUp();
     translationsDir.cd(QStringLiteral("Translations"));
+#else
+    translationsDir.cd(QStringLiteral("share/slate/translations"));
+#endif
+    qCDebug(lcApplication) << "looking for translation for"
+        << locale.name() << "locale in" << translationsDir.absolutePath();
     if (translator.load(locale, QStringLiteral("slate_"), QString(), translationsDir.absolutePath())) {
         mApplication->installTranslator(&translator);
     }

diff --git a/translations/translations.qbs b/translations/translations.qbs
@@ -15,8 +15,8 @@ Product {
                 return "translations"
             else if (qbs.targetOS.contains("macos"))
                 return "Slate.app/Contents/Translations"
-            //else
-            //    return "share/tiled/translations"
+            else
+                return "share/slate/translations"
         }
     }
 }