diff options
| author | Sean E. Russell <ser@ser1.net> | 2020-11-23 14:58:32 -0600 |
|---|---|---|
| committer | Sean E. Russell <ser@ser1.net> | 2020-11-23 14:58:32 -0600 |
| commit | daf5916fde35c7ae2a69fc45a32f9c684d88fe2b (patch) | |
| tree | 2090650c190b4a517d6d1f4da8fde1cb3b2c2563 /layout/layout.go | |
| parent | 72cde0545887f98e58423c1495327276daa202b5 (diff) | |
| parent | edf0c2a3a8edd43a685ef91c2e3f9f3ea7d5bc23 (diff) | |
Resolves merge conflicts
Diffstat (limited to 'layout/layout.go')
| -rw-r--r-- | layout/layout.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/layout/layout.go b/layout/layout.go index b4343b4..645e490 100644 --- a/layout/layout.go +++ b/layout/layout.go @@ -3,7 +3,9 @@ package layout import ( "log" "sort" + "strings" + "github.com/jdkeke142/lingo-toml" "github.com/xxxserxxx/gotop/v4" "github.com/xxxserxxx/gotop/v4/widgets" @@ -28,8 +30,10 @@ type MyGrid struct { } var widgetNames []string = []string{"cpu", "disk", "mem", "temp", "net", "procs", "batt"} +var tr lingo.Translations func Layout(wl layout, c gotop.Config) (*MyGrid, error) { + tr = c.Tr rowDefs := wl.Rows uiRows := make([][]interface{}, 0) numRows := countNumRows(wl.Rows) @@ -197,7 +201,7 @@ func makeWidget(c gotop.Config, widRule widgetRule) interface{} { b.BarColor = ui.Color(c.Colorscheme.ProcCursor) w = b default: - log.Printf("Invalid widget name %s. Must be one of %v", widRule.Widget, widgetNames) + log.Printf(tr.Value("layout.error.widget", widRule.Widget, strings.Join(widgetNames, ","))) return ui.NewBlock() } if c.ExportPort != "" { |