sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Moves hard coded strings for LogCommand to i18n.

Browse Source
This commit is contained in:
Karl Heitmann
2023-07-30 21:33:47 -04:00
parent 6984a4f4d4
commit 51e205ce11
5 changed files with 115 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/merge_conflicts_controller.go
View File

@ -215,7 +215,7 @@ func (self *MergeConflictsController) HandleUndo() error {
}
self.c.LogAction("Restoring file to previous state")
self.c.LogCommand("Undoing last conflict resolution", false)
self.c.LogCommand(self.c.Tr.Actions.LogHandleUndo, false)
if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil {
return err
}