Modify translate

KangLin · Aug 5, 2020 · e10c401 · e10c401
1 parent 81931b5
commit e10c401
Show file tree

Hide file tree

Showing 15 changed files with 1,509 additions and 1,349 deletions.
diff --git a/App/Resource/Translations/RabbitImApp_zh_CN.ts b/App/Resource/Translations/RabbitImApp_zh_CN.ts
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_CN">
+<context>
+    <name>CAndroidNotification</name>
+    <message>
+        <source>RabbitIm</source>
+        <translation type="vanished">玉兔即时通讯</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <location filename="../../main.cpp" line="53"/>
         <source>Rabbit immediate communicate</source>
-        <translation type="unfinished"></translation>
+        <translation>玉兔即时通讯</translation>
     </message>
 </context>
 </TS>
diff --git a/App/Resource/Translations/RabbitImApp_zh_TW.ts b/App/Resource/Translations/RabbitImApp_zh_TW.ts
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="zh_TW">
+<context>
+    <name>CAndroidNotification</name>
+    <message>
+        <source>RabbitIm</source>
+        <translation type="vanished">玉兔即時通訊</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
         <location filename="../../main.cpp" line="53"/>
         <source>Rabbit immediate communicate</source>
-        <translation type="unfinished"></translation>
+        <translation>玉兔即時通訊</translation>
     </message>
 </context>
 </TS>
diff --git a/App/main.cpp b/App/main.cpp
@@ -26,9 +26,11 @@ int main(int argc, char *argv[])
 #if defined(ANDROID) || defined(RABBITIM_STATIC)
     Q_INIT_RESOURCE(Resource);
     //Q_INIT_RESOURCE(style);
+
+#endif
+
 #ifdef DEBUG
     Q_INIT_RESOURCE(translations_RabbitImApp);
-#endif
 #endif
 
     QApplication app(argc, argv);
@@ -47,7 +49,8 @@ int main(int argc, char *argv[])
 
     QTranslator translator;
     translator.load(RabbitCommon::CDir::Instance()->GetDirTranslations()
-                     + QDir::separator() + "RabbitImApp_" + QLocale::system().name() + ".qm");
+                    + QDir::separator() + "RabbitImApp_"
+                    + QLocale::system().name() + ".qm");
     qApp->installTranslator(&translator);
 
     app.setApplicationDisplayName(QObject::tr("Rabbit immediate communicate"));
@@ -90,7 +93,7 @@ int main(int argc, char *argv[])
     MainWindow w;
 #ifndef MOBILE
     //加载窗口位置  
-    QSettings conf(CGlobalDir::Instance()->GetApplicationConfigureFile(),
+    QSettings conf(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
                    QSettings::IniFormat);
     QScreen *pScreen = QGuiApplication::primaryScreen();
 
@@ -128,5 +131,11 @@ int main(int argc, char *argv[])
     player.show();
 #endif
     //*/
-    return app.exec();
+    int nRet = app.exec();
+
+#ifdef DEBUG
+    Q_CLEANUP_RESOURCE(translations_RabbitImApp);
+#endif
+
+    return nRet;
 }
diff --git a/Plugin/PluginApp.cpp b/Plugin/PluginApp.cpp
@@ -5,6 +5,7 @@
 #include <QSettings>
 #include <QTranslator>
 #include <QSharedPointer>
+#include "RabbitCommonDir.h"
 
 CPluginApp::CPluginApp()
 {  
@@ -43,7 +44,7 @@ int CPluginApp::ClearInstance()
 int CPluginApp::LoadTranslate(const QString &szDir)
 {
     //初始化翻译  
-    QSettings conf(CGlobalDir::Instance()->GetApplicationConfigureFile(), QSettings::IniFormat);
+    QSettings conf(RabbitCommon::CDir::Instance()->GetFileUserConfigure(), QSettings::IniFormat);
     QString szLocale = conf.value("Global/Language", QLocale::system().name()).toString();
 
     if("Default" == szLocale)

diff --git a/Plugin/PluginProtocol.cpp b/Plugin/PluginProtocol.cpp
@@ -4,6 +4,8 @@
 #include <QSettings>
 #include <QSharedPointer>
 
+#include "RabbitCommonDir.h"
+
 CPluginProtocol::CPluginProtocol()
 {
 }
@@ -34,7 +36,7 @@ int CPluginProtocol::ClearInstance()
 int CPluginProtocol::LoadTranslate(const QString &szDir)
 {
     //初始化翻译
-    QSettings conf(CGlobalDir::Instance()->GetApplicationConfigureFile(), QSettings::IniFormat);
+    QSettings conf(RabbitCommon::CDir::Instance()->GetFileUserConfigure(), QSettings::IniFormat);
     QString szLocale = conf.value("Global/Language", QLocale::system().name()).toString();
 
     if("Default" == szLocale)