set default locale

Author: tootal

DBLParse.qrc

@@ -10,7 +10,7 @@
 <file>resources\index.js</file>  
 <file>resources\index.test.js</file>  
 <file>resources\qwebchannel.js</file>  
-<file>resources\strings_en-US.js</file>  
-<file>resources\strings_zh-CN.js</file>  
+<file>resources\strings_en.js</file>  
+<file>resources\strings_zh.js</file>  
 <file>resources\util.js</file>  
 </qresource></RCC> 

configmanager.cpp

@@ -6,9 +6,14 @@
 ConfigManager::ConfigManager(QObject *parent) : QObject(parent)
 {
     m_settings = new QSettings("DBLParse.ini" ,QSettings::IniFormat, this);
-    m_settings->setValue("version", "2.2");
-    m_settings->setValue("lastOpenFileName", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
-    m_settings->setValue("language", "System");
+    init();
+}
+
+void ConfigManager::init()
+{
+    setDefault("version", "2.2");
+    setDefault("lastOpenFileName", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+    setDefault("language", "System");
 }
 
 QString ConfigManager::value(const QString &key) const
@@ -20,3 +25,9 @@ void ConfigManager::setValue(const QString &key, const QString &value)
 {
     m_settings->setValue(key, value);
 }
+
+void ConfigManager::setDefault(const QString &key, const QString &value)
+{
+    if(m_settings->contains(key)) return ;
+    else setValue(key, value);
+}

configmanager.h

@@ -10,9 +10,10 @@ class ConfigManager : public QObject
     Q_OBJECT
 public:
     explicit ConfigManager(QObject *parent = nullptr);
-    
+    void init();
     QString value(const QString &key) const;
     void setValue(const QString &key, const QString &value);
+    void setDefault(const QString &key, const QString &value);
 
 private:
     QSettings *m_settings;

detailpage.cpp

@@ -2,6 +2,12 @@
 
 #include <QDesktopServices>
 
+DetailPage::DetailPage(QObject *parent)
+    :QWebEnginePage(parent)
+{
+    
+}
+
 bool DetailPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType, bool)
 {
     if(url.scheme() == "data")

detailpage.h

@@ -7,7 +7,7 @@ class DetailPage : public QWebEnginePage
 {
     Q_OBJECT
 public:
-    explicit DetailPage(QObject *parent = nullptr) : QWebEnginePage(parent) {}
+    explicit DetailPage(QObject *parent = nullptr);
 
 signals:
     void request(QUrl url);

main.cpp

@@ -9,6 +9,8 @@
 #include <iostream>
 #include <QDebug>
 #include <QDateTime>
+#include <QTranslator>
+#include <QLocale>
 
 ConfigManager *g_config;
 
@@ -30,19 +32,19 @@ void logger(QtMsgType type, const QMessageLogContext &context, const QString &ms
 
     switch(type){
     case QtDebugMsg:
-        header = QObject::tr("Debug: ");
+        header = "Debug: ";
         break;
     case QtInfoMsg:
-        header = QObject::tr("Info: ");
+        header = "Info: ";
         break;
     case QtWarningMsg:
-        header = QObject::tr("Warning: ");
+        header = "Warning: ";
         break;
     case QtCriticalMsg:
-        header = QObject::tr("Critical: ");
+        header = "Critical: ";
         break;
     case QtFatalMsg:
-        header = QObject::tr("Fatal: ");
+        header = "Fatal: ";
         break;
     }
 
@@ -81,9 +83,10 @@ int main(int argc, char *argv[])
     qInfo() << "DBLParse start";
 
     QString locale = Util::getLocale();
-    // Set default locale.
-    if (locale == "zh_CN") {
-        QLocale::setDefault(QLocale(QLocale::Chinese, QLocale::China));
+    QLocale::setDefault(QLocale(locale));
+    QTranslator translator;
+    if(translator.load("DBLParse_" + locale, ":/")) {
+        a.installTranslator(&translator);
     }
 
     MainWindow w;

resources/strings_en-US.js resources/strings_en.jsresources/strings_en-US.js renamed to resources/strings_en.js

@@ -28,6 +28,9 @@ var tr = function(s) {
 Object.defineProperty(window, 'language', {
     get: () => this.m_language,
     set: function(v) {
+        if(v.indexOf('-') != -1) {
+            v = v.split('-')[0];
+        }
         this.m_language = v;
         $.load(`strings_${v}.js`).onload = function() {
             for(let node of $('[tr]')) {

resources/strings_zh-CN.js resources/strings_zh.jsresources/strings_zh-CN.js renamed to resources/strings_zh.js

@@ -2,6 +2,12 @@
 
 #include <QDesktopServices>
 
+WebPage::WebPage(QObject *parent)
+    :QWebEnginePage(parent)
+{
+    
+}
+
 bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType, bool)
 {
 //    qDebug() << url;