diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-04 11:00:48 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-10 00:23:01 +1100 |
| commit | 37bb89dac33cb4236bf817e1e2e09cb1cbfade5c (patch) | |
| tree | ea06fa4595a7f2d7eff80c2602648b18450f5988 /pkg/gui/credentials_panel.go | |
| parent | 7d9aa97f9691dd0a8658c4b6626877a198c5d03c (diff) | |
type i18n
Diffstat (limited to 'pkg/gui/credentials_panel.go')
| -rw-r--r-- | pkg/gui/credentials_panel.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkg/gui/credentials_panel.go b/pkg/gui/credentials_panel.go index 8620f7a23..d125e3c8f 100644 --- a/pkg/gui/credentials_panel.go +++ b/pkg/gui/credentials_panel.go @@ -4,6 +4,7 @@ import ( "strings" "github.com/jesseduffield/gocui" + "github.com/jesseduffield/lazygit/pkg/utils" ) type credentials chan string @@ -14,10 +15,10 @@ func (gui *Gui) promptUserForCredential(passOrUname string) string { gui.g.Update(func(g *gocui.Gui) error { credentialsView, _ := g.View("credentials") if passOrUname == "username" { - credentialsView.Title = gui.Tr.SLocalize("CredentialsUsername") + credentialsView.Title = gui.Tr.CredentialsUsername credentialsView.Mask = 0 } else { - credentialsView.Title = gui.Tr.SLocalize("CredentialsPassword") + credentialsView.Title = gui.Tr.CredentialsPassword credentialsView.Mask = '*' } @@ -53,13 +54,14 @@ func (gui *Gui) handleCloseCredentialsView(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleCredentialsViewFocused() error { keybindingConfig := gui.Config.GetUserConfig().Keybinding - message := gui.Tr.TemplateLocalize( - "CloseConfirm", - Teml{ + message := utils.ResolvePlaceholderString( + gui.Tr.CloseConfirm, + map[string]string{ "keyBindClose": gui.getKeyDisplay(keybindingConfig.Universal.Return), "keyBindConfirm": gui.getKeyDisplay(keybindingConfig.Universal.Confirm), }, ) + gui.renderString("options", message) return nil } @@ -69,7 +71,7 @@ func (gui *Gui) handleCredentialsPopup(cmdErr error) { if cmdErr != nil { errMessage := cmdErr.Error() if strings.Contains(errMessage, "Invalid username or password") { - errMessage = gui.Tr.SLocalize("PassUnameWrong") + errMessage = gui.Tr.PassUnameWrong } // we are not logging this error because it may contain a password gui.createErrorPanel(errMessage) |