diff options
author | Sean E. Russell <ser@ser1.net> | 2020-06-20 16:47:48 -0500 |
---|---|---|
committer | Sean E. Russell <ser@ser1.net> | 2020-06-20 16:47:48 -0500 |
commit | 23364aa754c836b8a5fbc69adbdbd49abd183a57 (patch) | |
tree | 51f9137e2bd2090ffdd938fd7c1a7b4b71c56402 /widgets | |
parent | 9a56571373eb5a9ea9261afb39bebaf7ddeb700f (diff) |
More strings moved to translations
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/disk.go | 1 | ||||
-rw-r--r-- | widgets/proc_freebsd.go | 10 | ||||
-rw-r--r-- | widgets/statusbar.go | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/widgets/disk.go b/widgets/disk.go index 67f3bb6..726e629 100644 --- a/widgets/disk.go +++ b/widgets/disk.go @@ -37,6 +37,7 @@ func NewDiskWidget() *DiskWidget { updateInterval: time.Second, Partitions: make(map[string]*Partition), } + self.Table.Tr = tr 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 diff --git a/widgets/proc_freebsd.go b/widgets/proc_freebsd.go index 34fee18..a938636 100644 --- a/widgets/proc_freebsd.go +++ b/widgets/proc_freebsd.go @@ -26,13 +26,13 @@ type processList struct { func getProcs() ([]Proc, error) { output, err := exec.Command("ps", "-axo pid,comm,%cpu,%mem,args", "--libxo", "json").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())) } list := processList{} err = json.Unmarshal(output, &list) if err != nil { - return nil, fmt.Errorf("failed to unmarshal json. %s", err) + return nil, fmt.Errorf(tr.Value("widget.proc.err.parse", err.Error())) } procs := []Proc{} @@ -42,15 +42,15 @@ func getProcs() ([]Proc, error) { } pid, err := strconv.Atoi(strings.TrimSpace(process.Pid)) if err != nil { - log.Printf("failed to convert first field to int: %v. split: %v", err, process) + log.Printf(tr.Value("widget.proc.err.pidconv", err.Error(), process)) } cpu, err := strconv.ParseFloat(utils.ConvertLocalizedString(process.CPU), 32) if err != nil { - log.Printf("failed to convert third field to float: %v. split: %v", err, process) + log.Printf(tr.Value("widget.proc.err.cpuconv", err.Error(), process)) } mem, err := strconv.ParseFloat(utils.ConvertLocalizedString(process.Mem), 32) if err != nil { - log.Printf("failed to convert fourth field to float: %v. split: %v", err, process) + log.Printf(tr.Value("widget.proc.err.memconv", err.Error(), process)) } proc := Proc{ Pid: pid, diff --git a/widgets/statusbar.go b/widgets/statusbar.go index 2242414..4727960 100644 --- a/widgets/statusbar.go +++ b/widgets/statusbar.go @@ -24,7 +24,7 @@ func (sb *StatusBar) Draw(buf *ui.Buffer) { hostname, err := os.Hostname() if err != nil { - log.Printf("could not get hostname: %v", err) + log.Printf(tr.Value("error.nohostname", err.Error())) return } buf.SetString( |