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/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)