Merge branch 'dev3.1' into 'dbus-interface'

simplify translation methods； Ignore dependent details to prevent compilation errors

See merge request kylin-desktop/kylin-nm!319

debian/control

@@ -16,14 +16,13 @@ Build-Depends: debhelper (>=9),
                libx11-dev,
                libqt5svg5-dev,
                libkf5networkmanagerqt-dev (>= 5.36.0),
-	           libnm-dev,
+               libnm-dev,
                libcap-dev,
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://github.com/ukui/kylin-nm
 Vcs-Git: https://github.com/ukui/kylin-nm.git
 Vcs-Browser: https://github.com/ukui/kylin-nm
-
 Package: kylin-nm
 Architecture: any
 Depends: network-manager (>=1.2.6),

debian/rules

@@ -28,3 +28,7 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 	dh_auto_build -- $(MAKE_OPTS)
+
+override_dh_shlibdeps:
+        dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+

src/main.cpp

@@ -85,6 +85,7 @@ int main(int argc, char *argv[])
     QtSingleApplication a(id, argc, argv);
     qInstallMessageHandler(messageOutput);
     if (a.isRunning()) {
+        qInfo() << "Kylin-Network-Manager Is Already Launched, just show";
         auto connection = QDBusConnection::sessionBus();
         QDBusInterface iface("com.kylin.network",
                                        "/com/kylin/network",
@@ -94,22 +95,19 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    qDebug()<<"Kylin Network Manager Is Already Launched";
-
     QApplication::setQuitOnLastWindowClosed(false);
 
     // Internationalization
     QString locale = QLocale::system().name();
     QTranslator trans_global;
-    if (locale == "zh_CN") {
-        trans_global.load(":/translations/kylin-nm_zh_CN.qm");
+    qDebug() << "QLocale " << QLocale();
+    if (trans_global.load(QLocale(), "kylin-nm", "_", ":/translations/"))
+    {
         a.installTranslator(&trans_global);
+        qDebug()<<"Translations load success";
+    } else {
+        qWarning() << "Translations load fail";
     }
-    if (locale == "tr_TR") {
-        trans_global.load(":/translations/kylin-nm_tr.qm");
-        a.installTranslator(&trans_global);
-    }
-    qDebug()<<"Translations Are Already Loaded";
 
     MainWindow w;
     w.setProperty("useStyleWindowManager", false); //禁用拖动