diff options
Diffstat (limited to 'pkg/gui/remote_branches_panel.go')
| -rw-r--r-- | pkg/gui/remote_branches_panel.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkg/gui/remote_branches_panel.go b/pkg/gui/remote_branches_panel.go index b879272b3..1155529ce 100644 --- a/pkg/gui/remote_branches_panel.go +++ b/pkg/gui/remote_branches_panel.go @@ -5,6 +5,7 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" + "github.com/jesseduffield/lazygit/pkg/utils" ) // list panel functions @@ -52,13 +53,13 @@ func (gui *Gui) handleDeleteRemoteBranch(g *gocui.Gui, v *gocui.View) error { if remoteBranch == nil { return nil } - message := fmt.Sprintf("%s '%s'?", gui.Tr.SLocalize("DeleteRemoteBranchMessage"), remoteBranch.FullName()) + message := fmt.Sprintf("%s '%s'?", gui.Tr.DeleteRemoteBranchMessage, remoteBranch.FullName()) return gui.ask(askOpts{ - title: gui.Tr.SLocalize("DeleteRemoteBranch"), + title: gui.Tr.DeleteRemoteBranch, prompt: message, handleConfirm: func() error { - return gui.WithWaitingStatus(gui.Tr.SLocalize("DeletingStatus"), func() error { + return gui.WithWaitingStatus(gui.Tr.DeletingStatus, func() error { if err := gui.GitCommand.DeleteRemoteBranch(remoteBranch.RemoteName, remoteBranch.Name); err != nil { return err } @@ -78,16 +79,16 @@ func (gui *Gui) handleSetBranchUpstream(g *gocui.Gui, v *gocui.View) error { selectedBranch := gui.getSelectedRemoteBranch() checkedOutBranch := gui.getCheckedOutBranch() - message := gui.Tr.TemplateLocalize( - "SetUpstreamMessage", - Teml{ + message := utils.ResolvePlaceholderString( + gui.Tr.SetUpstreamMessage, + map[string]string{ "checkedOut": checkedOutBranch.Name, "selected": selectedBranch.FullName(), }, ) return gui.ask(askOpts{ - title: gui.Tr.SLocalize("SetUpstreamTitle"), + title: gui.Tr.SetUpstreamTitle, prompt: message, handleConfirm: func() error { if err := gui.GitCommand.SetBranchUpstream(selectedBranch.RemoteName, selectedBranch.Name, checkedOutBranch.Name); err != nil { |