Expand translations

11 files changed, 38 insertions, 31 deletions

diff --git a/widgets/battery.go b/widgets/battery.go
index 7bc9ca6..d8334bb 100644
--- a/widgets/battery.go
+++ b/widgets/battery.go
@@ -23,7 +23,7 @@ func NewBatteryWidget(horizontalScale int) *BatteryWidget {
 		LineGraph:      ui.NewLineGraph(),
 		updateInterval: time.Minute,
 	}
-	self.Title = tr.Value("widget.battery")
+	self.Title = tr.Value("widget.label.battery")
 	self.HorizontalScale = horizontalScale
 
 	// intentional duplicate
@@ -60,7 +60,7 @@ func (b *BatteryWidget) EnableMetric() {
 }
 
 func makeID(i int) string {
-	return tr.Value("widget.batt") + strconv.Itoa(i)
+	return tr.Value("widget.label.batt") + strconv.Itoa(i)
 }
 
 func (b *BatteryWidget) Scale(i int) {
diff --git a/widgets/batterygauge.go b/widgets/batterygauge.go
index bec3c43..8dd681e 100644
--- a/widgets/batterygauge.go
+++ b/widgets/batterygauge.go
@@ -18,7 +18,7 @@ type BatteryGauge struct {
 
 func NewBatteryGauge() *BatteryGauge {
 	self := &BatteryGauge{Gauge: termui.NewGauge()}
-	self.Title = tr.Value("widget.gauge")
+	self.Title = tr.Value("widget.label.gauge")
 
 	self.update()
 
diff --git a/widgets/cpu.go b/widgets/cpu.go
index 207b231..4d2bc89 100644
--- a/widgets/cpu.go
+++ b/widgets/cpu.go
@@ -32,7 +32,7 @@ func NewCPUWidget(updateInterval time.Duration, horizontalScale int, showAverage
 		ShowPerCPULoad:  showPerCPULoad,
 		cpuLoads:        make(map[string]float64),
 	}
-	self.Title = tr.Value("cpu")
+	self.Title = tr.Value("widget.label.cpu")
 	self.HorizontalScale = horizontalScale
 
 	if !(self.ShowAverageLoad || self.ShowPerCPULoad) {
diff --git a/widgets/disk.go b/widgets/disk.go
index 716e631..67f3bb6 100644
--- a/widgets/disk.go
+++ b/widgets/disk.go
@@ -37,7 +37,7 @@ func NewDiskWidget() *DiskWidget {
 		updateInterval: time.Second,
 		Partitions:     make(map[string]*Partition),
 	}
-	self.Title = tr.Value("widget.disk")
+	self.Title = tr.Value("widget.label.disk")
 	self.Header = []string{tr.Value("disk.disk"), tr.Value("disk.mount"), tr.Value("disk.used"), tr.Value("disk.free"), tr.Value("disk.rs"), tr.Value("disk.ws")}
 	self.ColGap = 2
 	self.ColResizer = func() {
diff --git a/widgets/mem.go b/widgets/mem.go
index b994276..19656bb 100644
--- a/widgets/mem.go
+++ b/widgets/mem.go
@@ -21,7 +21,7 @@ func NewMemWidget(updateInterval time.Duration, horizontalScale int) *MemWidget
 		LineGraph:      ui.NewLineGraph(),
 		updateInterval: updateInterval,
 	}
-	widg.Title = " Memory Usage "
+	widg.Title = tr.Value("widget.label.mem")
 	widg.HorizontalScale = horizontalScale
 	mems := make(map[string]devices.MemoryInfo)
 	devices.UpdateMem(mems)
diff --git a/widgets/net.go b/widgets/net.go
index b76d6b4..f25f106 100644
--- a/widgets/net.go
+++ b/widgets/net.go
@@ -47,9 +47,9 @@ func NewNetWidget(netInterface string) *NetWidget {
 		updateInterval: time.Second,
 		NetInterface:   strings.Split(netInterface, ","),
 	}
-	self.Title = " Network Usage "
+	self.Title = tr.Value("widget.label.net")
 	if netInterface != "all" {
-		self.Title = fmt.Sprintf(" Network Usage: %s ", netInterface)
+		self.Title = tr.Value("widget.label.netint", netInterface)
 	}
 
 	self.update()
@@ -73,7 +73,7 @@ func (net *NetWidget) EnableMetric() {
 func (net *NetWidget) update() {
 	interfaces, err := psNet.IOCounters(true)
 	if err != nil {
-		log.Printf("failed to get network activity from gopsutil: %v", err)
+		log.Println(tr.Value("widget.net.err.netactivity", err.Error()))
 		return
 	}
 
@@ -114,12 +114,14 @@ func (net *NetWidget) update() {
 		recentBytesSent = totalBytesSent - net.totalBytesSent
 
 		if int(recentBytesRecv) < 0 {
-			log.Printf("error: negative value for recently received network data from gopsutil. recentBytesRecv: %v", recentBytesRecv)
+			v := fmt.Sprintf("%d", recentBytesRecv)
+			log.Println(tr.Value("widget.net.err.negvalrecv", v))
 			// recover from error
 			recentBytesRecv = 0
 		}
 		if int(recentBytesSent) < 0 {
-			log.Printf("error: negative value for recently sent network data from gopsutil. recentBytesSent: %v", recentBytesSent)
+			v := fmt.Sprintf("%d", recentBytesSent)
+			log.Printf(tr.Value("widget.net.err.negvalsent", v))
 			// recover from error
 			recentBytesSent = 0
 		}
@@ -160,7 +162,7 @@ func (net *NetWidget) update() {
 			recentConverted, unitRecent = utils.ConvertBytes(recent)
 		}
 
-		net.Lines[i].Title1 = fmt.Sprintf(" Total %s: %5.1f %s", label, totalConverted, unitTotal)
+		net.Lines[i].Title1 = fmt.Sprintf(" %s %s: %5.1f %s", tr.Value("total"), label, totalConverted, unitTotal)
 		net.Lines[i].Title2 = fmt.Sprintf(format, rate, recentConverted, unitRecent)
 	}
 }
diff --git a/widgets/proc.go b/widgets/proc.go
index f47f646..ee94825 100644
--- a/widgets/proc.go
+++ b/widgets/proc.go
@@ -51,7 +51,7 @@ type ProcWidget struct {
 func NewProcWidget() *ProcWidget {
 	cpuCount, err := psCPU.Counts(false)
 	if err != nil {
-		log.Printf("failed to get CPU count from gopsutil: %v", err)
+		log.Println(tr.Value("error.proc.err.count", err.Error()))
 	}
 	self := &ProcWidget{
 		Table:            ui.NewTable(),
@@ -63,14 +63,14 @@ func NewProcWidget() *ProcWidget {
 	}
 	self.entry = &ui.Entry{
 		Style: self.TitleStyle,
-		Label: " Filter: ",
+		Label: tr.Value("widget.proc.filter"),
 		Value: "",
 		UpdateCallback: func(val string) {
 			self.filter = val
 			self.update()
 		},
 	}
-	self.Title = " Processes "
+	self.Title = tr.Value("widget.proc.label")
 	self.ShowCursor = true
 	self.ShowLocation = true
 	self.ColGap = 3
@@ -137,7 +137,7 @@ func (proc *ProcWidget) filterProcs(procs []Proc) []Proc {
 func (proc *ProcWidget) update() {
 	procs, err := getProcs()
 	if err != nil {
-		log.Printf("failed to retrieve processes: %v", err)
+		log.Printf(tr.Value("widget.proc.error.retrieve", err.Error()))
 		return
 	}
 
@@ -157,10 +157,15 @@ func (proc *ProcWidget) update() {
 // sortProcs sorts either the grouped or ungrouped []Process based on the sortMethod.
 // Called with every update, when the sort method is changed, and when processes are grouped and ungrouped.
 func (proc *ProcWidget) sortProcs() {
-	proc.Header = []string{"Count", "Command", "CPU%", "Mem%"}
+	proc.Header = []string{
+		tr.Value("widget.proc.header.count"),
+		tr.Value("widget.proc.header.command"),
+		tr.Value("widget.proc.header.cpu"),
+		tr.Value("widget.proc.header.mem"),
+	}
 
 	if !proc.showGroupedProcs {
-		proc.Header[0] = "PID"
+		proc.Header[0] = tr.Value("widget.proc.header.pid")
 	}
 
 	var procs *[]Proc
diff --git a/widgets/proc_linux.go b/widgets/proc_linux.go
index 164319d..938e5c2 100644
--- a/widgets/proc_linux.go
+++ b/widgets/proc_linux.go
@@ -11,7 +11,7 @@ import (
 func getProcs() ([]Proc, error) {
 	output, err := exec.Command("ps", "-axo", "pid:10,comm:50,pcpu:5,pmem:5,args").Output()
 	if err != nil {
-		return nil, fmt.Errorf("failed to execute 'ps' command: %v", err)
+		return nil, fmt.Errorf(tr.Value("widget.proc.err.ps", err.Error()))
 	}
 
 	// converts to []string, removing trailing newline and header
@@ -21,15 +21,15 @@ func getProcs() ([]Proc, error) {
 	for _, line := range linesOfProcStrings {
 		pid, err := strconv.Atoi(strings.TrimSpace(line[0:10]))
 		if err != nil {
-			log.Printf("failed to convert PID to int: %v. line: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.pidconv", err.Error(), line))
 		}
 		cpu, err := strconv.ParseFloat(strings.TrimSpace(line[63:68]), 64)
 		if err != nil {
-			log.Printf("failed to convert CPU usage to float: %v. line: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.cpuconv", err.Error(), line))
 		}
 		mem, err := strconv.ParseFloat(strings.TrimSpace(line[69:74]), 64)
 		if err != nil {
-			log.Printf("failed to convert Mem usage to float: %v. line: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.memconv", err.Error(), line))
 		}
 		proc := Proc{
 			Pid:         pid,
diff --git a/widgets/proc_other.go b/widgets/proc_other.go
index b761431..a485c4f 100644
--- a/widgets/proc_other.go
+++ b/widgets/proc_other.go
@@ -23,7 +23,7 @@ func getProcs() ([]Proc, error) {
 	keywords := fmt.Sprintf("pid=%s,comm=%s,pcpu=%s,pmem=%s,args", ten, fifty, five, five)
 	output, err := exec.Command("ps", "-caxo", keywords).Output()
 	if err != nil {
-		return nil, fmt.Errorf("failed to execute 'ps' command: %v", err)
+		return nil, fmt.Errorf(tr.Value("widget.proc.err.ps", err.Error()))
 	}
 
 	// converts to []string and removes the header
@@ -33,15 +33,15 @@ func getProcs() ([]Proc, error) {
 	for _, line := range linesOfProcStrings {
 		pid, err := strconv.Atoi(strings.TrimSpace(line[0:10]))
 		if err != nil {
-			log.Printf("failed to convert first field to int: %v. split: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.pidconv", err.Error(), line))
 		}
 		cpu, err := strconv.ParseFloat(utils.ConvertLocalizedString(strings.TrimSpace(line[63:68])), 64)
 		if err != nil {
-			log.Printf("failed to convert third field to float: %v. split: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.cpuconv", err.Error(), line))
 		}
 		mem, err := strconv.ParseFloat(utils.ConvertLocalizedString(strings.TrimSpace(line[69:74])), 64)
 		if err != nil {
-			log.Printf("failed to convert fourth field to float: %v. split: %v", err, line)
+			log.Println(tr.Value("widget.proc.err.memconv", err.Error(), line))
 		}
 		proc := Proc{
 			Pid:         pid,
diff --git a/widgets/proc_windows.go b/widgets/proc_windows.go
index 56590c7..d34ef5e 100644
--- a/widgets/proc_windows.go
+++ b/widgets/proc_windows.go
@@ -10,7 +10,7 @@ import (
 func getProcs() ([]Proc, error) {
 	psProcs, err := psProc.Processes()
 	if err != nil {
-		return nil, fmt.Errorf("failed to get processes from gopsutil: %v", err)
+		return nil, fmt.Errorf(tr.Value("widget.proc.err.gopsutil", err.Error()))
 	}
 
 	procs := make([]Proc, len(psProcs))
@@ -18,15 +18,15 @@ func getProcs() ([]Proc, error) {
 		pid := psProc.Pid
 		command, err := psProc.Name()
 		if err != nil {
-			log.Printf("failed to get process command from gopsutil: %v. psProc: %v. i: %v. pid: %v", err, psProc, i, pid)
+			log.Println(tr.Value("widget.proc.err.getcmd", err, psProc, i, pid))
 		}
 		cpu, err := psProc.CPUPercent()
 		if err != nil {
-			log.Printf("failed to get process cpu usage from gopsutil: %v. psProc: %v. i: %v. pid: %v", err, psProc, i, pid)
+			log.Println(tr.Value("widget.proc.err.cpupercent", err, psProc, i, pid))
 		}
 		mem, err := psProc.MemoryPercent()
 		if err != nil {
-			log.Printf("failed to get process memeory usage from gopsutil: %v. psProc: %v. i: %v. pid: %v", err, psProc, i, pid)
+			log.Println(tr.Value("widget.proc.err.mempercent", err, psProc, i, pid))
 		}
 
 		procs[i] = Proc{
diff --git a/widgets/temp.go b/widgets/temp.go
index 5a22897..f5632df 100644
--- a/widgets/temp.go
+++ b/widgets/temp.go
@@ -39,7 +39,7 @@ func NewTempWidget(tempScale TempScale, filter []string) *TempWidget {
 		TempThreshold:  80,
 		TempScale:      tempScale,
 	}
-	self.Title = " Temperatures "
+	self.Title = tr.Value("widget.label.temp")
 	if len(filter) > 0 {
 		for _, t := range filter {
 			self.Data[t] = 0