Merge pull request #353 from amnezia-vpn/feature/added_i18n_for_v4

added i18n for v4

client/CMakeLists.txt

@@ -50,10 +50,29 @@ endif()
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 
-qt6_add_translations(${PROJECT} TS_FILES
+# -- i18n begin
+set(CMAKE_AUTORCC ON)
+
+set(AMNEZIAVPN_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
+    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
 )
 
+file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
+
+qt_create_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TS_SOURCES} ${AMNEZIAVPN_TS_FILES})
+
+set(QM_FILE_LIST "")
+foreach(FILE ${AMNEZIAVPN_QM_FILES})
+    get_filename_component(QM_FILE_NAME ${FILE} NAME)
+    list(APPEND QM_FILE_LIST "<file>${QM_FILE_NAME}</file>")
+endforeach()
+string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
+
+configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
+qt6_add_resources(QRC ${I18NQRC} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
+# -- i18n end
+
 if(IOS)
     #execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/scripts/run-build-cloak.sh)
     execute_process(COMMAND bash ${CMAKE_CURRENT_LIST_DIR}/ios/scripts/openvpn.sh args
@@ -322,5 +341,5 @@ if(NOT IOS AND NOT ANDROID)
 
 endif()
 
-target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
+target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC})
 qt_finalize_target(${PROJECT})

client/amnezia_application.cpp

@@ -87,6 +87,7 @@ void AmneziaApplication::init()
     m_vpnConnectionThread.start();
 
     initModels();
+    loadTranslator();
     initControllers();
 
 #ifdef Q_OS_ANDROID
@@ -138,6 +139,7 @@ void AmneziaApplication::init()
             &ConnectionController::openConnection);
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
+    connect(this, &AmneziaApplication::translationsUpdated, m_notificationHandler.get(),  &NotificationHandler::onTranslationsUpdated);
 
     m_engine->load(url);
     m_systemController->setQmlRoot(m_engine->rootObjects().value(0));
@@ -221,34 +223,27 @@ void AmneziaApplication::loadTranslator()
 {
     auto locale = m_settings->getAppLanguage();
     m_translator.reset(new QTranslator());
-    if (locale != QLocale::English) {
+    updateTranslator(locale);
-        if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
-            if (QCoreApplication::installTranslator(m_translator.get())) {
-                m_settings->setAppLanguage(locale);
-            }
-        }
-    }
 }
 
+
 void AmneziaApplication::updateTranslator(const QLocale &locale)
 {
-    QResource::registerResource(":/translations.qrc");
+    if (!m_translator->isEmpty()) {
-    if (!m_translator->isEmpty())
         QCoreApplication::removeTranslator(m_translator.get());
-
-    if (locale == QLocale::English) {
-        m_settings->setAppLanguage(locale);
-        m_engine->retranslate();
     }
 
-    if (m_translator->load(locale, QString("amneziavpn"), QLatin1String("_"), QLatin1String(":/i18n"))) {
+    QString strFileName = QString(":/translations/amneziavpn")+QLatin1String("_")+locale.name()+".qm";
+    if (m_translator->load(strFileName)) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }
-
+    } else {
-        m_engine->retranslate();
+        m_settings->setAppLanguage(QLocale::English);
     }
 
+    m_engine->retranslate();
+
     emit translationsUpdated();
 }
 
@@ -335,6 +330,8 @@ void AmneziaApplication::initControllers()
     m_connectionController.reset(new ConnectionController(m_serversModel, m_containersModel, m_vpnConnection));
     m_engine->rootContext()->setContextProperty("ConnectionController", m_connectionController.get());
 
+    connect(this, &AmneziaApplication::translationsUpdated, m_connectionController.get(), &ConnectionController::onTranslationsUpdated);
+
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 

client/main.cpp

@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
     app.setOrganizationName(ORGANIZATION_NAME);
     app.setApplicationDisplayName(APPLICATION_NAME);
 
-    app.loadTranslator();
     app.loadFonts();
 
     bool doExec = app.parseCommands();

client/translations/translations.qrc.in

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/translations">
+				@QM_FILE_LIST@
+    </qresource>
+</RCC>

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;
 }
 
 void ConnectionController::openConnection()
@@ -53,6 +55,8 @@ QString ConnectionController::getLastConnectionError()
 
 void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
 {
+    m_state = state;
+
     m_isConnected = false;
     m_connectionStateText = tr("Connection...");
     switch (state) {
@@ -109,6 +113,17 @@ void ConnectionController::onCurrentContainerUpdated()
     }
 }
 
+void ConnectionController::onTranslationsUpdated()
+{
+    // get translated text of current state
+    onConnectionStateChanged(getCurrentConnectionState());
+}
+
+Vpn::ConnectionState ConnectionController::getCurrentConnectionState()
+{
+    return m_state;
+}
+
 QString ConnectionController::connectionStateText() const
 {
     return m_connectionStateText;

client/ui/controllers/connectionController.h

@@ -34,6 +34,8 @@ public slots:
 
     void onCurrentContainerUpdated();
 
+    void onTranslationsUpdated();
+
 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

client/ui/controllers/installController.cpp

@@ -107,10 +107,9 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(m_currentlyInstalledServerCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
     } else {
-        finishMessage =
+        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
-                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
     if (installedContainers.size() > 1) {
         finishMessage += tr("\nAdded containers that were already installed on the server");
@@ -159,10 +158,9 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
     if (!installedContainers.contains(container)) {
         errorCode = serverController.setupContainer(serverCredentials, container, config);
         installedContainers.insert(container, config);
-        finishMessage = ContainerProps::containerHumanNames().value(container) + tr(" installed successfully. ");
+        finishMessage = tr("%1 installed successfully. ").arg(ContainerProps::containerHumanNames().value(container));
     } else {
-        finishMessage =
+        finishMessage = tr("%1 is already installed on the server. ").arg(ContainerProps::containerHumanNames().value(container));
-                ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
     }
 
     bool isInstalledContainerAddedToGui = false;
@@ -277,7 +275,7 @@ void InstallController::removeCurrentlyProcessedServer()
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     m_serversModel->removeServer();
-    emit removeCurrentlyProcessedServerFinished(tr("Server '") + serverName + tr("' was removed"));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
 }
 
 void InstallController::removeAllContainers()
@@ -287,7 +285,7 @@ void InstallController::removeAllContainers()
 
     ErrorCode errorCode = m_containersModel->removeAllContainers();
     if (errorCode == ErrorCode::NoError) {
-        emit removeAllContainersFinished(tr("All containers from server '") + serverName + ("' have been removed"));
+        emit removeAllContainersFinished(tr("All containers from server '%1' have been removed").arg(serverName));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));
@@ -303,8 +301,8 @@ void InstallController::removeCurrentlyProcessedContainer()
 
     ErrorCode errorCode = m_containersModel->removeCurrentlyProcessedContainer();
     if (errorCode == ErrorCode::NoError) {
-        emit removeCurrentlyProcessedContainerFinished(containerName + tr(" has been removed from the server '")
+
-                                                       + serverName + "'");
+        emit removeCurrentlyProcessedContainerFinished(tr("%1 has been removed from the server '%2'").arg(containerName).arg(serverName));
         return;
     }
     emit installationErrorOccurred(errorString(errorCode));

client/ui/controllers/sitesController.cpp

@@ -64,7 +64,7 @@ void SitesController::addSite(QString hostname)
         QHostInfo::lookupHost(hostname, this, resolveCallback);
     }
 
-    emit finished(tr("New site added: ") + hostname);
+    emit finished(tr("New site added: %1").arg(hostname));
 }
 
 void SitesController::removeSite(int index)
@@ -77,7 +77,7 @@ void SitesController::removeSite(int index)
                               Q_ARG(QStringList, QStringList() << hostname));
     QMetaObject::invokeMethod(m_vpnConnection.get(), "flushDns", Qt::QueuedConnection);
 
-    emit finished(tr("Site removed: ") + hostname);
+    emit finished(tr("Site removed: %1").arg(hostname));
 }
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
@@ -85,19 +85,19 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)
     QFile file(fileName);
 
     if (!file.open(QIODevice::ReadOnly)) {
-        emit errorOccurred(tr("Can't open file: ") + fileName);
+        emit errorOccurred(tr("Can't open file: %1").arg(fileName));
         return;
     }
 
     QByteArray jsonData = file.readAll();
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
     if (jsonDocument.isNull()) {
-        emit errorOccurred(tr("Failed to parse JSON data from file: ") + fileName);
+        emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
         return;
     }
 
     if (!jsonDocument.isArray()) {
-        emit errorOccurred(tr("The JSON data is not an array in file: ") + fileName);
+        emit errorOccurred(tr("The JSON data is not an array in file: ").arg(fileName));
         return;
     }
 

client/ui/models/languageModel.cpp

@@ -6,7 +6,8 @@ LanguageModel::LanguageModel(std::shared_ptr<Settings> settings, QObject *parent
     QMetaEnum metaEnum = QMetaEnum::fromType<LanguageSettings::AvailableLanguageEnum>();
     for (int i = 0; i < metaEnum.keyCount(); i++) {
         m_availableLanguages.push_back(
-                LanguageModelData { metaEnum.valueToKey(i), static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
+            LanguageModelData {getLocalLanguageName(static_cast<LanguageSettings::AvailableLanguageEnum>(i)),
+                              static_cast<LanguageSettings::AvailableLanguageEnum>(i) });
     }
 }
 
@@ -36,11 +37,26 @@ QHash<int, QByteArray> LanguageModel::roleNames() const
     return roles;
 }
 
+QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language)
+{
+    QString strLanguage("");
+    switch (language) {
+    case LanguageSettings::AvailableLanguageEnum::English: strLanguage = "English"; break;
+    case LanguageSettings::AvailableLanguageEnum::Russian: strLanguage = "Русский"; break;
+    case LanguageSettings::AvailableLanguageEnum::China_cn: strLanguage = "\347\256\200\344\275\223\344\270\255\346\226\207"; break;
+    default:
+        break;
+    }
+
+    return strLanguage;
+}
+
 void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum language)
 {
     switch (language) {
     case LanguageSettings::AvailableLanguageEnum::English: emit updateTranslations(QLocale::English); break;
     case LanguageSettings::AvailableLanguageEnum::Russian: emit updateTranslations(QLocale::Russian); break;
+    case LanguageSettings::AvailableLanguageEnum::China_cn: emit updateTranslations(QLocale::Chinese); break;
     default: emit updateTranslations(QLocale::English); break;
     }
 }
@@ -51,6 +67,7 @@ int LanguageModel::getCurrentLanguageIndex()
     switch (locale.language()) {
     case QLocale::English: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     case QLocale::Russian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Russian); break;
+    case QLocale::Chinese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::China_cn); break;
     default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     }
 }

client/ui/models/languageModel.h

@@ -11,7 +11,8 @@ namespace LanguageSettings
     Q_NAMESPACE
     enum class AvailableLanguageEnum {
         English,
-        Russian
+        Russian,
+        China_cn
     };
     Q_ENUM_NS(AvailableLanguageEnum)
 
@@ -59,6 +60,8 @@ protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
+    QString getLocalLanguageName(const LanguageSettings::AvailableLanguageEnum language);
+
     QVector<LanguageModelData> m_availableLanguages;
 
     std::shared_ptr<Settings> m_settings;

client/ui/notificationhandler.cpp

@@ -88,6 +88,10 @@ void NotificationHandler::setConnectionState(Vpn::ConnectionState state)
     }
 }
 
+void NotificationHandler::onTranslationsUpdated()
+{
+}
+
 void NotificationHandler::unsecuredNetworkNotification(const QString& networkName) {
     qDebug() << "Unsecured network notification shown";
 

client/ui/notificationhandler.h

@@ -32,6 +32,7 @@ public:
 
 public slots:
     virtual void setConnectionState(Vpn::ConnectionState state);
+    virtual void onTranslationsUpdated();
 
 signals:
     void notificationShown(const QString& title, const QString& message);

client/ui/qml/Pages2/PageDeinstalling.qml

@@ -59,7 +59,7 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 20
 
-                            headerText: qsTr("Removing services from ") + name
+                            headerText: qsTr("Removing services from %1").arg(name)
                         }
 
                         ProgressBarType {

client/ui/qml/Pages2/PageProtocolRaw.qml

@@ -173,7 +173,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")

client/ui/qml/Pages2/PageServiceDnsSettings.qml

@@ -63,7 +63,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")
 

client/ui/qml/Pages2/PageSettingsConnection.qml

@@ -66,7 +66,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.margins: 16
 
-                text: qsTr("Use AmneziaDNS if installed on the server")
+                text: qsTr("Use AmneziaDNS")
+                descriptionText: qsTr("If AmneziaDNS is installed on the server")
 
                 checked: SettingsController.isAmneziaDnsEnabled()
                 onCheckedChanged: {

client/ui/qml/Pages2/PageSettingsDns.qml

@@ -53,7 +53,7 @@ PageType {
                 id: primaryDns
 
                 Layout.fillWidth: true
-                headerText: "Primary DNS"
+                headerText: qsTr("Primary DNS")
 
                 textFieldText: SettingsController.primaryDns
                 textField.validator: RegularExpressionValidator {
@@ -65,7 +65,7 @@ PageType {
                 id: secondaryDns
 
                 Layout.fillWidth: true
-                headerText: "Secondary DNS"
+                headerText: qsTr("Secondary DNS")
 
                 textFieldText: SettingsController.secondaryDns
                 textField.validator: RegularExpressionValidator {

client/ui/qml/Pages2/PageSettingsLogging.qml

@@ -105,7 +105,7 @@ PageType {
                             if (GC.isMobile()) {
                                 fileName = "AmneziaVPN.log"
                             } else {
-                                fileName = SystemController.getFileName(qsTr("Save logs"),
+                                fileName = SystemController.getFileName(qsTr("Save"),
                                                                         qsTr("Logs files (*.log)"),
                                                                         StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
                                                                         true,

client/ui/qml/Pages2/PageSettingsServerProtocol.qml

@@ -113,7 +113,7 @@ PageType {
                 textColor: "#EB5757"
 
                 clickedFunction: function() {
-                    questionDrawer.headerText = qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() + qsTr(" from server?")
+                    questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
                     questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
                     questionDrawer.yesButtonText = qsTr("Continue")
                     questionDrawer.noButtonText = qsTr("Cancel")

client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml

@@ -72,7 +72,7 @@ PageType {
 
                             Layout.fillWidth: true
 
-                            headerText: qsTr("Installing ") + name
+                            headerText: qsTr("Installing %1").arg(name)
                             descriptionText: description
                         }
 

client/ui/systemtray_notificationhandler.cpp

@@ -17,7 +17,6 @@
 
 #include "version.h"
 
-
 SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     NotificationHandler(parent),
     m_systemTrayIcon(parent)
@@ -26,8 +25,7 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     m_systemTrayIcon.show();
     connect(&m_systemTrayIcon, &QSystemTrayIcon::activated, this, &SystemTrayNotificationHandler::onTrayActivated);
 
-
+    m_trayActionShow =  m_menu.addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){
-    m_menu.addAction(QIcon(":/images/tray/application.png"), tr("Show") + " " + APPLICATION_NAME, this, [this](){
         emit raiseRequested();
     });
     m_menu.addSeparator();
@@ -36,11 +34,11 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
 
     m_menu.addSeparator();
 
-    m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
+    m_trayActionVisitWebSite = m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
         QDesktopServices::openUrl(QUrl("https://amnezia.org"));
     });
 
-    m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
+    m_trayActionQuit = m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
         qApp->quit();
     });
 
@@ -57,6 +55,15 @@ void SystemTrayNotificationHandler::setConnectionState(Vpn::ConnectionState stat
     NotificationHandler::setConnectionState(state);
 }
 
+void SystemTrayNotificationHandler::onTranslationsUpdated()
+{
+    m_trayActionShow->setText(tr("Show") + " " + APPLICATION_NAME);
+    m_trayActionConnect->setText(tr("Connect"));
+    m_trayActionDisconnect->setText(tr("Disconnect"));
+    m_trayActionVisitWebSite->setText(tr("Visit Website"));
+    m_trayActionQuit->setText(tr("Quit")+ " " + APPLICATION_NAME);
+}
+
 void SystemTrayNotificationHandler::setTrayIcon(const QString &iconPath)
 {
     QIcon trayIconMask(QPixmap(iconPath).scaled(128,128));

client/ui/systemtray_notificationhandler.h

@@ -19,6 +19,8 @@ public:
 
     void setConnectionState(Vpn::ConnectionState state) override;
 
+    void onTranslationsUpdated() override;
+
 protected:
     virtual void notify(Message type, const QString& title,
                         const QString& message, int timerMsec) override;
@@ -35,9 +37,11 @@ private:
     QMenu m_menu;
     QSystemTrayIcon m_systemTrayIcon;
 
+    QAction* m_trayActionShow = nullptr;
     QAction* m_trayActionConnect = nullptr;
     QAction* m_trayActionDisconnect = nullptr;
-    QAction* m_preferencesAction = nullptr;
+    QAction* m_trayActionVisitWebSite = nullptr;
+    QAction* m_trayActionQuit = nullptr;
     QAction* m_statusLabel = nullptr;    
     QAction* m_separator = nullptr;