mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 04:45:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adds EditRebaseFromBaseCommit log message to i18n

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

9
pkg/commands/git_commands/rebase.go
View file

@ -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,

54
pkg/i18n/english.go
View file

@ -611,19 +611,20 @@ type Bisect struct {
} }
type Log struct { type Log struct {
EditRebase string EditRebase string
MoveCommitUp string MoveCommitUp string
MoveCommitDown string MoveCommitDown string
CherryPickCommits string CherryPickCommits string
HandleUndo string HandleUndo string
HandleMidRebaseCommand string HandleMidRebaseCommand string
MovingCommitUp string MovingCommitUp string
MovingCommitDown string MovingCommitDown string
RemoveFile string RemoveFile string
CopyToClipboard string CopyToClipboard string
Remove string Remove string
CreateFileWithContent string CreateFileWithContent string
AppendingLineToFile string AppendingLineToFile string
EditRebaseFromBaseCommit string
} }
type Actions struct { type Actions struct {
@ -1474,19 +1475,20 @@ func EnglishTranslationSet() TranslationSet {
Bisecting: "Bisecting", Bisecting: "Bisecting",
}, },
Log: Log{ Log: Log{
EditRebase: "Beginning interactive rebase at '{{.ref}}'", EditRebase: "Beginning interactive rebase at '{{.ref}}'",
MoveCommitUp: "Moving TODO down: '{{.shortSha}}'", MoveCommitUp: "Moving TODO down: '{{.shortSha}}'",
MoveCommitDown: "Moving TODO down: '{{.shortSha}}'", MoveCommitDown: "Moving TODO down: '{{.shortSha}}'",
CherryPickCommits: "Cherry-picking commits:\n'{{.commitLines}}'", CherryPickCommits: "Cherry-picking commits:\n'{{.commitLines}}'",
HandleUndo: "Undoing last conflict resolution", HandleUndo: "Undoing last conflict resolution",
HandleMidRebaseCommand: "Updating rebase action of commit {{.shortSha}} to '{{.action}}'", HandleMidRebaseCommand: "Updating rebase action of commit {{.shortSha}} to '{{.action}}'",
MovingCommitUp: "Moving commit {{.shortSha}} up", MovingCommitUp: "Moving commit {{.shortSha}} up",
MovingCommitDown: "Moving commit {{.shortSha}} down", MovingCommitDown: "Moving commit {{.shortSha}} down",
RemoveFile: "Deleting path '{{.path}}'", RemoveFile: "Deleting path '{{.path}}'",
CopyToClipboard: "Copying '{{.str}}' to clipboard", CopyToClipboard: "Copying '{{.str}}' to clipboard",
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}}",
}, },
} }
} }