go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-01 22:52:01 +02:00
Code Issues Releases Activity

i18n for rebase loading states

Browse Source
This commit is contained in:
Jesse Duffield
2019-03-03 16:11:20 +11:00
parent 0079015102
commit 43758cbb5f
5 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/gui/merge_panel.go
View File

@@ -264,7 +264,6 @@ func (gui *Gui) handleEscapeMerge(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleCompleteMerge() error {
filesView := gui.getFilesView()
if err := gui.stageSelectedFile(gui.g); err != nil {
return err
}
@@ -278,12 +277,14 @@ func (gui *Gui) handleCompleteMerge() error {
}
// if there are no more files with merge conflicts, we should ask whether the user wants to continue
if !gui.anyFilesWithMergeConflicts() {
// ask if user wants to continue
if err := gui.createConfirmationPanel(gui.g, filesView, "continue", gui.Tr.SLocalize("ConflictsResolved"), func(g *gocui.Gui, v *gocui.View) error {
return gui.genericMergeCommand("continue")
}, nil); err != nil {
return err
}
return gui.promptToContinue()
}
return gui.handleEscapeMerge(gui.g, gui.getMainView())
}
// promptToContinue asks the user if they want to continue the rebase/merge that's in progress
func (gui *Gui) promptToContinue() error {
return gui.createConfirmationPanel(gui.g, gui.getFilesView(), "continue", gui.Tr.SLocalize("ConflictsResolved"), func(g *gocui.Gui, v *gocui.View) error {
return gui.genericMergeCommand("continue")
}, nil)
}