Adds EditRebaseFromBaseCommit log message to i18n

This commit is contained in:
Karl Heitmann 2023-07-31 19:57:14 -04:00
parent b7ba06fa5b
commit 917cfd7586
2 changed files with 36 additions and 27 deletions

View file

@ -175,7 +175,14 @@ func (self *RebaseCommands) EditRebase(branchRef string) error {
}
func (self *RebaseCommands) EditRebaseFromBaseCommit(targetBranchName string, baseCommit string) error {
self.os.LogCommand(fmt.Sprintf("Beginning interactive rebase from '%s' onto '%s", baseCommit, targetBranchName), false)
msg := utils.ResolvePlaceholderString(
self.Tr.Log.EditRebaseFromBaseCommit,
map[string]string{
"baseCommit": baseCommit,
"targetBranchName": targetBranchName,
},
)
self.os.LogCommand(msg, false)
return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
baseShaOrRoot: baseCommit,
onto: targetBranchName,

View file

@ -624,6 +624,7 @@ type Log struct {
Remove string
CreateFileWithContent string
AppendingLineToFile string
EditRebaseFromBaseCommit string
}
type Actions struct {
@ -1487,6 +1488,7 @@ func EnglishTranslationSet() TranslationSet {
Remove: "Removing '{{.filename}}'",
CreateFileWithContent: "Creating file '{{.path}}'",
AppendingLineToFile: "Appending '{{.line}}' to file '{{.filename}}'",
EditRebaseFromBaseCommit: "Beginning interactive rebase from '{{.baseCommit}}' onto '{{.targetBranchName}}",
},
}
}