mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-10-27 15:18:44 +09:00
Compare commits
2
Commits
chore/minor-fixes
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3121775a6f | ||
|
|
3977447d4a |
No files matched your search
@@ -104,6 +104,7 @@ else()
|
||||
${CMAKE_CURRENT_LIST_DIR}/translations/${CLIENT_TS_PREFIX}_ko_KR.ts
|
||||
${CMAKE_CURRENT_LIST_DIR}/translations/${CLIENT_TS_PREFIX}_fr_FR.ts
|
||||
${CMAKE_CURRENT_LIST_DIR}/translations/${CLIENT_TS_PREFIX}_th_TH.ts
|
||||
${CMAKE_CURRENT_LIST_DIR}/translations/${CLIENT_TS_PREFIX}_id_ID.ts
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -779,8 +779,11 @@ void ImportController::processAmneziaConfig(QJsonObject &config) const
|
||||
}
|
||||
|
||||
QJsonObject jsonConfig = QJsonDocument::fromJson(protocolConfig.toUtf8()).object();
|
||||
jsonConfig[configKey::mtu] =
|
||||
ContainerUtils::isAwgContainer(dockerContainer) ? protocols::awg::defaultMtu : protocols::wireguard::defaultMtu;
|
||||
if (jsonConfig.value(configKey::mtu).toString().trimmed().isEmpty()) {
|
||||
jsonConfig[configKey::mtu] = ContainerUtils::isAwgContainer(dockerContainer)
|
||||
? protocols::awg::defaultMtu
|
||||
: protocols::wireguard::defaultMtu;
|
||||
}
|
||||
|
||||
containerConfig[configKey::lastConfig] = QString(QJsonDocument(jsonConfig).toJson());
|
||||
|
||||
@@ -790,4 +793,3 @@ void ImportController::processAmneziaConfig(QJsonObject &config) const
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -33,6 +33,7 @@ int LanguageUiController::getCurrentLanguageIndex() const
|
||||
case QLocale::Spanish: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Spanish); break;
|
||||
case QLocale::French: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::French); break;
|
||||
case QLocale::Thai: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Thai); break;
|
||||
case QLocale::Indonesian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Indonesian); break;
|
||||
default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
|
||||
}
|
||||
}
|
||||
@@ -69,6 +70,7 @@ LanguageSettings::AvailableLanguageEnum LanguageUiController::getSystemLanguageE
|
||||
case QLocale::Spanish: return LanguageSettings::AvailableLanguageEnum::Spanish;
|
||||
case QLocale::French: return LanguageSettings::AvailableLanguageEnum::French;
|
||||
case QLocale::Thai: return LanguageSettings::AvailableLanguageEnum::Thai;
|
||||
case QLocale::Indonesian: return LanguageSettings::AvailableLanguageEnum::Indonesian;
|
||||
default: return LanguageSettings::AvailableLanguageEnum::English;
|
||||
}
|
||||
}
|
||||
@@ -117,6 +119,7 @@ QString LanguageUiController::getLocalLanguageName(const LanguageSettings::Avail
|
||||
case LanguageSettings::AvailableLanguageEnum::Spanish: strLanguage = "Español"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::French: strLanguage = "Français"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::Thai: strLanguage = "ไทย"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::Indonesian: strLanguage = "Bahasa Indonesia"; break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
@@ -139,6 +142,7 @@ QLocale LanguageUiController::languageEnumToLocale(const LanguageSettings::Avail
|
||||
case LanguageSettings::AvailableLanguageEnum::Spanish: return QLocale::Spanish;
|
||||
case LanguageSettings::AvailableLanguageEnum::French: return QLocale::French;
|
||||
case LanguageSettings::AvailableLanguageEnum::Thai: return QLocale::Thai;
|
||||
case LanguageSettings::AvailableLanguageEnum::Indonesian: return QLocale::Indonesian;
|
||||
default: return QLocale::English;
|
||||
}
|
||||
}
|
||||
@@ -52,6 +52,7 @@ QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLan
|
||||
case LanguageSettings::AvailableLanguageEnum::Korean: strLanguage = "한국어"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::French: strLanguage = "Français"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::Thai: strLanguage = "ไทย"; break;
|
||||
case LanguageSettings::AvailableLanguageEnum::Indonesian: strLanguage = "Bahasa Indonesia"; break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,8 @@ namespace LanguageSettings
|
||||
Spanish,
|
||||
Korean,
|
||||
French,
|
||||
Thai
|
||||
Thai,
|
||||
Indonesian
|
||||
};
|
||||
Q_ENUM_NS(AvailableLanguageEnum)
|
||||
|
||||
|
||||
Reference in new issue
Block a user