mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	Fix potentially wrong help text in commit message panel
It said "Press tab to toggle focus", which is wrong for people who remapped their togglePanel key binding to something else. Print the actual key binding instead.
This commit is contained in:
		| @@ -3,7 +3,9 @@ package gui | ||||
| import ( | ||||
| 	"github.com/jesseduffield/generics/slices" | ||||
| 	"github.com/jesseduffield/gocui" | ||||
| 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings" | ||||
| 	"github.com/jesseduffield/lazygit/pkg/theme" | ||||
| 	"github.com/jesseduffield/lazygit/pkg/utils" | ||||
| ) | ||||
|  | ||||
| type viewNameMapping struct { | ||||
| @@ -159,7 +161,10 @@ func (gui *Gui) createAllViews() error { | ||||
|  | ||||
| 	gui.Views.CommitDescription.Visible = false | ||||
| 	gui.Views.CommitDescription.Title = gui.c.Tr.CommitDescriptionTitle | ||||
| 	gui.Views.CommitDescription.Subtitle = gui.Tr.CommitDescriptionSubTitle | ||||
| 	gui.Views.CommitDescription.Subtitle = utils.ResolvePlaceholderString(gui.Tr.CommitDescriptionSubTitle, | ||||
| 		map[string]string{ | ||||
| 			"togglePanelKeyBinding": keybindings.Label(gui.UserConfig.Keybinding.Universal.TogglePanel), | ||||
| 		}) | ||||
| 	gui.Views.CommitDescription.FgColor = theme.GocuiDefaultTextColor | ||||
| 	gui.Views.CommitDescription.Editable = true | ||||
| 	gui.Views.CommitDescription.Editor = gocui.EditorFunc(gui.commitDescriptionEditor) | ||||
|   | ||||
| @@ -886,7 +886,7 @@ func EnglishTranslationSet() TranslationSet { | ||||
| 		RebaseOptionsTitle:                  "Rebase options", | ||||
| 		CommitMessageTitle:                  "Commit summary", | ||||
| 		CommitDescriptionTitle:              "Commit description", | ||||
| 		CommitDescriptionSubTitle:           "Press tab to toggle focus", | ||||
| 		CommitDescriptionSubTitle:           "Press {{.togglePanelKeyBinding}} to toggle focus", | ||||
| 		LocalBranchesTitle:                  "Local branches", | ||||
| 		SearchTitle:                         "Search", | ||||
| 		TagsTitle:                           "Tags", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user