mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 12:55:47 +02:00
Adds EditRebaseFromBaseCommit log message to i18n
This commit is contained in:
parent
b7ba06fa5b
commit
917cfd7586
2 changed files with 36 additions and 27 deletions
|
@ -175,7 +175,14 @@ func (self *RebaseCommands) EditRebase(branchRef string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (self *RebaseCommands) EditRebaseFromBaseCommit(targetBranchName string, baseCommit 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{
|
return self.PrepareInteractiveRebaseCommand(PrepareInteractiveRebaseCommandOpts{
|
||||||
baseShaOrRoot: baseCommit,
|
baseShaOrRoot: baseCommit,
|
||||||
onto: targetBranchName,
|
onto: targetBranchName,
|
||||||
|
|
|
@ -624,6 +624,7 @@ type Log struct {
|
||||||
Remove string
|
Remove string
|
||||||
CreateFileWithContent string
|
CreateFileWithContent string
|
||||||
AppendingLineToFile string
|
AppendingLineToFile string
|
||||||
|
EditRebaseFromBaseCommit string
|
||||||
}
|
}
|
||||||
|
|
||||||
type Actions struct {
|
type Actions struct {
|
||||||
|
@ -1487,6 +1488,7 @@ func EnglishTranslationSet() TranslationSet {
|
||||||
Remove: "Removing '{{.filename}}'",
|
Remove: "Removing '{{.filename}}'",
|
||||||
CreateFileWithContent: "Creating file '{{.path}}'",
|
CreateFileWithContent: "Creating file '{{.path}}'",
|
||||||
AppendingLineToFile: "Appending '{{.line}}' to file '{{.filename}}'",
|
AppendingLineToFile: "Appending '{{.line}}' to file '{{.filename}}'",
|
||||||
|
EditRebaseFromBaseCommit: "Beginning interactive rebase from '{{.baseCommit}}' onto '{{.targetBranchName}}",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue