Added a view basic translation functions and translation file

pkg/gui/files_panel.go

@@ -1,6 +1,7 @@
 package gui
 
 import (
+	"github.com/jesseduffield/lazygit/pkg/i18n"
 
 	// "io"
 	// "io/ioutil"
@@ -147,27 +148,27 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
 
 func (gui *Gui) renderfilesOptions(g *gocui.Gui, file *commands.File) error {
 	optionsMap := map[string]string{
-		"← → ↑ ↓":   "navigate",
-		"S":         "stash files",
-		"c":         "commit changes",
-		"o":         "open",
-		"i":         "ignore",
-		"d":         "delete",
-		"space":     "toggle staged",
-		"R":         "refresh",
-		"t":         "add patch",
-		"e":         "edit",
-		"PgUp/PgDn": "scroll",
+		"← → ↑ ↓":   lang.SLocalize("navigate", "navigate"),
+		"S":         lang.SLocalize("stashFiles", "stash files"),
+		"c":         lang.SLocalize("CommitChanges", "commit changes"),
+		"o":         lang.SLocalize("open", "open"),
+		"i":         lang.SLocalize("ignore", "ignore"),
+		"d":         lang.SLocalize("delete", "delete"),
+		"space":     lang.SLocalize("toggleStaged", "toggle staged"),
+		"R":         lang.SLocalize("refresh", "refresh"),
+		"t":         lang.SLocalize("addPatch", "add patch"),
+		"e":         lang.SLocalize("edit", "edit"),
+		"PgUp/PgDn": lang.SLocalize("scroll", "scroll"),
 	}
 	if gui.State.HasMergeConflicts {
-		optionsMap["a"] = "abort merge"
-		optionsMap["m"] = "resolve merge conflicts"
+		optionsMap["a"] = lang.SLocalize("abortMerge", "abort merge")
+		optionsMap["m"] = lang.SLocalize("resolveMergeConflicts", "resolve merge conflicts")
 	}
 	if file == nil {
 		return gui.renderOptionsMap(g, optionsMap)
 	}
 	if file.Tracked {
-		optionsMap["d"] = "checkout"
+		optionsMap["d"] = lang.SLocalize("checkout", "checkout")
 	}
 	return gui.renderOptionsMap(g, optionsMap)
 }

pkg/gui/gui.go

@@ -19,6 +19,7 @@ import (
 	"github.com/golang-collections/collections/stack"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands"
+	"github.com/jesseduffield/lazygit/pkg/i18n"
 )
 
 // OverlappingEdges determines if panel edges overlap
@@ -133,7 +134,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			if err != gocui.ErrUnknownView {
 				return err
 			}
-			v.Title = "Not enough space to render panels"
+			v.Title = lang.SLocalize("NotEnoughSpace", "Not enough space to render panels")
 			v.Wrap = true
 		}
 		return nil
@@ -152,7 +153,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		v.Title = "Diff"
+		v.Title = lang.SLocalize("DiffTitle", "Diff")
 		v.Wrap = true
 		v.FgColor = gocui.ColorWhite
 	}
@@ -161,7 +162,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		v.Title = "Status"
+		v.Title = lang.SLocalize("StatusTitle", "Status")
 		v.FgColor = gocui.ColorWhite
 	}
 
@@ -171,31 +172,31 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 		filesView.Highlight = true
-		filesView.Title = "Files"
+		filesView.Title = lang.SLocalize("FilesTitle", "Files")
 		v.FgColor = gocui.ColorWhite
 	}
 
 	if v, err := g.SetView("branches", 0, filesBranchesBoundary+panelSpacing, leftSideWidth, commitsBranchesBoundary, gocui.TOP|gocui.BOTTOM); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		v.Title = "Branches"
+		v.Title = lang.SLocalize("BranchesTitle", "Branches")
 		v.FgColor = gocui.ColorWhite
 	}
 
 	if v, err := g.SetView("commits", 0, commitsBranchesBoundary+panelSpacing, leftSideWidth, commitsStashBoundary, gocui.TOP|gocui.BOTTOM); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		v.Title = "Commits"
+		v.Title = lang.SLocalize("CommitsTitle", "Commits")
 		v.FgColor = gocui.ColorWhite
 	}
 
 	if v, err := g.SetView("stash", 0, commitsStashBoundary+panelSpacing, leftSideWidth, optionsTop, gocui.TOP|gocui.RIGHT); err != nil {
 		if err != gocui.ErrUnknownView {
 			return err
 		}
-		v.Title = "Stash"
+		v.Title = lang.SLocalize("StashTitle", "Stash")
 		v.FgColor = gocui.ColorWhite
 	}
 
@@ -214,7 +215,7 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 				return err
 			}
 			g.SetViewOnBottom("commitMessage")
-			commitMessageView.Title = "Commit message"
+			commitMessageView.Title = lang.SLocalize("CommitMessage", "Commit message")
 			commitMessageView.FgColor = gocui.ColorWhite
 			commitMessageView.Editable = true
 		}

pkg/i18n/dutch.go

@@ -0,0 +1,84 @@
+package lang
+
+import (
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+	"golang.org/x/text/language"
+)
+
+// addDutch will add all the translations
+func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
+
+	// add the translations
+	i18nObject.AddMessages(language.Dutch,
+		&i18n.Message{
+			ID:    "NotEnoughSpace",
+			Other: "Niet genoeg ruimte om de panelen te renderen",
+		}, &i18n.Message{
+			ID:    "DiffTitle",
+			Other: "Diff",
+		}, &i18n.Message{
+			ID:    "FilesTitle",
+			Other: "Bestanden",
+		}, &i18n.Message{
+			ID:    "BranchesTitle",
+			Other: "Branches",
+		}, &i18n.Message{
+			ID:    "CommitsTitle",
+			Other: "Commits",
+		}, &i18n.Message{
+			ID:    "StashTitle",
+			Other: "Stash",
+		}, &i18n.Message{
+			ID:    "CommitMessage",
+			Other: "Commit Bericht",
+		}, &i18n.Message{
+			ID:    "CommitChanges",
+			Other: "Commit Veranderingen",
+		}, &i18n.Message{
+			ID:    "StatusTitle",
+			Other: "Status",
+		}, &i18n.Message{
+			ID:    "navigate",
+			Other: "navigeer",
+		}, &i18n.Message{
+			ID:    "stashFiles",
+			Other: "stash-bestanden",
+		}, &i18n.Message{
+			ID:    "open",
+			Other: "open",
+		}, &i18n.Message{
+			ID:    "ignore",
+			Other: "negeren",
+		}, &i18n.Message{
+			ID:    "delete",
+			Other: "verwijderen",
+		}, &i18n.Message{
+			ID:    "toggleStaged",
+			Other: "toggle staged",
+		}, &i18n.Message{
+			ID:    "refresh",
+			Other: "verversen",
+		}, &i18n.Message{
+			ID:    "addPatch",
+			Other: "verandering toevoegen",
+		}, &i18n.Message{
+			ID:    "edit",
+			Other: "veranderen",
+		}, &i18n.Message{
+			ID:    "scroll",
+			Other: "scroll",
+		}, &i18n.Message{
+			ID:    "abortMerge",
+			Other: "samenvoegen afbreken",
+		}, &i18n.Message{
+			ID:    "resolveMergeConflicts",
+			Other: "verhelp samenvoegen fouten",
+		}, &i18n.Message{
+			ID:    "checkout",
+			Other: "uitchecken",
+		},
+	)
+
+	// return the new i18nObject
+	return i18nObject
+}

pkg/i18n/i18n.go

@@ -0,0 +1,45 @@
+package lang
+
+import (
+	"github.com/cloudfoundry/jibber_jabber"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+	"golang.org/x/text/language"
+)
+
+// the function to setup the localizer
+func getlocalizer() *i18n.Localizer {
+
+	// detect the user's language
+	userLang, _ := jibber_jabber.DetectLanguage()
+
+	// create a i18n bundle that can be used to add translations and other things
+	var i18nObject = &i18n.Bundle{DefaultLanguage: language.English}
+
+	// add translation file(s)
+	i18nObject = addDutch(i18nObject)
+
+	// return the new localizer that can be used to translate text
+	return i18n.NewLocalizer(i18nObject, userLang)
+}
+
+// setup the localizer for later use
+var localizer = getlocalizer()
+
+// Localize handels the translations
+// expects i18n.LocalizeConfig as input: https://godoc.org/github.com/nicksnyder/go-i18n/v2/i18n#Localizer.MustLocalize
+// output: translated string
+func Localize(config *i18n.LocalizeConfig) string {
+	return localizer.MustLocalize(config)
+}
+
+// SLocalize (short localize) is for 1 line localizations
+// ID: The id that is used in the .toml translation files
+// Other: the default message it needs to return if there is no translation found or the system is english
+func SLocalize(ID string, Other string) string {
+	return Localize(&i18n.LocalizeConfig{
+		DefaultMessage: &i18n.Message{
+			ID:    ID,
+			Other: Other,
+		},
+	})
+}