diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-08-01 10:06:48 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 10:06:48 +1000 |
commit | e932aaaeafa1fb16276ab9c36e1e33c971e38019 (patch) | |
tree | b50f31a7d8fdc411a28ddbfc5bbbe83bac63efe9 /pkg/gui | |
parent | b44d0c4bde35b781be89f608fff6a56c0af2994b (diff) | |
parent | 917cfd758689064d5af52c3393f41bb0f731625e (diff) |
Internationalise logging of commands (#2852)
Diffstat (limited to 'pkg/gui')
-rw-r--r-- | pkg/gui/controllers/local_commits_controller.go | 29 | ||||
-rw-r--r-- | pkg/gui/controllers/merge_conflicts_controller.go | 2 |
2 files changed, 23 insertions, 8 deletions
diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 696e4e717..4a2627cdc 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -421,10 +421,15 @@ func (self *LocalCommitsController) handleMidRebaseCommand(action todo.TodoComma } self.c.LogAction("Update rebase TODO") - self.c.LogCommand( - fmt.Sprintf("Updating rebase action of commit %s to '%s'", commit.ShortSha(), action.String()), - false, + + msg := utils.ResolvePlaceholderString( + self.c.Tr.Log.HandleMidRebaseCommand, + map[string]string{ + "shortSha": commit.ShortSha(), + "action": action.String(), + }, ) + self.c.LogCommand(msg, false) if err := self.c.Git().Rebase.EditRebaseTodo(commit, action); err != nil { return false, self.c.Error(err) @@ -452,7 +457,14 @@ func (self *LocalCommitsController) moveDown(commit *models.Commit) error { // logging directly here because MoveTodoDown doesn't have enough information // to provide a useful log self.c.LogAction(self.c.Tr.Actions.MoveCommitDown) - self.c.LogCommand(fmt.Sprintf("Moving commit %s down", commit.ShortSha()), false) + + msg := utils.ResolvePlaceholderString( + self.c.Tr.Log.MovingCommitDown, + map[string]string{ + "shortSha": commit.ShortSha(), + }, + ) + self.c.LogCommand(msg, false) if err := self.c.Git().Rebase.MoveTodoDown(commit); err != nil { return self.c.Error(err) @@ -487,10 +499,13 @@ func (self *LocalCommitsController) moveUp(commit *models.Commit) error { // logging directly here because MoveTodoDown doesn't have enough information // to provide a useful log self.c.LogAction(self.c.Tr.Actions.MoveCommitUp) - self.c.LogCommand( - fmt.Sprintf("Moving commit %s up", commit.ShortSha()), - false, + msg := utils.ResolvePlaceholderString( + self.c.Tr.Log.MovingCommitUp, + map[string]string{ + "shortSha": commit.ShortSha(), + }, ) + self.c.LogCommand(msg, false) if err := self.c.Git().Rebase.MoveTodoUp(self.c.Model().Commits[index]); err != nil { return self.c.Error(err) diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index c90ada92e..86f49489c 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -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.Log.HandleUndo, false) if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil { return err } |