From d0ca9de9464a1bf88967e20a8244e038bdd2172f Mon Sep 17 00:00:00 2001
From: chenbaiyu <cby40899570@gmail.com>
Date: Fri, 14 Jan 2022 18:28:39 +0800
Subject: [PATCH] add new service install tip in Chinese

---
 src/lang/cn.rs                                      | 1 +
 src/platform/macos.rs                               | 2 +-
 src/platform/privileges_scripts/install.scpt        | 2 +-
 src/platform/privileges_scripts/launch_service.scpt | 2 +-
 src/platform/privileges_scripts/stop_service.scpt   | 2 +-
 src/ui/index.css                                    | 1 +
 src/ui/index.tis                                    | 2 +-
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index 23dd4348c..7a90ebf0b 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -195,5 +195,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Socks5 Proxy", "Socks5 代理"),
         ("Hostname", "主机名"),
         ("Discovered", "已发现"),
+        ("install_daemon","为了能够提供更好的\n远程桌面访问功能，RustDesk\n需要\"安装系统服务\"。")
     ].iter().cloned().collect();
     }
diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 92369d258..4b29bc13a 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -154,7 +154,7 @@ pub fn is_installed_daemon(prompt: bool) -> bool {
         Err(e) => {
             log::error!("run osascript failed: {}", e);
             false
-        },
+        }
     }
 }
 
diff --git a/src/platform/privileges_scripts/install.scpt b/src/platform/privileges_scripts/install.scpt
index f67a4d8bc..395be8a3c 100644
--- a/src/platform/privileges_scripts/install.scpt
+++ b/src/platform/privileges_scripts/install.scpt
@@ -14,6 +14,6 @@ on run {daemon_file, root_agent_file, user_agent_file}
 
 	set sh to sh1 & sh2 & sh3 & sh4 & sh5
 
-	do shell script sh with prompt "RustDesk 需要安装服务" with administrator privileges
+	do shell script sh with prompt "RustDesk want to install services" with administrator privileges
 	do shell script sh6
 end run
\ No newline at end of file
diff --git a/src/platform/privileges_scripts/launch_service.scpt b/src/platform/privileges_scripts/launch_service.scpt
index f39aec08c..12f130c5e 100644
--- a/src/platform/privileges_scripts/launch_service.scpt
+++ b/src/platform/privileges_scripts/launch_service.scpt
@@ -2,6 +2,6 @@ set sh1 to "launchctl load -w /Library/LaunchAgents/com.carriez.rustdesk.agent.r
 
 set sh2 to "launchctl load -w /Library/LaunchAgents/com.carriez.rustdesk.agent.user.plist;"
 
-do shell script sh1 with prompt "RustDesk 需要停止服务" with administrator privileges
+do shell script sh1 with prompt "RustDesk want to launch services" with administrator privileges
 
 do shell script sh2
\ No newline at end of file
diff --git a/src/platform/privileges_scripts/stop_service.scpt b/src/platform/privileges_scripts/stop_service.scpt
index 5e308bebe..c858bee17 100644
--- a/src/platform/privileges_scripts/stop_service.scpt
+++ b/src/platform/privileges_scripts/stop_service.scpt
@@ -2,6 +2,6 @@ set sh1 to "launchctl unload -w /Library/LaunchAgents/com.carriez.rustdesk.agent
 
 set sh2 to "launchctl unload -w /Library/LaunchAgents/com.carriez.rustdesk.agent.user.plist;"
 
-do shell script sh1 with prompt "RustDesk 需要停止服务" with administrator privileges
+do shell script sh1 with prompt "RustDesk want to stop services" with administrator privileges
 
 do shell script sh2
\ No newline at end of file
diff --git a/src/ui/index.css b/src/ui/index.css
index b5844db37..552a2e317 100644
--- a/src/ui/index.css
+++ b/src/ui/index.css
@@ -342,6 +342,7 @@ div.trust-me > div:nth-child(1) {
 }
 
 div.trust-me > div:nth-child(2) {
+    text-align: center;
     font-size: 0.9em;
     margin-bottom: 1em;
 }
diff --git a/src/ui/index.tis b/src/ui/index.tis
index d58497b3d..0c0e62877 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -543,7 +543,7 @@ class ModifyDefaultLogin: Reactor.Component {
 
 function watch_trust() {
     // not use TrustMe::update, because it is buggy
-    var trusted = handler.is_process_trusted(false);
+    var trusted = handler.is_process_trusted(false) && handler.is_installed_daemon(false);
     var el = $(div.trust-me);
     if (el) {
         el.style.set {