hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polish langs

Browse Source
This commit is contained in:
rustdesk 2023-03-03 11:49:02 +08:00
parent 968b3642a9
commit 4c930ff0b1
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lang.rs
View File

@ -39,8 +39,8 @@ pub const LANGS: &[(&str, &str)] = &[
("fr", "Français"), ("fr", "Français"),
("de", "Deutsch"), ("de", "Deutsch"),
("nl", "Nederlands"), ("nl", "Nederlands"),
("cn", "简体中文"), ("zh-cn", "简体中文"),
("tw", "繁體中文"), ("zh-tw", "繁體中文"),
("pt", "Português"), ("pt", "Português"),
("es", "Español"), ("es", "Español"),
("hu", "Magyar"), ("hu", "Magyar"),
@ -79,7 +79,12 @@ pub fn translate_locale(name: String, locale: &str) -> String {
if lang.is_empty() { if lang.is_empty() {
// zh_CN on Linux, zh-Hans-CN on mac, zh_CN_#Hans on Android // zh_CN on Linux, zh-Hans-CN on mac, zh_CN_#Hans on Android
if locale.starts_with("zh") { if locale.starts_with("zh") {
lang = (if locale.contains("tw") { "tw" } else { "cn" }).to_owned(); lang = (if locale.contains("tw") {
"zh-tw"
} else {
"zh-cn"
})
.to_owned();
} }
} }
if lang.is_empty() { if lang.is_empty() {
@ -93,9 +98,9 @@ pub fn translate_locale(name: String, locale: &str) -> String {
let lang = lang.to_lowercase(); let lang = lang.to_lowercase();
let m = match lang.as_str() { let m = match lang.as_str() {
"fr" => fr::T.deref(), "fr" => fr::T.deref(),
"cn" => cn::T.deref(), "zh-cn" => cn::T.deref(),
"it" => it::T.deref(), "it" => it::T.deref(),
"tw" => tw::T.deref(), "zh-tw" => tw::T.deref(),
"de" => de::T.deref(), "de" => de::T.deref(),
"nl" => nl::T.deref(), "nl" => nl::T.deref(),
"es" => es::T.deref(), "es" => es::T.deref(),
@ -103,7 +108,6 @@ pub fn translate_locale(name: String, locale: &str) -> String {
"ru" => ru::T.deref(), "ru" => ru::T.deref(),
"eo" => eo::T.deref(), "eo" => eo::T.deref(),
"id" => id::T.deref(), "id" => id::T.deref(),
"ptbr" => ptbr::T.deref(),
"br" => ptbr::T.deref(), "br" => ptbr::T.deref(),
"pt" => ptbr::T.deref(), "pt" => ptbr::T.deref(),
"tr" => tr::T.deref(), "tr" => tr::T.deref(),

2
src/ui_interface.rs
View File

@ -639,7 +639,7 @@ pub fn get_langs() -> String {
use serde_json::json; use serde_json::json;
let mut x: Vec<(&str, String)> = crate::lang::LANGS let mut x: Vec<(&str, String)> = crate::lang::LANGS
.iter() .iter()
.map(|a| (a.0, format!("{} - {}", a.1, a.0))) .map(|a| (a.0, format!("{} ({})", a.1, a.0)))
.collect(); .collect();
x.sort_by(|a, b| a.0.cmp(b.0)); x.sort_by(|a, b| a.0.cmp(b.0));
json!(x).to_string() json!(x).to_string()