From 2abd7db572d3f1ba4c7d1934e690214889c7d8de Mon Sep 17 00:00:00 2001
From: Kris <“x@hi.sy”>
Date: Fri, 29 Apr 2022 20:06:25 +0200
Subject: [PATCH] Fix some text errors

---
 resource/l10n/en-US.toml                   |  2 +-
 resource/template/dashboard/monitor.html   |  2 +-
 resource/template/dashboard/setting.html   |  2 +-
 resource/template/theme-daynight/home.html |  2 +-
 resource/template/theme-default/home.html  | 26 +++++++++++-----------
 resource/template/theme-hotaru/home.html   |  2 +-
 resource/template/theme-mdui/home.html     |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/resource/l10n/en-US.toml b/resource/l10n/en-US.toml
index b96aa73..0217ed0 100644
--- a/resource/l10n/en-US.toml
+++ b/resource/l10n/en-US.toml
@@ -371,7 +371,7 @@ other = "Uptime"
 other = "Server is offline"
 
 [Day]
-other = "Day"
+other = "Days"
 
 [RealtimeChannelEstablished]
 other = "Real-time Channel Established"
diff --git a/resource/template/dashboard/monitor.html b/resource/template/dashboard/monitor.html
index a9872a8..359aba4 100644
--- a/resource/template/dashboard/monitor.html
+++ b/resource/template/dashboard/monitor.html
@@ -36,7 +36,7 @@
             {{if eq $monitor.Type 1}}{{tr "SSLCertificate"}} {{else if eq $monitor.Type
             2}} ICMP Ping {{else}} {{tr "TCPPort"}} {{end}}
           </td>
-          <td>{{$monitor.Duration}}{{tr "Seconds"}}</td>
+          <td>{{$monitor.Duration}} {{tr "Seconds"}}</td>
           <td>{{$monitor.NotificationTag}}</td>
           <td>{{$monitor.Notify}}</td>
           <td>
diff --git a/resource/template/dashboard/setting.html b/resource/template/dashboard/setting.html
index 8762629..5dbcdab 100644
--- a/resource/template/dashboard/setting.html
+++ b/resource/template/dashboard/setting.html
@@ -38,7 +38,7 @@
                 <textarea name="CustomCode">{{.Conf.Site.CustomCode}}</textarea>
             </div>
             <div class="field">
-                <label>{{tr "AccessPassword"}}}</label>
+                <label>{{tr "AccessPassword"}}</label>
                 <input type="text" name="ViewPassword" placeholder="" value="{{.Conf.Site.ViewPassword}}">
             </div>
             <div class="field">
diff --git a/resource/template/theme-daynight/home.html b/resource/template/theme-daynight/home.html
index 1d0ed21..a2ffd19 100644
--- a/resource/template/theme-daynight/home.html
+++ b/resource/template/theme-daynight/home.html
@@ -239,7 +239,7 @@
                 secondToDate(s) {
                     var d = Math.floor(s / 3600 / 24);
                     if (d > 0) {
-                        return d + "{{tr "Day"}}"
+                        return d + " {{tr "Day"}}"
                     }
                     var h = Math.floor(s / 3600 % 24);
                     var m = Math.floor(s / 60 % 60);
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
index 4020df6..f938b9e 100644
--- a/resource/template/theme-default/home.html
+++ b/resource/template/theme-default/home.html
@@ -20,23 +20,23 @@
                   @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
                   <i class="nezha-secondary-font info circle icon" style="height: 28px"></i>
                   <div class="ui content popup" style="margin-bottom: 0">
-                    {{tr "Platform"}}:@#server.Host.Platform#@-@#server.Host.PlatformVersion#@
+                    {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@
                     [<span
                       v-if="server.Host.Virtualization">@#server.Host.Virtualization#@:</span>@#server.Host.Arch#@]<br />
-                    CPU:@#server.Host.CPU#@<br />
-                    {{tr "DiskUsed"}}:@#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br />
-                    {{tr "MemUsed"}}:@#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@<br />
-                    {{tr "SwapUsed"}}:@#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@<br />
-                    {{tr "NetTransfer"}}:<i
+                    CPU: @#server.Host.CPU#@<br />
+                    {{tr "DiskUsed"}}: @#formatByteSize(server.State.DiskUsed)#@/@#formatByteSize(server.Host.DiskTotal)#@<br />
+                    {{tr "MemUsed"}}: @#formatByteSize(server.State.MemUsed)#@/@#formatByteSize(server.Host.MemTotal)#@<br />
+                    {{tr "SwapUsed"}}: @#formatByteSize(server.State.SwapUsed)#@/@#formatByteSize(server.Host.SwapTotal)#@<br />
+                    {{tr "NetTransfer"}}: <i
                       class="arrow alternate circle down outline icon"></i>@#formatByteSize(server.State.NetInTransfer)#@<i
                       class="arrow alternate circle up outline icon"></i>@#formatByteSize(server.State.NetOutTransfer)#@<br />
-                      {{tr "Load"}}:@# toFixed2(server.State.Load1) #@/@# toFixed2(server.State.Load5) #@/@#
+                      {{tr "Load"}}: @# toFixed2(server.State.Load1) #@/@# toFixed2(server.State.Load5) #@/@#
                     toFixed2(server.State.Load15) #@<br />
-                    {{tr "ProcessCount"}}:@# server.State.ProcessCount #@<br />
-                    {{tr "ConnCount"}}:TCP @# server.State.TcpConnCount #@ / UDP @# server.State.UdpConnCount #@<br />
-                    {{tr "BootTime"}}:@# formatTimestamp(server.Host.BootTime) #@<br />
-                    {{tr "LastActive"}}:@# new Date(server.LastActive).toLocaleString() #@<br />
-                    {{tr "Version"}}:@#server.Host.Version#@<br />
+                    {{tr "ProcessCount"}}: @# server.State.ProcessCount #@<br />
+                    {{tr "ConnCount"}}: TCP @# server.State.TcpConnCount #@ / UDP @# server.State.UdpConnCount #@<br />
+                    {{tr "BootTime"}}: @# formatTimestamp(server.Host.BootTime) #@<br />
+                    {{tr "LastActive"}}: @# new Date(server.LastActive).toLocaleString() #@<br />
+                    {{tr "Version"}}: @#server.Host.Version#@<br />
                   </div>
                   <div class="ui divider" style="margin-bottom: 5px"></div>
                 </div>
@@ -163,7 +163,7 @@
       secondToDate(s) {
         var d = Math.floor(s / 3600 / 24);
         if (d > 0) {
-          return d + "{{tr "Day"}}"
+          return d + " {{tr "Day"}}"
         }
         var h = Math.floor(s / 3600 % 24);
         var m = Math.floor(s / 60 % 60);
diff --git a/resource/template/theme-hotaru/home.html b/resource/template/theme-hotaru/home.html
index c26242d..f14ae02 100644
--- a/resource/template/theme-hotaru/home.html
+++ b/resource/template/theme-hotaru/home.html
@@ -219,7 +219,7 @@
                 secondToDate(s) {
                     var d = Math.floor(s / 3600 / 24);
                     if (d > 0) {
-                        return d + "{{tr "Day"}}"
+                        return d + " {{tr "Day"}}"
                     }
                     var h = Math.floor(s / 3600 % 24);
                     var m = Math.floor(s / 60 % 60);
diff --git a/resource/template/theme-mdui/home.html b/resource/template/theme-mdui/home.html
index de63302..08c2f19 100644
--- a/resource/template/theme-mdui/home.html
+++ b/resource/template/theme-mdui/home.html
@@ -178,7 +178,7 @@
             secondToDate(s) {
                 var d = Math.floor(s / 3600 / 24);
                 if (d > 0) {
-                    return d + "{{tr "Day"}}"
+                    return d + " {{tr "Day"}}"
                 }
                 var h = Math.floor(s / 3600 % 24);
                 var m = Math.floor(s / 60 % 60);