From 51e205ce11d9c7301f4c78d1fc7f69d6bd313447 Mon Sep 17 00:00:00 2001 From: Karl Heitmann Date: Sun, 30 Jul 2023 21:33:47 -0400 Subject: [PATCH] Moves hard coded strings for LogCommand to i18n. --- pkg/commands/git_commands/rebase.go | 32 ++++++++++++-- pkg/commands/oscommands/os.go | 43 ++++++++++++++++--- .../controllers/local_commits_controller.go | 29 ++++++++++--- .../controllers/merge_conflicts_controller.go | 2 +- pkg/i18n/english.go | 26 +++++++++++ 5 files changed, 115 insertions(+), 17 deletions(-) diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index d491b6f5e31..c952c7fd194 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", diff --git a/pkg/commands/oscommands/os.go b/pkg/commands/oscommands/os.go index 4a77310b5b1..f260cce8533 100644 --- a/pkg/commands/oscommands/os.go +++ b/pkg/commands/oscommands/os.go @@ -117,7 +117,15 @@ func (c *OSCommand) Quote(message string) string { // AppendLineToFile adds a new line in file func (c *OSCommand) AppendLineToFile(filename, line string) error { - c.LogCommand(fmt.Sprintf("Appending '%s' to file '%s'", line, filename), false) + msg := utils.ResolvePlaceholderString( + c.Tr.Actions.LogAppendingLineToFile, + map[string]string{ + "line": line, + "filename": filename, + }, + ) + c.LogCommand(msg, false) + f, err := os.OpenFile(filename, os.O_APPEND|os.O_RDWR|os.O_CREATE, 0o600) if err != nil { return utils.WrapError(err) @@ -154,7 +162,13 @@ func (c *OSCommand) AppendLineToFile(filename, line string) error { // CreateFileWithContent creates a file with the given content func (c *OSCommand) CreateFileWithContent(path string, content string) error { - c.LogCommand(fmt.Sprintf("Creating file '%s'", path), false) + msg := utils.ResolvePlaceholderString( + c.Tr.Actions.LogCreateFileWithContent, + map[string]string{ + "path": path, + }, + ) + c.LogCommand(msg, false) if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil { c.Log.Error(err) return err @@ -170,7 +184,13 @@ func (c *OSCommand) CreateFileWithContent(path string, content string) error { // Remove removes a file or directory at the specified path func (c *OSCommand) Remove(filename string) error { - c.LogCommand(fmt.Sprintf("Removing '%s'", filename), false) + msg := utils.ResolvePlaceholderString( + c.Tr.Actions.LogRemove, + map[string]string{ + "filename": filename, + }, + ) + c.LogCommand(msg, false) err := os.RemoveAll(filename) return utils.WrapError(err) } @@ -265,7 +285,14 @@ func PrepareForChildren(cmd *exec.Cmd) { func (c *OSCommand) CopyToClipboard(str string) error { escaped := strings.Replace(str, "\n", "\\n", -1) truncated := utils.TruncateWithEllipsis(escaped, 40) - c.LogCommand(fmt.Sprintf("Copying '%s' to clipboard", truncated), false) + + msg := utils.ResolvePlaceholderString( + c.Tr.Actions.LogCopyToClipboard, + map[string]string{ + "str": truncated, + }, + ) + c.LogCommand(msg, false) if c.UserConfig.OS.CopyToClipboardCmd != "" { cmdStr := utils.ResolvePlaceholderString(c.UserConfig.OS.CopyToClipboardCmd, map[string]string{ "text": c.Cmd.Quote(str), @@ -277,7 +304,13 @@ func (c *OSCommand) CopyToClipboard(str string) error { } func (c *OSCommand) RemoveFile(path string) error { - c.LogCommand(fmt.Sprintf("Deleting path '%s'", path), false) + msg := utils.ResolvePlaceholderString( + c.Tr.Actions.LogRemoveFile, + map[string]string{ + "path": path, + }, + ) + c.LogCommand(msg, false) return c.removeFileFn(path) } diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 696e4e717cf..3489f7f1e26 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.Actions.LogHandleMidRebaseCommand, + 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.Actions.LogMovingCommitDown, + 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.Actions.LogMovingCommitUp, + 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 c90ada92e3b..38419e37adb 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.Actions.LogHandleUndo, false) if err := os.WriteFile(state.GetPath(), []byte(state.GetContent()), 0o644); err != nil { return err } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 84f881c5da7..1831cbe48fa 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -717,6 +717,19 @@ type Actions struct { BisectMark string RemoveWorktree string AddWorktree string + LogEditRebase string + LogMoveCommitUp string + LogMoveCommitDown string + LogCherryPickCommits string + LogHandleUndo string + LogHandleMidRebaseCommand string + LogMovingCommitUp string + LogMovingCommitDown string + LogRemoveFile string + LogCopyToClipboard string + LogRemove string + LogCreateFileWithContent string + LogAppendingLineToFile string } const englishIntroPopupMessage = ` @@ -1438,6 +1451,19 @@ func EnglishTranslationSet() TranslationSet { BisectMark: "Bisect mark", RemoveWorktree: "Remove worktree", AddWorktree: "Add worktree", + LogEditRebase: "Beginning interactive rebase at '{{.ref}}'", + LogMoveCommitUp: "Moving TODO down: '{{.shortSha}}'", + LogMoveCommitDown: "Moving TODO down: '{{.shortSha}}'", + LogCherryPickCommits: "Cherry-picking commits:\n'{{.commitLines}}'", + LogHandleUndo: "Undoing last conflict resolution", + LogHandleMidRebaseCommand: "Updating rebase action of commit {{.shortSha}} to '{{.action}}'", + LogMovingCommitUp: "Moving commit {{.shortSha}} up", + LogMovingCommitDown: "Moving commit {{.shortSha}} down", + LogRemoveFile: "Deleting path '{{.path}}'", + LogCopyToClipboard: "Copying '{{.str}}' to clipboard", + LogRemove: "Removing '{{.filename}}'", + LogCreateFileWithContent: "Creating file '{{.path}}'", + LogAppendingLineToFile: "Appending '{{.line}}' to file '{{.filename}}'", }, Bisect: Bisect{ Mark: "Mark current commit (%s) as %s",