diff options
Diffstat (limited to 'pkg/commands/git_commands/rebase.go')
| -rw-r--r-- | pkg/commands/git_commands/rebase.go | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index d491b6f5e..c952c7fd1 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -104,7 +104,13 @@ func (self *RebaseCommands) MoveCommitDown(commits []*models.Commit, index int) sha := commits[index].Sha - self.os.LogCommand(fmt.Sprintf("Moving TODO down: %s", utils.ShortSha(sha)), false) + msg := utils.ResolvePlaceholderString( + self.Tr.Actions.LogMoveCommitDown, + map[string]string{ + "shortSha": utils.ShortSha(sha), + }, + ) + self.os.LogCommand(msg, false) return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseShaOrRoot: baseShaOrRoot, @@ -118,7 +124,13 @@ func (self *RebaseCommands) MoveCommitUp(commits []*models.Commit, index int) er sha := commits[index].Sha - self.os.LogCommand(fmt.Sprintf("Moving TODO up: %s", utils.ShortSha(sha)), false) + msg := utils.ResolvePlaceholderString( + self.Tr.Actions.LogMoveCommitUp, + map[string]string{ + "shortSha": utils.ShortSha(sha), + }, + ) + self.os.LogCommand(msg, false) return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseShaOrRoot: baseShaOrRoot, @@ -149,7 +161,13 @@ func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, index in } func (self *RebaseCommands) EditRebase(branchRef string) error { - self.os.LogCommand(fmt.Sprintf("Beginning interactive rebase at '%s'", branchRef), false) + msg := utils.ResolvePlaceholderString( + self.Tr.Actions.LogEditRebase, + map[string]string{ + "ref": branchRef, + }, + ) + self.os.LogCommand(msg, false) return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseShaOrRoot: branchRef, instruction: daemon.NewInsertBreakInstruction(), @@ -412,7 +430,13 @@ func (self *RebaseCommands) CherryPickCommits(commits []*models.Commit) error { commitLines := lo.Map(commits, func(commit *models.Commit, _ int) string { return fmt.Sprintf("%s %s", utils.ShortSha(commit.Sha), commit.Name) }) - self.os.LogCommand(fmt.Sprintf("Cherry-picking commits:\n%s", strings.Join(commitLines, "\n")), false) + msg := utils.ResolvePlaceholderString( + self.Tr.Actions.LogCherryPickCommits, + map[string]string{ + "commitLines": strings.Join(commitLines, "\n"), + }, + ) + self.os.LogCommand(msg, false) return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{ baseShaOrRoot: "HEAD", |