github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 10:50:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Sharing and Language Installer fixes #121

Browse Source 
Former-commit-id: 0eca6c2260
This commit is contained in:
Leroy.H.Y 2019-11-27 13:22:07 +08:00
parent cce21216a4
commit 1d03f64372
4 changed files with 502 additions and 500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build.Counter
View File

@ -1 +1 @@
918 928

4
src/main.cpp
View File

@ -218,8 +218,10 @@ int main(int argc, char *argv[])
auto confObject = StructFromJsonString<Qv2rayConfig>(JsonToString(conf)); auto confObject = StructFromJsonString<Qv2rayConfig>(JsonToString(conf));
SetGlobalConfig(confObject); SetGlobalConfig(confObject);
qApp->removeTranslator(getTranslator(_lang));
LOG(MODULE_INIT, "Removing system translations")
if (qApp->installTranslator(getTranslator(QSTRING(confObject.uiConfig.language))) || confObject.uiConfig.language == "en-US") { if (qApp->installTranslator(getTranslator(QSTRING(confObject.uiConfig.language)))) {
LOG(MODULE_INIT, "Loaded Translator " + confObject.uiConfig.language) LOG(MODULE_INIT, "Loaded Translator " + confObject.uiConfig.language)
} else { } else {
// Do not translate these..... // Do not translate these.....

2
src/ui/w_MainWindow.cpp
View File

@ -799,7 +799,7 @@ void MainWindow::on_shareBtn_clicked()
auto outBoundRoot = root["outbounds"].toArray().first().toObject(); auto outBoundRoot = root["outbounds"].toArray().first().toObject();
auto outboundType = outBoundRoot["protocol"].toString(); auto outboundType = outBoundRoot["protocol"].toString();
if (CheckIsComplexConfig(root) && outboundType == "vmess") { if (!CheckIsComplexConfig(root) && outboundType == "vmess") {
auto vmessServer = StructFromJsonString<VMessServerObject>(JsonToString(outBoundRoot["settings"].toObject()["vnext"].toArray().first().toObject())); auto vmessServer = StructFromJsonString<VMessServerObject>(JsonToString(outBoundRoot["settings"].toObject()["vnext"].toArray().first().toObject()));
auto transport = StructFromJsonString<StreamSettingsObject>(JsonToString(outBoundRoot["streamSettings"].toObject())); auto transport = StructFromJsonString<StreamSettingsObject>(JsonToString(outBoundRoot["streamSettings"].toObject()));
auto vmess = ConvertConfigToVMessString(transport, vmessServer, alias); auto vmess = ConvertConfigToVMessString(transport, vmessServer, alias);

994
translations/en-US.ts
View File

File diff suppressed because it is too large Load Diff