diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:50:52 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-07 11:16:03 +1000 |
commit | 7410acd1aaa97f678295a328264360802346b33a (patch) | |
tree | 51dc6b5dfc8c0b67711ff644a6bc32480e6eaea8 /pkg/cheatsheet | |
parent | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (diff) |
move merge conflicts code into controller
Diffstat (limited to 'pkg/cheatsheet')
-rw-r--r-- | pkg/cheatsheet/generate.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/cheatsheet/generate.go b/pkg/cheatsheet/generate.go index 6d0007653..ec5c6db0e 100644 --- a/pkg/cheatsheet/generate.go +++ b/pkg/cheatsheet/generate.go @@ -142,7 +142,7 @@ func getBindingSections(bindings []*types.Binding, tr *i18n.TranslationSet) []*b bindingsByHeader, func(header header, hBindings []*types.Binding) headerWithBindings { uniqBindings := lo.UniqBy(hBindings, func(binding *types.Binding) string { - return binding.Description + keybindings.GetKeyDisplay(binding.Key) + return binding.Description + keybindings.LabelFromKey(binding.Key) }) return headerWithBindings{ @@ -202,10 +202,10 @@ func formatBinding(binding *types.Binding) string { if binding.Alternative != "" { return fmt.Sprintf( " <kbd>%s</kbd>: %s (%s)\n", - keybindings.GetKeyDisplay(binding.Key), + keybindings.LabelFromKey(binding.Key), binding.Description, binding.Alternative, ) } - return fmt.Sprintf(" <kbd>%s</kbd>: %s\n", keybindings.GetKeyDisplay(binding.Key), binding.Description) + return fmt.Sprintf(" <kbd>%s</kbd>: %s\n", keybindings.LabelFromKey(binding.Key), binding.Description) } |