[Trans] update default path

jaredtao · Dec 18, 2020 · fa91d11 · fa91d11
1 parent 41a9f53
commit fa91d11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/3rdparty/TaoCommon/Trans/Trans.cpp b/3rdparty/TaoCommon/Trans/Trans.cpp
@@ -10,11 +10,15 @@ const static auto cEnglisthStr = u8"English";
 const static auto cChineseStr = u8"简体中文";
 Trans::Trans(QObject *parent) : QTranslator(parent) {}
 
-void Trans::beforeUiReady(QQmlContext *ctx)
+void Trans::beforeUiReady(QQmlContext *ctx, const QString &folder)
 {
     m_ctx = ctx;
     ctx->setContextProperty("trans", this);
-    loadFolder(qApp->applicationDirPath() + "/Trans");
+    if (folder.isEmpty()) {
+        loadFolder(qApp->applicationDirPath() + "/Trans");
+    } else {
+        loadFolder(folder);
+    }
     qApp->installTranslator(this);
 }
 

diff --git a/3rdparty/TaoCommon/Trans/Trans.h b/3rdparty/TaoCommon/Trans/Trans.h
@@ -7,7 +7,7 @@
 #include <QTranslator>
 #include "TaoCommonGlobal.h"
 class QQmlContext;
-class Trans : public QTranslator
+class TAO_API Trans : public QTranslator
 {
     Q_OBJECT
     Q_PROPERTY(QString currentLang READ currentLang WRITE setCurrentLang NOTIFY currentLangChanged)
@@ -21,7 +21,7 @@ class Trans : public QTranslator
     Q_INVOKABLE bool load(QString &lang, const QString &filePath);
 
 public:
-    void beforeUiReady(QQmlContext *ctx);
+    void beforeUiReady(QQmlContext *ctx, const QString &folder = {});
 
     void afterUiReady();