From ec7f06b59a716a28dbda7c70e9c4f2f5c04471ba Mon Sep 17 00:00:00 2001
From: Kang Lin <kl222@126.com>
Date: Wed, 20 Mar 2024 09:27:32 +0800
Subject: [PATCH] Use RabbitCommon::CTools::Instance()->InstallTranslator

---
 App/main.cpp                                | 15 +--------------
 Src/Plugins/LibFacedetection/CMakeLists.txt |  2 +-
 debian/rules                                |  4 ++--
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/App/main.cpp b/App/main.cpp
index 8eaaa21..39237a1 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -24,20 +24,7 @@ int main(int argc, char *argv[])
 
 #ifdef RABBITCOMMON
     RabbitCommon::CTools::Instance()->Init();
-
-    QString szTranslator = RabbitCommon::CDir::Instance()->GetDirTranslations()
-            + "/" + QCoreApplication::applicationName()
-            + "App_" + QLocale::system().name() + ".qm";
-    qDebug(log) << "Translator:" << szTranslator;
-    QTranslator translator;
-    bool bRet = translator.load(szTranslator);
-    if(bRet){
-        bRet = app.installTranslator(&translator);
-        if(!bRet)
-            qCritical(log) << "Install translator fail." << szTranslator;
-    }
-    else
-        qCritical(log) << "Load translator fail." << szTranslator;
+    RabbitCommon::CTools::Instance()->InstallTranslator("FaceRecognizerApp");
 #endif
 
     app.setApplicationDisplayName(QObject::tr("Face recognizer"));
diff --git a/Src/Plugins/LibFacedetection/CMakeLists.txt b/Src/Plugins/LibFacedetection/CMakeLists.txt
index d74efca..13fa92c 100644
--- a/Src/Plugins/LibFacedetection/CMakeLists.txt
+++ b/Src/Plugins/LibFacedetection/CMakeLists.txt
@@ -19,7 +19,7 @@ set(HEADER_FILES
     FaceLibfacedetection.h
     DetectorLibfacedetection.h)
 
-INSTALL_TARGETS(TARGETS facedetection)
+#INSTALL_TARGETS(TARGETS facedetection)
 
 # Install target
 set(INSTALL_PATH ${INSTALL_FACE_RECOGNIZER_PLUGS_DIR})
diff --git a/debian/rules b/debian/rules
index 708b83b..8b0dc54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,8 +78,8 @@ override_dh_auto_install:
 	cmake --install $(BUILD_DIR) --config Release \
 		--prefix $(PACKAGE_DIR)/opt/FaceRecognizer
 
-#override_dh_shlibdeps:
-#	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib:`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib/`uname -m`-linux-gnu:$(LIB_PARAS)
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib:`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib/`uname -m`-linux-gnu:$(LIB_PARAS)
 
 override_dh_builddeb:
 	dh_builddeb --package=facerecognizer -P$(PACKAGE_DIR)