diff --git a/src/lang.rs b/src/lang.rs
index 4b4998fc1..b37c4beb6 100644
--- a/src/lang.rs
+++ b/src/lang.rs
@@ -1,21 +1,43 @@
+use serde_json::{json, value::Value};
use std::ops::Deref;
mod cn;
mod cs;
mod da;
-mod sk;
mod de;
mod en;
-mod es;
mod eo;
+mod es;
mod fr;
mod id;
mod it;
mod ptbr;
mod ru;
+mod sk;
mod tr;
mod tw;
+lazy_static::lazy_static! {
+ pub static ref LANGS: Value =
+ json!(vec![
+ ("en", "English"),
+ ("it", "Italiano"),
+ ("fr", "Français"),
+ ("de", "Deutsch"),
+ ("cn", "简体中文"),
+ ("tw", "繁體中文"),
+ ("pt", "Português"),
+ ("es", "Español"),
+ ("ru", "Русский"),
+ ("sk", "Slovenčina"),
+ ("id", "Indonesia"),
+ ("cs", "Čeština"),
+ ("da", "Dansk"),
+ ("eo", "Esperanto"),
+ ("tr", "Türkçe"),
+ ]);
+}
+
#[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn translate(name: String) -> String {
let locale = sys_locale::get_locale().unwrap_or_default().to_lowercase();
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index a09ab8d39..606f2a6e7 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "退出"),
("In privacy mode", "进入隐私模式"),
("Out privacy mode", "退出隐私模式"),
+ ("Language", "语言"),
].iter().cloned().collect();
}
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index 80e1568eb..696eabe2a 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Vypnutý"),
("In privacy mode", "v režimu soukromí"),
("Out privacy mode", "mimo režim soukromí"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/da.rs b/src/lang/da.rs
index 429b08b05..da191e8c1 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Slukket"),
("In privacy mode", "I databeskyttelsestilstand"),
("Out privacy mode", "Databeskyttelsestilstand fra"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/de.rs b/src/lang/de.rs
index 8bbfbb4c4..0307501b2 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Ausgeschaltet"),
("In privacy mode", "im Datenschutzmodus"),
("Out privacy mode", "Datenschutzmodus aus"),
+ ("Language", "Sprache"),
].iter().cloned().collect();
}
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index 49c9f38fa..75f3bc084 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", ""),
("In privacy mode", ""),
("Out privacy mode", ""),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/es.rs b/src/lang/es.rs
index ba4c671a8..f55071fda 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Apagado"),
("In privacy mode", "En modo de privacidad"),
("Out privacy mode", "Fuera del modo de privacidad"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index d2d41c550..64500f9a6 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Éteindre"),
("In privacy mode", "en mode privé"),
("Out privacy mode", "hors mode de confidentialité"),
+ ("Language", "Langue"),
].iter().cloned().collect();
}
diff --git a/src/lang/id.rs b/src/lang/id.rs
index 2e2f2fd1c..d3da71833 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -158,7 +158,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Allow using clipboard", "Izinkan menggunakan papan klip"),
("Allow hearing sound", "Izinkan mendengarkan suara"),
("Allow file copy and paste", "Izinkan penyalinan dan tempel file"),
- ("File transfer", "Transfer file"),
("Connected", "Terkoneksi"),
("Direct and encrypted connection", "Koneksi langsung dan terenkripsi"),
("Relayed and encrypted connection", "Koneksi relai dan terenkripsi"),
@@ -280,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Matikan"),
("In privacy mode", "Dalam mode privasi"),
("Out privacy mode", "Keluar dari mode privasi"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/it.rs b/src/lang/it.rs
index 4bf692169..fa4c99e84 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Spegni"),
("In privacy mode", "In modalità privacy"),
("Out privacy mode", "Fuori modalità privacy"),
+ ("Language", "Linguaggio"),
].iter().cloned().collect();
}
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index e51d5f5f9..6ff30a3cd 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Desligado"),
("In privacy mode", "No modo de privacidade"),
("Out privacy mode", "Fora do modo de privacidade"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index 88245b1d0..a50563674 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -263,9 +263,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("android_version_audio_tip", "Текущая версия Android не поддерживает захват звука, обновите ее до Android 10 или выше."),
("android_start_service_tip", "Нажмите [Запуск промежуточного сервера] или ОТКРЫТЬ разрешение [Захват экрана], чтобы запустить службу демонстрации экрана."),
("Account", "Аккаунт"),
- ("Quit", "Выйти"),
("Overwrite", "Перезаписать"),
("This file exists, skip or overwrite this file?", "Этот файл существует, пропустить или перезаписать этот файл?"),
+ ("Quit", "Выйти"),
("doc_mac_permission", "https://rustdesk.com/docs/ru/manual/mac/#включение-разрешений"),
("Help", "Помощь"),
("Failed", "Неуспешный"),
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Выключен"),
("In privacy mode", "В режиме конфиденциальности"),
("Out privacy mode", "Выход из режима конфиденциальности"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index 6cea1479b..252faaf17 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Vypnutý"),
("In privacy mode", "V režime súkromia"),
("Out privacy mode", "Mimo režimu súkromia"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/template.rs b/src/lang/template.rs
index 91c572e44..6ad92db6e 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -264,7 +264,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("android_start_service_tip", ""),
("Account", ""),
("Overwrite", ""),
- ("This file exists, skip or overwrite this file?", "")
+ ("This file exists, skip or overwrite this file?", ""),
("Quit", ""),
("doc_mac_permission", ""),
("Help", ""),
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", ""),
("In privacy mode", ""),
("Out privacy mode", ""),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index d82901298..37502567c 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -279,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "Kapalı"),
("In privacy mode", "Gizlilik modunda"),
("Out privacy mode", "Gizlilik modu dışında"),
+ ("Language", ""),
].iter().cloned().collect();
}
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index 2de3f4414..0d81d7a8b 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -262,13 +262,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("android_stop_service_tip", "關閉服務將自動關閉所有已建立的連接。"),
("android_version_audio_tip", "目前的 Android 版本不支持音訊錄製，請升級至 Android 10 或以上版本。"),
("android_start_service_tip", "點擊 ｢啟動服務｣ 或啟用 ｢畫面錄製｣ 權限以開啟手機畫面共享服務。"),
- ("Account", "帳號"),
- ("Quit", "退出"),
+ ("Account", "帳戶"),
("Overwrite", "覆寫"),
("This file exists, skip or overwrite this file?", "此檔案/資料夾已存在，要跳過或是覆寫此檔案嗎？"),
+ ("Quit", "退出"),
("doc_mac_permission", "https://rustdesk.com/docs/zh-tw/manual/mac/#啟用權限"),
("Help", "幫助"),
- ("Account", "帳戶"),
("Failed", "失敗"),
("Succeeded", "成功"),
("Someone turns on privacy mode, exit", "其他用戶開啟隱私模式，退出"),
@@ -280,5 +279,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Turned off", "退出"),
("In privacy mode", "開啟隱私模式"),
("Out privacy mode", "退出隱私模式"),
+ ("Language", "語言"),
].iter().cloned().collect();
}
diff --git a/src/ui.rs b/src/ui.rs
index b93c11d44..fc56d437c 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -3,9 +3,9 @@ mod cm;
mod inline;
#[cfg(target_os = "macos")]
mod macos;
+pub mod remote;
#[cfg(target_os = "windows")]
pub mod win_privacy;
-pub mod remote;
use crate::common::SOFTWARE_UPDATE_URL;
use crate::ipc;
use hbb_common::{
@@ -702,7 +702,7 @@ impl UI {
let p = "explorer";
#[cfg(target_os = "macos")]
let p = "open";
- #[cfg(target_os = "linux")]
+ #[cfg(target_os = "linux")]
let p = if std::path::Path::new("/usr/bin/firefox").exists() {
"firefox"
} else {
@@ -753,6 +753,10 @@ impl UI {
self.get_option_("custom-rendezvous-server"),
)
}
+
+ fn get_langs(&self) -> String {
+ crate::lang::LANGS.to_string()
+ }
}
impl sciter::EventHandler for UI {
@@ -829,6 +833,7 @@ impl sciter::EventHandler for UI {
fn discover();
fn get_lan_peers();
fn get_uuid();
+ fn get_langs();
}
}
diff --git a/src/ui/index.tis b/src/ui/index.tis
index 70cc8f870..34ae91fac 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -163,8 +163,43 @@ class AudioInputs: Reactor.Component {
}
this.toggleMenuState();
}
+};
+
+class Languages: Reactor.Component {
+ function render() {
+ var langs = JSON.parse(handler.get_langs());
+ var me = this;
+ self.timer(1ms, function() { me.toggleMenuState() });
+ return {translate('Language')}
+
+ ;
+ }
+
+
+ function toggleMenuState() {
+ var cur = handler.get_local_option("lang") || "default";
+ for (var el in this.$$(menu#languages>li)) {
+ var selected = cur == el.id;
+ el.attributes.toggleClass("selected", selected);
+ }
+ }
+
+ event click $(menu#languages>li) (_, me) {
+ var v = me.id;
+ if (v == "default") v = "";
+ handler.set_local_option("lang", v);
+ app.update();
+ this.toggleMenuState();
+ }
}
+
function getUserName() {
try {
return JSON.parse(handler.get_local_option("user_info")).name;
@@ -223,6 +258,7 @@ class MyIdMenu: Reactor.Component {
{svg_checkmark}{translate('Dark Theme')}
+
{translate('About')} {" "}{handler.get_app_name()}
;
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index a073b81c6..96cca5301 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -1955,11 +1955,11 @@ impl Remote {
let mut config: PeerConfig = self.handler.load_config();
let mut transfer_metas = TransferSerde::default();
for job in self.read_jobs.iter() {
- let json_str = serde_json::to_string(&job.gen_meta()).unwrap();
+ let json_str = serde_json::to_string(&job.gen_meta()).unwrap_or_default();
transfer_metas.read_jobs.push(json_str);
}
for job in self.write_jobs.iter() {
- let json_str = serde_json::to_string(&job.gen_meta()).unwrap();
+ let json_str = serde_json::to_string(&job.gen_meta()).unwrap_or_default();
transfer_metas.write_jobs.push(json_str);
}
log::info!("meta: {:?}", transfer_metas);
@@ -2370,7 +2370,7 @@ impl Remote {
}
back_notification::PrivacyModeState::OffSucceeded => {
self.handler
- .msgbox("custom-nocancel", "Privacy mode", "Out privacy mode");
+ .msgbox("custom-nocancel", "Privacy mode", "Out privacy mode");
self.update_privacy_mode(false);
}
back_notification::PrivacyModeState::OffByPeer => {