From b49c7c9a60e2912839c6d6ed1729e7269768d9c8 Mon Sep 17 00:00:00 2001
From: "Sean E. Russell" <ser@ser1.net>
Date: Sun, 21 Jun 2020 10:14:18 -0500
Subject: Revert to English if jibber_jabber can't detect the language; revert
 accidental removal of two zh_CN translations.

---
 cmd/gotop/main.go             |  3 +--
 translations/dicts/zh_CN.toml | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index 1f9f0a5..9c228b8 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -362,8 +362,7 @@ func run() int {
 	}
 	lang, err := jj.DetectIETF()
 	if err != nil {
-		fmt.Printf("failed to get language setting from environment: %s\n", err)
-		return 2
+		lang = "en_US"
 	}
 	lang = strings.Replace(lang, "-", "_", -1)
 	// Get the locale from the os
diff --git a/translations/dicts/zh_CN.toml b/translations/dicts/zh_CN.toml
index acaf7da..8bd65dc 100644
--- a/translations/dicts/zh_CN.toml
+++ b/translations/dicts/zh_CN.toml
@@ -88,13 +88,13 @@ test="执行测试并返回成功或失败码。"
 conffile="用于替代缺省参数的配置文件（必须是第一个参数）"
 list="""
 List <devices|layouts|colorschemes|paths|keys>
-   devices: Prints out device names for filterable widgets
-   layouts: Lists build-in layouts
-   colorschemes: Lists built-in colorschemes
-   paths: List out configuration file search paths
-   widgets: Widgets that can be used in a layout
-   keys: Show the keyboard bindings."""
-write="Write out a default config file."
+   devices: 显示可用于过滤的设备名
+   layouts: 列出所有内置布局方案
+   colorschemes: 列出所有内置配色方案
+   paths: 列出配置文件的搜索路径
+   widgets: 所有可被用于布局的组件
+   keys: 显示所有热键。"""
+write="将当前配置写入缺省配置文件。"
 
 
 [config.err]
-- 
cgit v1.2.3


From 81424fb000eaf1b6cd8c1d5bb4d476cb4b3b32db Mon Sep 17 00:00:00 2001
From: "Sean E. Russell" <ser@ser1.net>
Date: Sun, 21 Jun 2020 11:49:04 -0500
Subject: Fix windows compile errors.

---
 go.sum                  |  1 +
 widgets/proc_windows.go | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/go.sum b/go.sum
index 59dcc33..4fe67f1 100644
--- a/go.sum
+++ b/go.sum
@@ -13,6 +13,7 @@ github.com/distatus/battery v0.9.0 h1:8NS5o00/j3Oh2xgocA6pQROTp5guoR+s8CZlWzHC4Q
 github.com/distatus/battery v0.9.0/go.mod h1:gGO7GxHTi1zlRT+cAj8uGG0/8HFiqAeH0TJvoipnuPs=
 github.com/gizak/termui/v3 v3.1.0 h1:ZZmVDgwHl7gR7elfKf1xc4IudXZ5qqfDh4wExk4Iajc=
 github.com/gizak/termui/v3 v3.1.0/go.mod h1:bXQEBkJpzxUAKf0+xq9MSWAvWZlE7c+aidmyFlkYTrY=
+github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
diff --git a/widgets/proc_windows.go b/widgets/proc_windows.go
index d34ef5e..1d8bffc 100644
--- a/widgets/proc_windows.go
+++ b/widgets/proc_windows.go
@@ -3,12 +3,13 @@ package widgets
 import (
 	"fmt"
 	"log"
+	"strconv"
 
-	psProc "github.com/shirou/gopsutil/process"
+	"github.com/shirou/gopsutil/process"
 )
 
 func getProcs() ([]Proc, error) {
-	psProcs, err := psProc.Processes()
+	psProcs, err := process.Processes()
 	if err != nil {
 		return nil, fmt.Errorf(tr.Value("widget.proc.err.gopsutil", err.Error()))
 	}
@@ -18,15 +19,24 @@ func getProcs() ([]Proc, error) {
 		pid := psProc.Pid
 		command, err := psProc.Name()
 		if err != nil {
-			log.Println(tr.Value("widget.proc.err.getcmd", err, psProc, i, pid))
+			sps := fmt.Sprintf("%v", psProc)
+			si := strconv.Itoa(i)
+			spid := fmt.Sprintf("%d", pid)
+			log.Println(tr.Value("widget.proc.err.getcmd", err.Error(), sps, si, spid))
 		}
 		cpu, err := psProc.CPUPercent()
 		if err != nil {
-			log.Println(tr.Value("widget.proc.err.cpupercent", err, psProc, i, pid))
+			sps := fmt.Sprintf("%v", psProc)
+			si := strconv.Itoa(i)
+			spid := fmt.Sprintf("%d", pid)
+			log.Println(tr.Value("widget.proc.err.cpupercent", err.Error(), sps, si, spid))
 		}
 		mem, err := psProc.MemoryPercent()
 		if err != nil {
-			log.Println(tr.Value("widget.proc.err.mempercent", err, psProc, i, pid))
+			sps := fmt.Sprintf("%v", psProc)
+			si := strconv.Itoa(i)
+			spid := fmt.Sprintf("%d", pid)
+			log.Println(tr.Value("widget.proc.err.mempercent", err.Error(), sps, si, spid))
 		}
 
 		procs[i] = Proc{
-- 
cgit v1.2.3