From 8f628296adb177ac06dace8f4da92ac14384da79 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 18 May 2023 19:20:42 +0200 Subject: [PATCH] Mention ctrl+o binding in commit message sub title Only do this when an onSwitchToEditor function is actually provided. For the "Move patch into new commit" command we don't, because it isn't totally straightforward in that case. --- pkg/gui/context/commit_message_context.go | 10 ++++++++++ pkg/gui/views.go | 6 ------ pkg/i18n/english.go | 4 +++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkg/gui/context/commit_message_context.go b/pkg/gui/context/commit_message_context.go index 0da0211a8..1ac158839 100644 --- a/pkg/gui/context/commit_message_context.go +++ b/pkg/gui/context/commit_message_context.go @@ -5,7 +5,10 @@ import ( "strings" "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/utils" + "github.com/samber/lo" ) type CommitMessageContext struct { @@ -108,6 +111,13 @@ func (self *CommitMessageContext) SetPanelState( self.viewModel.onSwitchToEditor = onSwitchToEditor self.GetView().Title = summaryTitle self.c.Views().CommitDescription.Title = descriptionTitle + + subtitleTemplate := lo.Ternary(onSwitchToEditor != nil, self.c.Tr.CommitDescriptionSubTitle, self.c.Tr.CommitDescriptionSubTitleNoSwitch) + self.c.Views().CommitDescription.Subtitle = utils.ResolvePlaceholderString(subtitleTemplate, + map[string]string{ + "togglePanelKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel), + "switchToEditorKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.SwitchToEditor), + }) } func (self *CommitMessageContext) RenderCommitLength() { diff --git a/pkg/gui/views.go b/pkg/gui/views.go index d9cf15ffe..327feb1bc 100644 --- a/pkg/gui/views.go +++ b/pkg/gui/views.go @@ -2,9 +2,7 @@ package gui import ( "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/theme" - "github.com/jesseduffield/lazygit/pkg/utils" "github.com/samber/lo" ) @@ -164,10 +162,6 @@ func (gui *Gui) createAllViews() error { gui.Views.CommitDescription.Visible = false gui.Views.CommitDescription.Title = gui.c.Tr.CommitDescriptionTitle - 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) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 109f13e42..50b62549f 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -199,6 +199,7 @@ type TranslationSet struct { CommitSummaryTitle string CommitDescriptionTitle string CommitDescriptionSubTitle string + CommitDescriptionSubTitleNoSwitch string LocalBranchesTitle string SearchTitle string TagsTitle string @@ -969,7 +970,8 @@ func EnglishTranslationSet() TranslationSet { RebaseOptionsTitle: "Rebase options", CommitSummaryTitle: "Commit summary", CommitDescriptionTitle: "Commit description", - CommitDescriptionSubTitle: "Press {{.togglePanelKeyBinding}} to toggle focus", + CommitDescriptionSubTitle: "Press {{.togglePanelKeyBinding}} to toggle focus, {{.switchToEditorKeyBinding}} to switch to editor", + CommitDescriptionSubTitleNoSwitch: "Press {{.togglePanelKeyBinding}} to toggle focus", LocalBranchesTitle: "Local branches", SearchTitle: "Search", TagsTitle: "Tags",