go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-20 05:19:24 +02:00
Code Issues Releases Activity

Add empty output message and refreshing to showOutput

Browse Source
This commit is contained in:
sportshead 2022-07-29 14:12:36 +08:00
parent 168fbe0a6c
commit f2880ecb46
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gui/services/custom_commands/handler_creator.go
View File

@ -1,6 +1,8 @@
package custom_commands
import (
"strings"
"github.com/jesseduffield/generics/slices"
"github.com/jesseduffield/lazygit/pkg/commands"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
@ -191,8 +193,15 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses
if err != nil {
return self.c.Error(err)
}
if customCommand.ShowOutput {
return self.c.Alert(cmdStr, output)
if strings.TrimSpace(output) == "" {
output = self.c.Tr.EmptyOutput
}
if err = self.c.Alert(cmdStr, output); err != nil {
return self.c.Error(err)
}
return self.c.Refresh(types.RefreshOptions{})
}
return self.c.Refresh(types.RefreshOptions{})
})

2
pkg/i18n/english.go
View File

@ -501,6 +501,7 @@ type TranslationSet struct {
UpstreamGone string
NukeDescription string
DiscardStagedChangesDescription string
EmptyOutput string
Actions Actions
Bisect Bisect
}
@ -1136,6 +1137,7 @@ func EnglishTranslationSet() TranslationSet {
UpstreamGone: "(upstream gone)",
NukeDescription: "If you want to make all the changes in the worktree go away, this is the way to do it. If there are dirty submodule changes this will stash those changes in the submodule(s).",
DiscardStagedChangesDescription: "This will create a new stash entry containing only staged files and then drop it, so that the working tree is left with only unstaged changes",
EmptyOutput: "<empty output>",
Actions: Actions{
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
CheckoutCommit: "Checkout commit",