diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-18 12:08:21 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-18 12:08:21 +1000 |
commit | 4dc6d40b5a2d7b7ba882c92f3c62b7122fcd849d (patch) | |
tree | 11da254d4335b16f55d0177b4f2cf0a75d1cc28b /pkg/app | |
parent | df7d1df4cbad9065c29fef08d3e8d143d8836b3f (diff) | |
parent | 99d40c2f8ecdecd39df80b199f9ff1cc9eb90434 (diff) |
merge master
Diffstat (limited to 'pkg/app')
-rw-r--r-- | pkg/app/app.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkg/app/app.go b/pkg/app/app.go index 0eb9c8d25..e18a98dc4 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -9,6 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/gui" + "github.com/jesseduffield/lazygit/pkg/i18n" ) // App struct @@ -20,6 +21,7 @@ type App struct { OSCommand *commands.OSCommand GitCommand *commands.GitCommand Gui *gui.Gui + Tr *i18n.Localizer } func newLogger(config config.AppConfigurer) *logrus.Logger { @@ -48,11 +50,17 @@ func NewApp(config config.AppConfigurer) (*App, error) { if err != nil { return nil, err } + + app.Tr, err = i18n.NewLocalizer(app.Log) + if err != nil { + return nil, err + } + app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand) if err != nil { return nil, err } - app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, config.GetVersion(), config.GetUserConfig()) + app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config.GetUserConfig(), config.GetVersion()) if err != nil { return nil, err } |