diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-14 23:48:18 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-14 23:48:18 +1000 |
| commit | d923796cffcfe5f804cd3479cceb6628b741b0ab (patch) | |
| tree | 2fec629e89233f1e70eb7d18254d616ea4e5ff3a /pkg | |
| parent | ba2b6fbf1fa13ca5a72c18fba996bdd561d4899c (diff) | |
| parent | 73a168254066278b6f5d38667564877a071b4376 (diff) | |
Merge branch 'master' of https://github.com/mjarkk/lazygit
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/app/app.go | 2 | ||||
| -rw-r--r-- | pkg/gui/files_panel.go | 1 | ||||
| -rw-r--r-- | pkg/gui/gui.go | 4 | ||||
| -rw-r--r-- | pkg/i18n/i18n.go | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/pkg/app/app.go b/pkg/app/app.go index f07757f98..f4311bb03 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -9,7 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands" "github.com/jesseduffield/lazygit/pkg/config" "github.com/jesseduffield/lazygit/pkg/gui" - "github.com/mjarkk/lazygit/pkg/i18n" + "github.com/jesseduffield/lazygit/pkg/i18n" ) // App struct diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 312c06554..3afbc1b85 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -13,6 +13,7 @@ import ( "github.com/fatih/color" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/i18n" ) func (gui *Gui) stagedFiles() []commands.File { diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 4e8382eae..11c6cae74 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -19,7 +19,7 @@ import ( "github.com/golang-collections/collections/stack" "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" - "github.com/mjarkk/lazygit/pkg/i18n" + "github.com/jesseduffield/lazygit/pkg/i18n" ) // OverlappingEdges determines if panel edges overlap @@ -78,7 +78,7 @@ type guiState struct { } // NewGui builds a new gui handler -func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *lang.Localizer, version string) (*Gui, error) { +func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *commands.OSCommand, tr *i18n.Localizer, version string) (*Gui, error) { initialState := guiState{ Files: make([]commands.File, 0), PreviousView: "files", diff --git a/pkg/i18n/i18n.go b/pkg/i18n/i18n.go index e58c05aec..f54cb9d80 100644 --- a/pkg/i18n/i18n.go +++ b/pkg/i18n/i18n.go @@ -18,7 +18,10 @@ type Localizer struct { func NewLocalizer(log *logrus.Logger) (*Localizer, error) { // detect the user's language - userLang, _ := jibber_jabber.DetectLanguage() + userLang, err := jibber_jabber.DetectLanguage() + if err != nil { + return nil, err + } log.Info("language: " + userLang) // create a i18n bundle that can be used to add translations and other things |