added i18n for v4

client/CMakeLists.txt

@@ -50,10 +50,30 @@ endif()
 
 qt6_add_resources(QRC ${QRC} ${CMAKE_CURRENT_LIST_DIR}/resources.qrc)
 
-qt6_add_translations(${PROJECT} TS_FILES
+set(AMNEZIAVPN_TR_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
+    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
 )
 
+file(GLOB_RECURSE AMNEZIAVPN_TR_SOURCES *.qrc *.cpp *.h *.ui)
+if ( BUILD_TRANSLATIONS )
+    qt_create_translation(AMNEZIAVPN_MESSAGES ${AMNEZIAVPN_TR_SOURCES} ${AMNEZIAVPN_TR_FILES})
+    qt_add_translation(AMNEZIAVPN_QM_FILES ${AMNEZIAVPN_TR_FILES})
+    add_custom_target(amnezia_messages DEPENDS ${AMNEZIAVPN_MESSAGES})
+    add_custom_target(amnezia_translations DEPENDS ${AMNEZIAVPN_QM_FILES} amnezia_messages)
+    add_dependencies(${PROJECT} amnezia_translations)
+
+    if (BUILD_TRANSLATIONS_AS_RESOURCES)
+        set(QM_FILE_LIST "")
+        foreach(FILE ${AMNEZIAVPN_QM_FILES})
+            list(APPEND QM_FILE_LIST "<file>${FILE}</file>")
+        endforeach()
+        string(REPLACE ";" "" QM_FILE_LIST ${QM_FILE_LIST})
+        configure_file(${CMAKE_CURRENT_LIST_DIR}/translations/translations.qrc ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
+        target_sources(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/translations.qrc)
+    endif()
+endif( BUILD_TRANSLATIONS )
+
 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

client/amnezia_application.cpp

@@ -221,27 +221,21 @@ 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"))) {
+    m_settings->setAppLanguage(locale);
+
+    QString strFileName = QString("amneziavpn")+QLatin1String("_")+locale.name()+".qm";
+    if (m_translator->load(strFileName, "../../../")) {
         if (QCoreApplication::installTranslator(m_translator.get())) {
             m_settings->setAppLanguage(locale);
         }

client/main.cpp

@@ -53,13 +53,13 @@ int main(int argc, char *argv[])
     app.setOrganizationName(ORGANIZATION_NAME);
     app.setApplicationDisplayName(APPLICATION_NAME);
 
-    app.loadTranslator();
     app.loadFonts();
 
     bool doExec = app.parseCommands();
 
     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());

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;