diff options
| author | David Chen <weichen2000121@gmail.com> | 2020-01-07 13:26:29 -0800 |
|---|---|---|
| committer | David Chen <weichen2000121@gmail.com> | 2020-01-07 13:26:29 -0800 |
| commit | 3e875cc5935fcdd5db26d612b882ff79f73d9133 (patch) | |
| tree | eea4c2d0c0f7a6f110d22738d9bb1763e0eca8a2 | |
| parent | de2cfc7e176c210c593e654d2aa857624507a9a0 (diff) | |
fix display of menu option keybindings
| -rw-r--r-- | pkg/gui/gui.go | 10 | ||||
| -rw-r--r-- | pkg/gui/menu_panel.go | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 5b2f9cc14..fc24bbd6b 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -743,11 +743,11 @@ func (gui *Gui) renderAppStatus() error { func (gui *Gui) renderGlobalOptions() error { return gui.renderOptionsMap(map[string]string{ - "PgUp/PgDn": gui.Tr.SLocalize("scroll"), - "← → ↑ ↓": gui.Tr.SLocalize("navigate"), - "esc/q": gui.Tr.SLocalize("close"), - "x": gui.Tr.SLocalize("menu"), - "1-5": gui.Tr.SLocalize("jump"), + fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.scrollUpMain"), gui.getKeyDisplay("universal.scrollDownMain")): gui.Tr.SLocalize("scroll"), + fmt.Sprintf("%s %s %s %s", gui.getKeyDisplay("universal.prevBlock"), gui.getKeyDisplay("universal.nextBlock"), gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"), + fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")): gui.Tr.SLocalize("close"), + fmt.Sprintf("%s", gui.getKeyDisplay("universal.optionMenu")): gui.Tr.SLocalize("menu"), + "1-5": gui.Tr.SLocalize("jump"), }) } diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index 141925953..526f66d78 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -18,9 +18,9 @@ func (gui *Gui) handleMenuSelect(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) renderMenuOptions() error { optionsMap := map[string]string{ - "esc/q": gui.Tr.SLocalize("close"), - "↑ ↓": gui.Tr.SLocalize("navigate"), - "space": gui.Tr.SLocalize("execute"), + fmt.Sprintf("%s/%s", gui.getKeyDisplay("universal.return"), gui.getKeyDisplay("universal.quit")): gui.Tr.SLocalize("close"), + fmt.Sprintf("%s %s", gui.getKeyDisplay("universal.prevItem"), gui.getKeyDisplay("universal.nextItem")): gui.Tr.SLocalize("navigate"), + gui.getKeyDisplay("universal.select"): gui.Tr.SLocalize("execute"), } return gui.renderOptionsMap(optionsMap) } |