diff options
author | Moritz Haase <Moritz.Haase@bmw.de> | 2022-03-24 13:19:46 +0100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-28 09:13:34 +1100 |
commit | b7079634ee6b597ab5f8082e2deda2b52d9cc648 (patch) | |
tree | 4c1c10f80229ee6e3a5e608fa6021da0fffb63c6 /pkg/gui | |
parent | 9bccc20888bbd92edbb902e35606166e29b12afe (diff) |
i18n: Make user-facing strings in the updater translatable
Convert a number of static (english) user-facing string in the updater code to
translatable ones.
Diffstat (limited to 'pkg/gui')
-rw-r--r-- | pkg/gui/updates.go | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkg/gui/updates.go b/pkg/gui/updates.go index 83642a81a..edc208625 100644 --- a/pkg/gui/updates.go +++ b/pkg/gui/updates.go @@ -1,16 +1,21 @@ package gui import ( - "fmt" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/gui/types" + "github.com/jesseduffield/lazygit/pkg/utils" ) func (gui *Gui) showUpdatePrompt(newVersion string) error { + message := utils.ResolvePlaceholderString( + gui.Tr.UpdateAvailable, map[string]string{ + "newVersion": newVersion, + }, + ) + return gui.c.Ask(types.AskOpts{ - Title: "New version available!", - Prompt: fmt.Sprintf("Download version %s? (enter/esc)", newVersion), + Title: gui.Tr.UpdateAvailableTitle, + Prompt: message, HandleConfirm: func() error { gui.startUpdating(newVersion) return nil @@ -23,7 +28,7 @@ func (gui *Gui) onUserUpdateCheckFinish(newVersion string, err error) error { return gui.c.Error(err) } if newVersion == "" { - return gui.c.ErrorMsg("New version not found") + return gui.c.ErrorMsg(gui.Tr.FailedToRetrieveLatestVersionErr) } return gui.showUpdatePrompt(newVersion) } @@ -46,7 +51,7 @@ func (gui *Gui) onBackgroundUpdateCheckFinish(newVersion string, err error) erro func (gui *Gui) startUpdating(newVersion string) { gui.State.Updating = true - statusId := gui.statusManager.addWaitingStatus("updating") + statusId := gui.statusManager.addWaitingStatus(gui.Tr.UpdateInProgressWaitingStatus) gui.Updater.Update(newVersion, func(err error) error { return gui.onUpdateFinish(statusId, err) }) } @@ -56,7 +61,12 @@ func (gui *Gui) onUpdateFinish(statusId int, err error) error { gui.OnUIThread(func() error { _ = gui.renderString(gui.Views.AppStatus, "") if err != nil { - return gui.c.ErrorMsg("Update failed: " + err.Error()) + errMessage := utils.ResolvePlaceholderString( + gui.Tr.UpdateFailedErr, map[string]string{ + "errMessage": err.Error(), + }, + ) + return gui.c.ErrorMsg(errMessage) } return nil }) @@ -66,8 +76,8 @@ func (gui *Gui) onUpdateFinish(statusId int, err error) error { func (gui *Gui) createUpdateQuitConfirmation() error { return gui.c.Ask(types.AskOpts{ - Title: "Currently Updating", - Prompt: "An update is in progress. Are you sure you want to quit?", + Title: gui.Tr.ConfirmQuitDuringUpdateTitle, + Prompt: gui.Tr.ConfirmQuitDuringUpdate, HandleConfirm: func() error { return gocui.ErrQuit }, |