mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
Merge branch 'master' of https://github.com/mjarkk/lazygit
This commit is contained in:
commit
4d0702fba5
@ -17,8 +17,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
errNoFiles = errors.New("No changed files")
|
errNoFiles = errors.New(lang.SLocalize("NoChangedFiles", "No changed files"))
|
||||||
errNoUsername = errors.New(`No username set. Please do: git config --global user.name "Your Name"`)
|
errNoUsername = errors.New(lang.SLocalize("NoUsernameSetErr", `No username set. Please do: git config --global user.name "Your Name"`))
|
||||||
)
|
)
|
||||||
|
|
||||||
func (gui *Gui) stagedFiles() []commands.File {
|
func (gui *Gui) stagedFiles() []commands.File {
|
||||||
@ -86,10 +86,10 @@ func (gui *Gui) handleAddPatch(g *gocui.Gui, v *gocui.View) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if !file.HasUnstagedChanges {
|
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 {
|
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)
|
sub, err := gui.GitCommand.AddPatch(file.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -139,7 +139,7 @@ func (gui *Gui) handleIgnoreFile(g *gocui.Gui, v *gocui.View) error {
|
|||||||
return gui.createErrorPanel(g, err.Error())
|
return gui.createErrorPanel(g, err.Error())
|
||||||
}
|
}
|
||||||
if file.Tracked {
|
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)
|
gui.GitCommand.Ignore(file.Name)
|
||||||
return gui.refreshFiles(g)
|
return gui.refreshFiles(g)
|
||||||
|
@ -5,7 +5,7 @@ import (
|
|||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
)
|
)
|
||||||
|
|
||||||
// addDutch will add all the translations
|
// addDutch will add all dutch translations
|
||||||
func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
|
func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
|
||||||
|
|
||||||
// add the translations
|
// add the translations
|
||||||
@ -76,6 +76,21 @@ func addDutch(i18nObject *i18n.Bundle) *i18n.Bundle {
|
|||||||
}, &i18n.Message{
|
}, &i18n.Message{
|
||||||
ID: "checkout",
|
ID: "checkout",
|
||||||
Other: "uitchecken",
|
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",
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user