From 64da9e932776cae23476b0ee35fccb9f548ae390 Mon Sep 17 00:00:00 2001
From: leca <leca@foxarmy.org>
Date: Thu, 5 Dec 2024 14:53:20 +0300
Subject: [PATCH] fixed language settings

---
 .lupdate/translations/en_US.ts.stamp |  0
 .lupdate/translations/ru_RU.ts.stamp |  0
 main.cpp                             |  4 ----
 settings/settings.cpp                |  1 -
 settingsdialog.cpp                   | 21 ++++++++++++++++++---
 translations/en_US.ts                |  4 ++--
 translations/ru_RU.ts                |  4 ++--
 7 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 .lupdate/translations/en_US.ts.stamp
 create mode 100644 .lupdate/translations/ru_RU.ts.stamp

diff --git a/.lupdate/translations/en_US.ts.stamp b/.lupdate/translations/en_US.ts.stamp
new file mode 100644
index 0000000..e69de29
diff --git a/.lupdate/translations/ru_RU.ts.stamp b/.lupdate/translations/ru_RU.ts.stamp
new file mode 100644
index 0000000..e69de29
diff --git a/main.cpp b/main.cpp
index edd4e1f..e0498fa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -48,16 +48,12 @@ int main(int argc, char *argv[]) {
     QString lang = "en_US";
 
     if (s.get_all_settings().contains("language")) {
-        std::cout << "settings" << std::endl;
         lang = QString::fromStdString(s.get_all_settings()["language"]);
     } else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
-        std::cout << "system" << std::endl;
         lang = QLocale::system().name();
     } else {
-        std::cout << "default" << std::endl;
         lang = QString::fromStdString("en_US");
     }
-    std::cout << lang.toStdString() << std::endl;
     translator.load(":/translation/" + lang + ".qm");
 
     a.installTranslator(&translator);
diff --git a/settings/settings.cpp b/settings/settings.cpp
index bdfa92b..d4f2513 100644
--- a/settings/settings.cpp
+++ b/settings/settings.cpp
@@ -26,7 +26,6 @@ Settings::Settings(std::string path) {
             "stores_modules_url":"https://foxarmy.org/checks-parser/modules/stores/",
             "print_header": true,
             "print_total": true,
-            "language":"en_US",
             "output_order": {
                 "goods_name": {
                     "position":1,
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index 4c06072..f74a101 100644
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -35,8 +35,18 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui->printHeaderCheckBox->setChecked(this->settings.get_all_settings()["print_header"]);
     ui->printTotalCheckBox->setChecked(this->settings.get_all_settings()["print_total"]);
 
-    int index = ui->languageComboBox->findText(QString::fromStdString(this->settings.get_all_settings()["language"]));
-    ui->languageComboBox->setCurrentIndex(index);
+
+    int currentLanguageIndex = 0;
+    if (!this->settings.get_all_settings().contains("language")) {
+        currentLanguageIndex = ui->languageComboBox->findText(QLocale::system().name());
+        if (currentLanguageIndex < 0) {
+            currentLanguageIndex = ui->languageComboBox->findText("en_US");
+        }
+    } else {
+        currentLanguageIndex = ui->languageComboBox->findText(QString::fromStdString(this->settings.get_all_settings()["language"]));
+    }
+    ui->languageComboBox->setCurrentIndex(currentLanguageIndex);
+
 }
 
 SettingsDialog::~SettingsDialog() { delete ui; }
@@ -127,7 +137,12 @@ void SettingsDialog::on_buttonBox_accepted() { this->settings.flush(); }
 void SettingsDialog::on_buttonBox_rejected() { this->close(); }
 
 void SettingsDialog::on_languageComboBox_currentTextChanged(const QString &changed) {
-    if (changed == QString::fromStdString(this->settings.get_all_settings()["language"])) return;
+    if (this->settings.get_all_settings().contains("language")) {
+        if (changed == QString::fromStdString(this->settings.get_all_settings()["language"])) return;
+    } else {
+        if (changed == QLocale::system().name()) return;
+    }
+
     this->settings.get_all_settings()["language"] = changed.toStdString();
 
     QMessageBox infoDialog;
diff --git a/translations/en_US.ts b/translations/en_US.ts
index a6f47fb..5e1a6b4 100644
--- a/translations/en_US.ts
+++ b/translations/en_US.ts
@@ -311,12 +311,12 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="134"/>
+        <location filename="../settingsdialog.cpp" line="149"/>
         <source>You need to restart program to apply language changes</source>
         <translation>You need to restart program to apply language changes</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="136"/>
+        <location filename="../settingsdialog.cpp" line="151"/>
         <source>Restart required</source>
         <translation>Restart required</translation>
     </message>
diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts
index 6b93b4b..1896d6f 100644
--- a/translations/ru_RU.ts
+++ b/translations/ru_RU.ts
@@ -307,12 +307,12 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../settingsdialog.cpp" line="134"/>
+        <location filename="../settingsdialog.cpp" line="149"/>
         <source>You need to restart program to apply language changes</source>
         <translation>Требуется перезагрузить программу, чтобы применить изменения языка</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.cpp" line="136"/>
+        <location filename="../settingsdialog.cpp" line="151"/>
         <source>Restart required</source>
         <translation>Требуется перезагрузка</translation>
     </message>