summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-14 22:12:11 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-08-14 22:12:11 +1000
commit4d0702fba53c895d42b48a6abdb0aa26a1bbff8e (patch)
treea24f4e9b48faa503e057a9b663c2a9b9c8ddea47 /pkg
parent5cbacb0c67a10f08d38634cface70f35ca0e45e4 (diff)
parent0568b32f0bed36093e773226f985b7e444112248 (diff)
Merge branch 'master' of https://github.com/mjarkk/lazygit
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gui/files_panel.go10
-rw-r--r--pkg/i18n/dutch.go17
2 files changed, 21 insertions, 6 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index b99de1606..8c4c5cb6f 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -17,8 +17,8 @@ import (
)
var (
- errNoFiles = errors.New("No changed files")
- errNoUsername = errors.New(`No username set. Please do: git config --global user.name "Your Name"`)
+ errNoFiles = errors.New(lang.SLocalize("NoChangedFiles", "No changed files"))
+ errNoUsername = errors.New(lang.SLocalize("NoUsernameSetErr", `No username set. Please do: git config --global user.name "Your Name"`))
)
func (gui *Gui) stagedFiles() []commands.File {
@@ -86,10 +86,10 @@ func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
return err
}
if !file.HasUnstagedChanges {
- return gui.createErrorPanel(g, "File has no unstaged changes to add")
+ return gui.createErrorPanel(g, lang.SLocalize("FileHasNoUnstagedChanges", "File has no unstaged changes to add"))
}
if !file.Tracked {
- return gui.createErrorPanel(g, "Cannot git add --patch untracked files")
+ return gui.createErrorPanel(g, lang.SLocalize("CannotGitAdd", "Cannot git add --patch untracked files"))
}
sub, err := gui.GitCommand.AddPatch(file.Name)
if err != nil {
@@ -139,7 +139,7 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(g, err.Error())
}
if file.Tracked {
- return gui.createErrorPanel(g, "Cannot ignore tracked files")
+ return gui.createErrorPanel(g, lang.SLocalize("CantIgnoreTrackFiles", "Cannot ignore tracked files"))
}
gui.GitCommand.Ignore(file.Name)
return gui.refreshFiles(g)
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index 199b238b3..da3406ee8 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -5,7 +5,7 @@ import (
"golang.org/x/text/language"
)
-// addDutch will add all the translations
+// addDutch will add all dutch translations
func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
// add the translations
@@ -76,6 +76,21 @@ func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
}, &i18n.Message{
ID: "checkout",
Other: "uitchecken",
+ }, &i18n.Message{
+ ID: "NoChangedFiles",
+ Other: "Geen Bestanden verandert",
+ }, &i18n.Message{
+ ID: "NoUsernameSetErr",
+ Other: `Geen gebruikersnaam ingesteld. Doe: git config --global user.name "Jou Naam"`,
+ }, &i18n.Message{
+ ID: "FileHasNoUnstagedChanges",
+ Other: "Het bestand heeft geen unstaged veranderingen om toe te voegen",
+ }, &i18n.Message{
+ ID: "CannotGitAdd",
+ Other: "Kan commando niet uitvoeren git add --path untracked files",
+ }, &i18n.Message{
+ ID: "CantIgnoreTrackFiles",
+ Other: "Kan gevolgde bestanden niet negeren",
},
)