From eaede032b4fe3ab940a22aad456aea0063a77584 Mon Sep 17 00:00:00 2001
From: ronoaer <ronoaer@gmail.com>
Date: Sun, 1 Oct 2023 11:12:27 +0800
Subject: [PATCH] 1. updated memory text when language changed, 2. updated
 initialize index

---
 client/amnezia_application.cpp                 |  9 +++++----
 client/main.cpp                                |  1 -
 client/ui/controllers/connectionController.cpp | 14 ++++++++++++++
 client/ui/controllers/connectionController.h   |  6 ++++++
 client/ui/qml/Pages2/PageStart.qml             |  2 ++
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 41a541ac..01b37229 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -87,6 +87,7 @@ void AmneziaApplication::init()
     m_vpnConnectionThread.start();
 
     initModels();
+    loadTranslator();
     initControllers();
 
 #ifdef Q_OS_ANDROID
@@ -231,17 +232,17 @@ void AmneziaApplication::updateTranslator(const QLocale &locale)
         QCoreApplication::removeTranslator(m_translator.get());
     }
 
-    m_settings->setAppLanguage(locale);
-
     QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
     if (m_translator->load(strFileName)) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
-
-        m_engine->retranslate();
+    } else {
+        m_settings->setAppLanguage(QLocale::English);
     }
 
+    m_engine->retranslate();
+
     emit translationsUpdated();
 }
 
diff --git a/client/main.cpp b/client/main.cpp
index 53c3238f..396b7625 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
 
     if (doExec) {
         app.init();
-        app.loadTranslator();
 
         qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
         qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 77ca0f5f..8df62a94 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -19,6 +19,8 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
             Qt::QueuedConnection);
     connect(this, &ConnectionController::disconnectFromVpn, m_vpnConnection.get(), &VpnConnection::disconnectFromVpn,
             Qt::QueuedConnection);
+
+    m_state = Vpn::ConnectionState::Disconnected;
 }
 
 ConnectionController::~ConnectionController()
@@ -70,6 +72,8 @@ QString ConnectionController::getLastConnectionError()
 
 void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
 {
+    m_state = state;
+
     m_isConnected = false;
     m_connectionStateText = tr("Connection...");
     switch (state) {
@@ -126,6 +130,16 @@ void ConnectionController::onCurrentContainerUpdated()
     }
 }
 
+void ConnectionController::translateMemoryText()
+{
+    onConnectionStateChanged(getCurrentConnectionState());
+}
+
+Vpn::ConnectionState ConnectionController::getCurrentConnectionState()
+{
+    return m_state;
+}
+
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;
diff --git a/client/ui/controllers/connectionController.h b/client/ui/controllers/connectionController.h
index 7bfe0fac..c1eaf38f 100644
--- a/client/ui/controllers/connectionController.h
+++ b/client/ui/controllers/connectionController.h
@@ -34,6 +34,8 @@ public slots:
 
     void onCurrentContainerUpdated();
 
+    void translateMemoryText();
+
 signals:
     void connectToVpn(int serverIndex, const ServerCredentials &credentials, DockerContainer container,
                       const QJsonObject &containerConfig);
@@ -44,6 +46,8 @@ signals:
     void reconnectWithUpdatedContainer(const QString &message);
 
 private:
+    Vpn::ConnectionState getCurrentConnectionState();
+
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
 
@@ -52,6 +56,8 @@ private:
     bool m_isConnected = false;
     bool m_isConnectionInProgress = false;
     QString m_connectionStateText = tr("Connect");
+
+    Vpn::ConnectionState m_state;
 };
 
 #endif // CONNECTIONCONTROLLER_H
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 43366af7..f36aac41 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -171,6 +171,8 @@ PageType {
             onClicked: {
                 tabBarStackView.goToTabBarPage(PageEnum.PageHome)
                 ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
+
+                ConnectionController.translateMemoryText()
             }
         }
         TabImageButtonType {