sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Moves log related translations into its own Tr.Log. namespace

Browse Source
This commit is contained in:
Karl Heitmann
2023-07-31 19:42:41 -04:00
parent 51e205ce11
commit b7ba06fa5b
5 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/commands/git_commands/rebase.go
View File

@ -105,7 +105,7 @@ func (self *RebaseCommands) MoveCommitDown(commits []*models.Commit, index int)
sha := commits[index].Sha
msg := utils.ResolvePlaceholderString(
self.Tr.Actions.LogMoveCommitDown,
self.Tr.Log.MoveCommitDown,
map[string]string{
"shortSha": utils.ShortSha(sha),
},
@ -125,7 +125,7 @@ func (self *RebaseCommands) MoveCommitUp(commits []*models.Commit, index int) er
sha := commits[index].Sha
msg := utils.ResolvePlaceholderString(
self.Tr.Actions.LogMoveCommitUp,
self.Tr.Log.MoveCommitUp,
map[string]string{
"shortSha": utils.ShortSha(sha),
},
@ -162,7 +162,7 @@ func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, index in
func (self *RebaseCommands) EditRebase(branchRef string) error {
msg := utils.ResolvePlaceholderString(
self.Tr.Actions.LogEditRebase,
self.Tr.Log.EditRebase,
map[string]string{
"ref": branchRef,
},
@ -431,7 +431,7 @@ func (self *RebaseCommands) CherryPickCommits(commits []*models.Commit) error {
return fmt.Sprintf("%s %s", utils.ShortSha(commit.Sha), commit.Name)
})
msg := utils.ResolvePlaceholderString(
self.Tr.Actions.LogCherryPickCommits,
self.Tr.Log.CherryPickCommits,
map[string]string{
"commitLines": strings.Join(commitLines, "\n"),
},

10
pkg/commands/oscommands/os.go
View File

@ -118,7 +118,7 @@ func (c *OSCommand) Quote(message string) string {
// AppendLineToFile adds a new line in file
func (c *OSCommand) AppendLineToFile(filename, line string) error {
msg := utils.ResolvePlaceholderString(
c.Tr.Actions.LogAppendingLineToFile,
c.Tr.Log.AppendingLineToFile,
map[string]string{
"line": line,
"filename": filename,
@ -163,7 +163,7 @@ 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 {
msg := utils.ResolvePlaceholderString(
c.Tr.Actions.LogCreateFileWithContent,
c.Tr.Log.CreateFileWithContent,
map[string]string{
"path": path,
},
@ -185,7 +185,7 @@ 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 {
msg := utils.ResolvePlaceholderString(
c.Tr.Actions.LogRemove,
c.Tr.Log.Remove,
map[string]string{
"filename": filename,
},
@ -287,7 +287,7 @@ func (c *OSCommand) CopyToClipboard(str string) error {
truncated := utils.TruncateWithEllipsis(escaped, 40)
msg := utils.ResolvePlaceholderString(
c.Tr.Actions.LogCopyToClipboard,
c.Tr.Log.CopyToClipboard,
map[string]string{
"str": truncated,
},
@ -305,7 +305,7 @@ func (c *OSCommand) CopyToClipboard(str string) error {
func (c *OSCommand) RemoveFile(path string) error {
msg := utils.ResolvePlaceholderString(
c.Tr.Actions.LogRemoveFile,
c.Tr.Log.RemoveFile,
map[string]string{
"path": path,
},