summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--pkg/app/app.go2
-rw-r--r--pkg/gui/files_panel.go1
-rw-r--r--pkg/gui/gui.go4
-rw-r--r--pkg/i18n/i18n.go5
5 files changed, 9 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index bcb7cc884..21d9c94d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.1.58 \ No newline at end of file
+v0.1.59 \ No newline at end of file
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